Commit e0a9ffcd authored by Cyril's avatar Cyril

Improve admin views for project and groups

* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
parent 3d242a31
.admin_dash.row .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 .ui-box
%h5 %h5
Resque Workers Resque Workers
...@@ -19,27 +43,6 @@ ...@@ -19,27 +43,6 @@
%p %p
%strong Resque status unknown %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 .row
.span6 .span6
%h3 Latest projects %h3 Latest projects
......
= render 'admin/shared/projects_head'
%h3.page_title %h3.page_title
Groups Groups
%small %small
......
= render 'admin/shared/projects_head'
%h3.page_title %h3.page_title
Group: #{@group.name} Group: #{@group.name}
= link_to edit_admin_group_path(@group), class: "btn right" do = link_to edit_admin_group_path(@group), class: "btn right" do
......
= render 'admin/shared/projects_head'
%h3.page_title %h3.page_title
Projects Projects
= link_to 'New Project', new_project_path, class: "btn small right" = link_to 'New Project', new_project_path, class: "btn small right"
......
= render 'admin/shared/projects_head'
%h3.page_title %h3.page_title
Project: #{@project.name_with_namespace} Project: #{@project.name_with_namespace}
= link_to edit_admin_project_path(@project), class: "btn right" do = link_to edit_admin_project_path(@project), class: "btn right" do
......
%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"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%li %li
= link_to profile_path, title: "Your Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile' do = link_to profile_path, title: "Your Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile' do
%i.icon-user %i.icon-user
%span.separator %li.separator
%li %li
= render "layouts/search" = render "layouts/search"
%li %li
......
...@@ -8,8 +8,10 @@ ...@@ -8,8 +8,10 @@
%ul.main_menu %ul.main_menu
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
= link_to "Stats", admin_root_path = link_to "Stats", admin_root_path
= nav_link(controller: [:projects, :groups]) do = nav_link(controller: :projects) do
= link_to "Projects", admin_projects_path = link_to "Projects", admin_projects_path
= nav_link(controller: :groups) do
= link_to "Groups", admin_groups_path
= nav_link(controller: :users) do = nav_link(controller: :users) do
= link_to "Users", admin_users_path = link_to "Users", admin_users_path
= nav_link(controller: :logs) do = nav_link(controller: :logs) do
......
...@@ -12,6 +12,11 @@ Feature: Admin active tab ...@@ -12,6 +12,11 @@ Feature: Admin active tab
Then the active main tab should be Projects Then the active main tab should be Projects
And no other main tabs should be active 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 Scenario: On Admin Users
Given I visit admin users page Given I visit admin users page
Then the active main tab should be Users Then the active main tab should be Users
......
...@@ -11,6 +11,10 @@ class AdminActiveTab < Spinach::FeatureSteps ...@@ -11,6 +11,10 @@ class AdminActiveTab < Spinach::FeatureSteps
ensure_active_main_tab('Projects') ensure_active_main_tab('Projects')
end 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 Then 'the active main tab should be Users' do
ensure_active_main_tab('Users') ensure_active_main_tab('Users')
end end
......
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