Commit db961b8b46497c4626a4d9479e3e20c308e83a57
1 parent
1701144b
Exists in
spb-stable
and in
3 other branches
Improve few admin pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
18 additions
and
23 deletions
Show diff stats
app/assets/stylesheets/themes/ui_color.scss
@@ -38,6 +38,6 @@ | @@ -38,6 +38,6 @@ | ||
38 | } | 38 | } |
39 | 39 | ||
40 | .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { | 40 | .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { |
41 | - background: #658; | 41 | + background: #769; |
42 | } | 42 | } |
43 | } | 43 | } |
app/views/admin/groups/index.html.haml
1 | %h3.page-title | 1 | %h3.page-title |
2 | Groups (#{@groups.total_count}) | 2 | Groups (#{@groups.total_count}) |
3 | - %small | ||
4 | - allows you to keep projects organized. | ||
5 | - Use groups for uniting related projects. | ||
6 | - | ||
7 | = link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right" | 3 | = link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right" |
8 | -%br | 4 | + |
5 | +%p.light | ||
6 | + Group allows you to keep projects organized. | ||
7 | + Use groups for uniting related projects. | ||
8 | + | ||
9 | +%hr | ||
9 | = form_tag admin_groups_path, method: :get, class: 'form-inline' do | 10 | = form_tag admin_groups_path, method: :get, class: 'form-inline' do |
10 | .form-group | 11 | .form-group |
11 | = text_field_tag :name, params[:name], class: "form-control input-mn-300" | 12 | = text_field_tag :name, params[:name], class: "form-control input-mn-300" |
@@ -23,24 +24,18 @@ | @@ -23,24 +24,18 @@ | ||
23 | 24 | ||
24 | %h4 | 25 | %h4 |
25 | = link_to [:admin, group] do | 26 | = link_to [:admin, group] do |
27 | + %i.icon-folder-close | ||
26 | = group.name | 28 | = group.name |
27 | 29 | ||
28 | → | 30 | → |
29 | %span.monospace | 31 | %span.monospace |
30 | - %i.icon-folder-close | ||
31 | %strong #{group.path}/ | 32 | %strong #{group.path}/ |
32 | - | ||
33 | - .clearfix.light.append-bottom-10 | ||
34 | - %span | ||
35 | - %b Members: | ||
36 | - %span.badge= group.members.size | ||
37 | - \| | ||
38 | - %span | ||
39 | - %b Projects: | ||
40 | - %span.badge= group.projects.count | ||
41 | - | ||
42 | .clearfix | 33 | .clearfix |
43 | %p | 34 | %p |
44 | = truncate group.description, length: 150 | 35 | = truncate group.description, length: 150 |
36 | + .clearfix | ||
37 | + %p.light | ||
38 | + #{pluralize(group.members.size, 'member')}, #{pluralize(group.projects.count, 'project')} | ||
39 | + | ||
45 | 40 | ||
46 | = paginate @groups, theme: "gitlab" | 41 | = paginate @groups, theme: "gitlab" |
app/views/admin/users/index.html.haml
1 | .row | 1 | .row |
2 | .col-md-3 | 2 | .col-md-3 |
3 | .admin-filter | 3 | .admin-filter |
4 | - = form_tag admin_users_path, method: :get, class: 'form-inline' do | ||
5 | - .append-bottom-10 | ||
6 | - .form-group | ||
7 | - = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' | ||
8 | - = button_tag type: 'submit', class: 'btn btn-primary' do | ||
9 | - %i.icon-search | ||
10 | %ul.nav.nav-pills.nav-stacked | 4 | %ul.nav.nav-pills.nav-stacked |
11 | %li{class: "#{'active' unless params[:filter]}"} | 5 | %li{class: "#{'active' unless params[:filter]}"} |
12 | = link_to admin_users_path do | 6 | = link_to admin_users_path do |
@@ -25,6 +19,12 @@ | @@ -25,6 +19,12 @@ | ||
25 | Without projects | 19 | Without projects |
26 | %small.pull-right= User.without_projects.count | 20 | %small.pull-right= User.without_projects.count |
27 | %hr | 21 | %hr |
22 | + = form_tag admin_users_path, method: :get, class: 'form-inline' do | ||
23 | + .form-group | ||
24 | + = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' | ||
25 | + = button_tag type: 'submit', class: 'btn btn-primary' do | ||
26 | + %i.icon-search | ||
27 | + %hr | ||
28 | = link_to 'Reset', admin_users_path, class: "btn btn-cancel" | 28 | = link_to 'Reset', admin_users_path, class: "btn btn-cancel" |
29 | 29 | ||
30 | .col-md-9 | 30 | .col-md-9 |