Download as
Browse Code »

Commit 8b513fbc50e2e35be0c5fda35a980b064a3c7523

Authored by Dmitriy Zaporozhets
1 parent 5a52c9b0
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Improve side filters and make them look similar

Showing 9 changed files with 78 additions and 70 deletions   Show diff stats
app/assets/stylesheets/generic/common.scss
  Diff comments   View file @8b513fb
@@ -475,13 +475,13 @@ table { @@ -475,13 +475,13 @@ table {
475 } 475 }
476 } 476 }
477 477
  478 +.btn-sign-in {
  479 + margin-top: 7px;
  480 + text-shadow: none;
  481 +}
  482 +
478 .side-filters { 483 .side-filters {
479 fieldset { 484 fieldset {
480 margin-bottom: 15px; 485 margin-bottom: 15px;
481 } 486 }
482 } 487 }
483 -  
484 -.btn-sign-in {  
485 - margin-top: 7px;  
486 - text-shadow: none;  
487 -}  
app/assets/stylesheets/gl_bootstrap.scss
  Diff comments   View file @8b513fb
@@ -140,7 +140,15 @@ $pagination-active-bg: $bg_style_color; @@ -140,7 +140,15 @@ $pagination-active-bg: $bg_style_color;
140 } 140 }
141 } 141 }
142 142
143 -.nav-tabs > li > a, .nav-pills > li > a { color: #666; } 143 +.nav-tabs > li > a,
  144 +.nav-pills > li > a {
  145 + color: #666;
  146 +}
  147 +
  148 +.nav-small > li > a {
  149 + padding: 3px 5px;
  150 + font-size: 12px;
  151 +}
144 152
145 153
146 /* 154 /*
app/views/dashboard/_projects_filter.html.haml 0 → 100644
  Diff comments   View file @8b513fb
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
  1 +%fieldset
  2 + %ul.nav.nav-pills.nav-stacked
  3 + = nav_tab :scope, nil do
  4 + = link_to projects_dashboard_filter_path(scope: nil) do
  5 + All
  6 + %span.pull-right
  7 + = current_user.authorized_projects.count
  8 + = nav_tab :scope, 'personal' do
  9 + = link_to projects_dashboard_filter_path(scope: 'personal') do
  10 + Personal
  11 + %span.pull-right
  12 + = current_user.personal_projects.count
  13 + = nav_tab :scope, 'joined' do
  14 + = link_to projects_dashboard_filter_path(scope: 'joined') do
  15 + Joined
  16 + %span.pull-right
  17 + = current_user.authorized_projects.joined(current_user).count
  18 + = nav_tab :scope, 'owned' do
  19 + = link_to projects_dashboard_filter_path(scope: 'owned') do
  20 + Owned
  21 + %span.pull-right
  22 + = current_user.owned_projects.count
  23 +
  24 +%fieldset
  25 + %legend Visibility
  26 + %ul.nav.nav-pills.nav-stacked.nav-small.visibility-filter
  27 + - Gitlab::VisibilityLevel.values.each do |level|
  28 + %li{ class: (level.to_s == params[:visibility_level]) ? 'active' : 'light' }
  29 + = link_to projects_dashboard_filter_path(visibility_level: level) do
  30 + = visibility_level_icon(level)
  31 + = visibility_level_label(level)
  32 +
  33 +- if @groups.present?
  34 + %fieldset
  35 + %legend Groups
  36 + %ul.nav.nav-pills.nav-stacked.nav-small
  37 + - @groups.each do |group|
  38 + %li{ class: (group.name == params[:group]) ? 'active' : 'light' }
  39 + = link_to projects_dashboard_filter_path(group: group.name) do
  40 + %i.icon-folder-close-alt
  41 + = group.name
  42 + %small.pull-right
  43 + = group.projects.count
  44 +
  45 +
  46 +
  47 +- if @labels.present?
  48 + %fieldset
  49 + %legend Labels
  50 + %ul.nav.nav-pills.nav-stacked.nav-small
  51 + - @labels.each do |label|
  52 + %li{ class: (label.name == params[:label]) ? 'active' : 'light' }
  53 + = link_to projects_dashboard_filter_path(scope: params[:scope], label: label.name) do
  54 + %i.icon-tag
  55 + = label.name
app/views/dashboard/projects.html.haml
  Diff comments   View file @8b513fb
@@ -26,62 +26,7 @@ @@ -26,62 +26,7 @@
26 %hr 26 %hr
27 .row 27 .row
28 .col-md-3.hidden-sm.hidden-xs.side-filters 28 .col-md-3.hidden-sm.hidden-xs.side-filters
29 - %fieldset  
30 - %ul.nav.nav-pills.nav-stacked  
31 - = nav_tab :scope, nil do  
32 - = link_to projects_dashboard_filter_path(scope: nil) do  
33 - All  
34 - %span.pull-right  
35 - = current_user.authorized_projects.count  
36 - = nav_tab :scope, 'personal' do  
37 - = link_to projects_dashboard_filter_path(scope: 'personal') do  
38 - Personal  
39 - %span.pull-right  
40 - = current_user.personal_projects.count  
41 - = nav_tab :scope, 'joined' do  
42 - = link_to projects_dashboard_filter_path(scope: 'joined') do  
43 - Joined  
44 - %span.pull-right  
45 - = current_user.authorized_projects.joined(current_user).count  
46 - = nav_tab :scope, 'owned' do  
47 - = link_to projects_dashboard_filter_path(scope: 'owned') do  
48 - Owned  
49 - %span.pull-right  
50 - = current_user.owned_projects.count  
51 -  
52 - %fieldset  
53 - %legend Visibility  
54 - %ul.bordered-list.visibility-filter  
55 - - Gitlab::VisibilityLevel.values.each do |level|  
56 - %li{ class: (level.to_s == params[:visibility_level]) ? 'active' : 'light' }  
57 - = link_to projects_dashboard_filter_path(visibility_level: level) do  
58 - = visibility_level_icon(level)  
59 - = visibility_level_label(level)  
60 -  
61 - - if @groups.present?  
62 - %fieldset  
63 - %legend Groups  
64 - %ul.bordered-list  
65 - - @groups.each do |group|  
66 - %li{ class: (group.name == params[:group]) ? 'active' : 'light' }  
67 - = link_to projects_dashboard_filter_path(group: group.name) do  
68 - %i.icon-folder-close-alt  
69 - = group.name  
70 - %small.pull-right  
71 - = group.projects.count  
72 -  
73 -  
74 -  
75 - - if @labels.present?  
76 - %fieldset  
77 - %legend Labels  
78 - %ul.bordered-list  
79 - - @labels.each do |label|  
80 - %li{ class: (label.name == params[:label]) ? 'active' : 'light' }  
81 - = link_to projects_dashboard_filter_path(scope: params[:scope], label: label.name) do  
82 - %i.icon-tag  
83 - = label.name  
84 - 29 + = render "projects_filter"
85 .col-md-9 30 .col-md-9
86 %ul.bordered-list.my-projects.top-list 31 %ul.bordered-list.my-projects.top-list
87 - @projects.each do |project| 32 - @projects.each do |project|
app/views/projects/_settings_nav.html.haml
  Diff comments   View file @8b513fb
1 %ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20 1 %ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20
2 = nav_link(path: 'projects#edit') do 2 = nav_link(path: 'projects#edit') do
3 = link_to edit_project_path(@project), class: "stat-tab tab " do 3 = link_to edit_project_path(@project), class: "stat-tab tab " do
4 - %i.icon-edit  
5 Edit Project 4 Edit Project
6 = nav_link(controller: [:team_members, :teams]) do 5 = nav_link(controller: [:team_members, :teams]) do
7 = link_to project_team_index_path(@project), class: "team-tab tab" do 6 = link_to project_team_index_path(@project), class: "team-tab tab" do
8 - %i.icon-group  
9 Members 7 Members
10 = nav_link(controller: :deploy_keys) do 8 = nav_link(controller: :deploy_keys) do
11 = link_to project_deploy_keys_path(@project) do 9 = link_to project_deploy_keys_path(@project) do
app/views/shared/_filter.html.haml
  Diff comments   View file @8b513fb
@@ -10,10 +10,11 @@ @@ -10,10 +10,11 @@
10 Created by me 10 Created by me
11 %li{class: ("active" if params[:scope] == 'all')} 11 %li{class: ("active" if params[:scope] == 'all')}
12 = link_to filter_path(entity, scope: 'all') do 12 = link_to filter_path(entity, scope: 'all') do
13 - All 13 + Everyone's
14 14
15 %fieldset.status-filter 15 %fieldset.status-filter
16 - %ul.nav.nav-pills.nav-stacked 16 + %legend State
  17 + %ul.nav.nav-pills
17 %li{class: ("active" if params[:status].blank?)} 18 %li{class: ("active" if params[:status].blank?)}
18 = link_to filter_path(entity, status: nil) do 19 = link_to filter_path(entity, status: nil) do
19 Open 20 Open
@@ -26,7 +27,7 @@ @@ -26,7 +27,7 @@
26 27
27 %fieldset 28 %fieldset
28 %legend Projects 29 %legend Projects
29 - %ul.nav.nav-pills.nav-pills-small.nav-stacked 30 + %ul.nav.nav-pills.nav-stacked.nav-small
30 - @projects.each do |project| 31 - @projects.each do |project|
31 - unless entities_per_project(project, entity).zero? 32 - unless entities_per_project(project, entity).zero?
32 %li{class: ("active" if params[:project_id] == project.id.to_s)} 33 %li{class: ("active" if params[:project_id] == project.id.to_s)}
app/views/shared/_project_filter.html.haml
  Diff comments   View file @8b513fb
@@ -14,7 +14,8 @@ @@ -14,7 +14,8 @@
14 Created by me 14 Created by me
15 15
16 %fieldset 16 %fieldset
17 - %ul.nav.nav-pills.nav-stacked 17 + %legend State
  18 + %ul.nav.nav-pills
18 %li{class: ("active" if params[:state].blank?)} 19 %li{class: ("active" if params[:state].blank?)}
19 = link_to project_filter_path(state: nil) do 20 = link_to project_filter_path(state: nil) do
20 Open 21 Open
features/steps/dashboard/dashboard_issues.rb
  Diff comments   View file @8b513fb
@@ -40,7 +40,7 @@ class DashboardIssues < Spinach::FeatureSteps @@ -40,7 +40,7 @@ class DashboardIssues < Spinach::FeatureSteps
40 40
41 step 'I click "All" link' do 41 step 'I click "All" link' do
42 within ".scope-filter" do 42 within ".scope-filter" do
43 - click_link 'All' 43 + click_link "Everyone's"
44 end 44 end
45 end 45 end
46 46
features/steps/dashboard/dashboard_merge_requests.rb
  Diff comments   View file @8b513fb
@@ -40,7 +40,7 @@ class DashboardMergeRequests < Spinach::FeatureSteps @@ -40,7 +40,7 @@ class DashboardMergeRequests < Spinach::FeatureSteps
40 40
41 step 'I click "All" link' do 41 step 'I click "All" link' do
42 within ".scope-filter" do 42 within ".scope-filter" do
43 - click_link 'All' 43 + click_link "Everyone's"
44 end 44 end
45 end 45 end
46 46