Redesign navigation for group pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/groups/activity.html.haml

@@ -3,7 +3,6 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 - page_title    "Activity"
-- header_title  group_title(@group, "Activity", activity_group_path(@group))
 
 %section.activities
   = render 'activities'

app/views/groups/edit.html.haml

-- header_title group_title(@group, "Settings", edit_group_path(@group))
-
 .panel.panel-default.prepend-top-default
   .panel-heading
     Group settings

app/views/groups/group_members/index.html.haml

 - page_title "Members"
-- header_title group_title(@group, "Members", group_group_members_path(@group))
 
 .group-members-page.prepend-top-default
   - if current_user && current_user.can?(:admin_group_member, @group)

app/views/groups/issues.html.haml

 - page_title "Issues"
-- header_title group_title(@group, "Issues", issues_group_path(@group))
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, issues_group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} issues")

app/views/groups/merge_requests.html.haml

 - page_title "Merge Requests"
-- header_title group_title(@group, "Merge Requests", merge_requests_group_path(@group))
 
 .top-area
   = render 'shared/issuable/nav', type: :merge_requests

app/views/groups/milestones/index.html.haml

 - page_title "Milestones"
-- header_title group_title(@group, "Milestones", group_milestones_path(@group))
 
 .top-area
   = render 'shared/milestones_filter'

app/views/groups/projects.html.haml

 - page_title "Projects"
-- header_title group_title(@group, "Projects", projects_group_path(@group))
 
 .panel.panel-default.prepend-top-default
   .panel-heading

app/views/groups/show.html.haml

@@ -5,12 +5,6 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 .cover-block
-  .cover-controls
-    - if @group && can?(current_user, :admin_group, @group)
-      = link_to icon('pencil'), edit_group_path(@group), class: 'btn'
-    - if current_user
-      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn'
-
   .avatar-holder
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"

app/views/layouts/group.html.haml

 - page_title       @group.name
 - page_description @group.description  unless page_description
 - header_title     group_title(@group) unless header_title
-- sidebar          "group"             unless sidebar
+- sidebar          "dashboard"         unless sidebar
+- nav              "group"
 
 = render template: "layouts/application"

app/views/layouts/group_settings.html.haml

 - page_title    "Settings"
-- header_title group_title(@group, "Settings", edit_group_path(@group))
-- sidebar       "group_settings"
+- sidebar       "dashboard" unless sidebar
+- nav           "group"
 
 = render template: "layouts/group"

app/views/layouts/nav/_dashboard.html.haml

@@ -15,12 +15,12 @@
       = icon('dashboard fw')
       %span
         Activity
-  = nav_link(controller: :groups) do
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
       %span
         Groups
-  = nav_link(controller: :milestones) do
+  = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
       %span

app/views/layouts/nav/_group.html.haml

-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to root_path, title: 'Go to dashboard', class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Go to dashboard
+- if current_user
+  .controls
+    - if current_path?('groups#show')
+      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn btn-gray rss-btn'
 
-  %li.separate-item
+    %span.dropdown.group-settings-dropdown
+      %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+        = icon('cog')
+        = icon('angle-down')
+      %ul.dropdown-menu.dropdown-menu-align-right
+        = nav_link(path: 'groups#projects') do
+          = link_to projects_group_path(@group), title: 'Projects' do
+            Projects
+        %li.divider
+        - if @group && can?(current_user, :admin_group, @group)
+          %li
+            = link_to edit_group_path(@group) do
+              Edit Group
+        - if access = @group.users.find(current_user)
+          %li
+            = link_to leave_group_group_members_path(@group),
+              data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
+              Leave Group
 
+%ul.nav-links
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: 'Home' do
       = icon('group fw')
@@ -28,22 +44,16 @@
       %span
         Issues
         - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count= number_with_delimiter(issues.count)
+        %span.badge.count= number_with_delimiter(issues.count)
   = nav_link(path: 'groups#merge_requests') do
     = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
       = icon('tasks fw')
       %span
         Merge Requests
         - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count= number_with_delimiter(merge_requests.count)
+        %span.badge.count= number_with_delimiter(merge_requests.count)
   = nav_link(controller: [:group_members]) do
     = link_to group_group_members_path(@group), title: 'Members' do
       = icon('users fw')
       %span
         Members
-  - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "separate-item" }) do
-      = link_to edit_group_path(@group), title: 'Settings' do
-        = icon ('cogs fw')
-        %span
-          Settings