10 files changed, 38 insertions, 33 deletions

diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index b68d7f0d003..4320bda4999 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,5 +1,29 @@
 .admin_dash.row
-  .span4
+  .span3
+    .ui-box
+      %h5 Projects
+      .data.padded
+        = link_to admin_projects_path do
+          %h1= Project.count
+        %hr
+        = link_to 'New Project', new_project_path, class: "btn small"
+  .span3
+    .ui-box
+      %h5 Groups
+      .data.padded
+        = link_to admin_groups_path do
+          %h1= Group.count
+        %hr
+        = link_to 'New Group', new_admin_group_path, class: "btn small"
+  .span3
+    .ui-box
+      %h5 Users
+      .data.padded
+        = link_to admin_users_path do
+          %h1= User.count
+        %hr
+        = link_to 'New User', new_admin_user_path, class: "btn small"
+  .span3
     .ui-box
       %h5
         Resque Workers
@@ -19,27 +43,6 @@
           %p
             %strong Resque status unknown
 
-
-  .span4
-    .ui-box
-      %h5 Projects
-      .data.padded
-        = link_to admin_projects_path do
-          %h1= Project.count
-        %hr
-        = link_to 'New Project', new_project_path, class: "btn small"
-         
-        = link_to 'New Group', new_admin_group_path, class: "btn small"
-  .span4
-    .ui-box
-      %h5 Users
-      .data.padded
-        = link_to admin_users_path do
-          %h1= User.count
-        %hr
-        = link_to 'New User', new_admin_user_path, class: "btn small"
-
-
 .row
   .span6
     %h3 Latest projects
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 534fa1dbcdd..952d515103c 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -1,4 +1,3 @@
-= render 'admin/shared/projects_head'
 %h3.page_title
   Groups
   %small
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index f447ac10aea..d371acadd15 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -1,4 +1,3 @@
-= render 'admin/shared/projects_head'
 %h3.page_title
   Group: #{@group.name}
   = link_to edit_admin_group_path(@group), class: "btn right" do
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index a9ecabfff5b..9bbcbc71111 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,4 +1,3 @@
-= render 'admin/shared/projects_head'
 %h3.page_title
   Projects
   = link_to 'New Project', new_project_path, class: "btn small right"
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 92bf0ff02ae..3691f7bd719 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,4 +1,3 @@
-= render 'admin/shared/projects_head'
 %h3.page_title
   Project: #{@project.name_with_namespace}
   = link_to edit_admin_project_path(@project), class: "btn right" do
diff --git a/app/views/admin/shared/_projects_head.html.haml b/app/views/admin/shared/_projects_head.html.haml
deleted file mode 100644
index 3f5c34c533c..00000000000
--- a/app/views/admin/shared/_projects_head.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%ul.nav.nav-tabs
-  = nav_link(controller: :projects) do
-    = link_to 'Projects', admin_projects_path, class: "tab"
-  = nav_link(controller: :groups) do
-    = link_to 'Groups', admin_groups_path, class: "tab"
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 38e1d7f0597..8fbec43f4a1 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -18,7 +18,7 @@
         %li
           = link_to profile_path, title: "Your Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile'  do
             %i.icon-user
-        %span.separator
+        %li.separator
         %li
           = render "layouts/search"
         %li
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 582f86ba32c..5069a00204d 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -8,8 +8,10 @@
       %ul.main_menu
         = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
           = link_to "Stats", admin_root_path
-        = nav_link(controller: [:projects, :groups]) do
+        = nav_link(controller: :projects) do
           = link_to "Projects", admin_projects_path
+        = nav_link(controller: :groups) do
+          = link_to "Groups", admin_groups_path
         = nav_link(controller: :users) do
           = link_to "Users", admin_users_path
         = nav_link(controller: :logs) do
diff --git a/features/admin/active_tab.feature b/features/admin/active_tab.feature
index fce85ce9901..226d3d5d5b5 100644
--- a/features/admin/active_tab.feature
+++ b/features/admin/active_tab.feature
@@ -12,6 +12,11 @@ Feature: Admin active tab
     Then the active main tab should be Projects
     And no other main tabs should be active
 
+  Scenario: On Admin Groups
+    Given I visit admin groups page
+    Then the active main tab should be Groups
+    And no other main tabs should be active
+
   Scenario: On Admin Users
     Given I visit admin users page
     Then the active main tab should be Users
diff --git a/features/steps/admin/admin_active_tab.rb b/features/steps/admin/admin_active_tab.rb
index 29290892823..05a9a686e01 100644
--- a/features/steps/admin/admin_active_tab.rb
+++ b/features/steps/admin/admin_active_tab.rb
@@ -11,6 +11,10 @@ class AdminActiveTab < Spinach::FeatureSteps
     ensure_active_main_tab('Projects')
   end
 
+  Then 'the active main tab should be Groups' do
+    ensure_active_main_tab('Groups')
+  end
+
   Then 'the active main tab should be Users' do
     ensure_active_main_tab('Users')
   end