Commit f3f27fee authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Left-side navigation for group layout

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 7b71a9e2
......@@ -171,7 +171,7 @@
}
}
.project .event_filter {
.sidenav .event_filter {
position: static;
float: left;
width: 100%;
......
body.project {
body.sidenav {
padding: 0;
&.ui_mars {
......@@ -119,7 +119,7 @@ body.project {
}
}
.project-settings-nav {
.sidebar-subnav {
margin-left: 0px;
padding-left: 0px;
......
......@@ -44,4 +44,12 @@ module GroupsHelper
path << "?#{options.to_param}"
path
end
def group_settings_page?
if current_controller?('groups')
current_action?('edit') || current_action?('projects')
else
false
end
end
end
%ul.nav.nav-pills.nav-stacked.nav-stacked-menu
%ul.sidebar-subnav
= nav_link(path: 'groups#edit') do
= link_to edit_group_path(@group) do
%i.fa.fa-pencil-square-o
......
.row
.col-md-2
= render 'settings_nav'
.col-md-10
.panel.panel-default
.panel.panel-default
.panel-heading
%strong= @group.name
group settings:
......@@ -30,7 +26,7 @@
.form-actions
= f.submit 'Save group', class: "btn btn-save"
.panel.panel-danger
.panel.panel-danger
.panel-heading Remove group
.panel-body
%p
......
.row
.col-md-2
= render 'settings_nav'
.col-md-10
.panel.panel-default
.panel.panel-default
.panel-heading
%strong= @group.name
projects:
......@@ -26,4 +22,4 @@
- if @projects.blank?
.nothing-here-block This group has no projects yet
= paginate @projects, theme: "gitlab"
= paginate @projects, theme: "gitlab"
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: group_head_title
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
%body{class: "#{app_theme} application sidenav", :'data-page' => body_data_page}
= render "layouts/broadcast"
= render "layouts/head_panel", title: "group: #{@group.name}"
%nav.main-nav.navbar-collapse.collapse
.container= render 'layouts/nav/group'
.container
.page-with-sidebar
.sidebar-wrapper
= render 'layouts/nav/group'
.content-wrapper
.container-fluid
.content
= render "layouts/flash"
.clearfix
= yield
= yield :embedded_scripts
%ul
%ul.nav.nav-sidebar.navbar-collapse.collapse
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
= link_to group_path(@group), title: "Home" do
%i.fa.fa-dashboard
Activity
= nav_link(controller: [:group, :milestones]) do
= link_to group_milestones_path(@group) do
%i.fa.fa-clock-o
Milestones
= nav_link(path: 'groups#issues') do
= link_to issues_group_path(@group) do
%i.fa.fa-exclamation-circle
Issues
- if current_user
%span.count= current_user.assigned_issues.opened.of_group(@group).count
= nav_link(path: 'groups#merge_requests') do
= link_to merge_requests_group_path(@group) do
%i.fa.fa-tasks
Merge Requests
- if current_user
%span.count= current_user.cared_merge_requests.opened.of_group(@group).count
= nav_link(path: 'groups#members') do
= link_to "Members", members_group_path(@group)
= link_to members_group_path(@group) do
%i.fa.fa-users
Members
- if can?(current_user, :manage_group, @group)
= nav_link(path: 'groups#edit') do
= link_to edit_group_path(@group), class: "tab " do
= nav_link(html_options: { class: "#{"active" if group_settings_page?} separate-item" }) do
= link_to edit_group_path(@group), class: "tab no-highlight" do
%i.fa.fa-cogs
Settings
%i.fa.fa-angle-down
- if group_settings_page?
= render 'groups/settings_nav'
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: @project.name_with_namespace
%body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
%body{class: "#{app_theme} sidenav project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
= render "layouts/broadcast"
= render "layouts/head_panel", title: project_title(@project)
= render "layouts/init_auto_complete"
......
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: project_head_title
%body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
%body{class: "#{app_theme} sidenav project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
= render "layouts/broadcast"
= render "layouts/head_panel", title: project_title(@project)
= render "layouts/init_auto_complete"
......
%ul.project-settings-nav
%ul.project-settings-nav.sidebar-subnav
= nav_link(path: 'projects#edit') do
= link_to edit_project_path(@project), class: "stat-tab tab " do
%i.fa.fa-pencil-square-o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment