Download as
Browse Code »

Commit 638f8541dcd4a718e0c8187bb1dd4dfddffeb57d

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

Hide labels filter for MRs and remove unnecessary padding 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 14 additions and 13 deletions   Show diff stats
app/views/projects/issues/_issues.html.haml
  Diff comments   View file @638f854
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 .check-all-holder 2 .check-all-holder
3 = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left" 3 = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left"
4 .issues-filters 4 .issues-filters
5 - .dropdown.inline.prepend-left-10 5 + .dropdown.inline
6 %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} 6 %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
7 %i.icon-user 7 %i.icon-user
8 %span.light assignee: 8 %span.light assignee:
app/views/projects/issues/index.html.haml
  Diff comments   View file @638f854
1 = render "head" 1 = render "head"
2 .row 2 .row
3 .col-md-3 3 .col-md-3
4 - = render 'shared/project_filter', project_entities_path: project_issues_path(@project) 4 + = render 'shared/project_filter', project_entities_path: project_issues_path(@project), labels: true
5 .col-md-9.issues-holder 5 .col-md-9.issues-holder
6 = render "issues" 6 = render "issues"
app/views/shared/_project_filter.html.haml
  Diff comments   View file @638f854
@@ -26,17 +26,18 @@ @@ -26,17 +26,18 @@
26 = link_to project_filter_path(state: 'all') do 26 = link_to project_filter_path(state: 'all') do
27 All 27 All
28 28
29 - %fieldset  
30 - %legend Labels  
31 - %ul.list-group  
32 - - issue_label_names.each do |label_name|  
33 - = link_to labels_filter_path(label_name), class: label_filter_class(label_name) do  
34 - %span{class: "label #{label_css_class(label_name)}"}  
35 - %i.icon-tag  
36 - = label_name  
37 - - if selected_label?(label_name)  
38 - .pull-right  
39 - %i.icon-remove 29 + - if defined?(labels)
  30 + %fieldset
  31 + %legend Labels
  32 + %ul.list-group
  33 + - issue_label_names.each do |label_name|
  34 + = link_to labels_filter_path(label_name), class: label_filter_class(label_name) do
  35 + %span{class: "label #{label_css_class(label_name)}"}
  36 + %i.icon-tag
  37 + = label_name
  38 + - if selected_label?(label_name)
  39 + .pull-right
  40 + %i.icon-remove
40 41
41 %fieldset 42 %fieldset
42 - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any? 43 - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any?