deac
/
gitlabhq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
4-1-stable
Cyril 2012-11-28 17:08:25 +01:00
parent 3d242a3154
commit e0a9ffcdaa
10 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/views/admin/dashboard/index.html.haml
View File

@ -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

1
app/views/admin/groups/index.html.haml
View File

@ -1,4 +1,3 @@
= render 'admin/shared/projects_head'
%h3.page_title
Groups
%small

1
app/views/admin/groups/show.html.haml
View File

@ -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

1
app/views/admin/projects/index.html.haml
View File

@ -1,4 +1,3 @@
= render 'admin/shared/projects_head'
%h3.page_title
Projects
= link_to 'New Project', new_project_path, class: "btn small right"

1
app/views/admin/projects/show.html.haml
View File

@ -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

5
app/views/admin/shared/_projects_head.html.haml
View File

@ -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"

2
app/views/layouts/_head_panel.html.haml
View File

@ -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

4
app/views/layouts/admin.html.haml
View File

@ -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

5
features/admin/active_tab.feature
View File

@ -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

4
features/steps/admin/admin_active_tab.rb
View File

@ -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