Commit 9007af2c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'issues-filters' into 'master'

Improve UI for issues filters

![filters-ui](https://gitlab.com/gitlab-org/gitlab-ce/uploads/31109bb069a5f42a9b83c2fb44af288b/filters-ui.png)

See merge request !472
parents 671be8a8 70496fe5
.filter-item {
margin-right: 15px;
}
.issues-state-filters {
li.active a,
li.active a:hover {
background: #f5f5f5;
border-bottom: 1px solid #f5f5f5 !important;
}
}
.issues-details-filters {
font-size: 13px;
background: #f5f5f5;
margin: -10px 0;
padding: 10px 15px;
margin-top: -15px;
border-left: 1px solid #DDD;
border-right: 1px solid #DDD;
.btn {
font-size: 13px;
}
}
...@@ -45,11 +45,3 @@ ...@@ -45,11 +45,3 @@
.btn { font-size: 13px; } .btn { font-size: 13px; }
} }
.filter-item {
margin-right: 15px;
> span {
margin-right: 4px;
}
}
...@@ -41,12 +41,9 @@ ...@@ -41,12 +41,9 @@
} }
.check-all-holder { .check-all-holder {
height: 36px; line-height: 36px;
float: left; float: left;
margin-right: 12px; margin-right: 15px;
padding: 6px 15px;
border: 1px solid #ccc;
@include border-radius(4px);
} }
.issues_content { .issues_content {
...@@ -73,7 +70,7 @@ ...@@ -73,7 +70,7 @@
.issues-filters, .issues-filters,
.issues_bulk_update { .issues_bulk_update {
select, .select2-container { select, .select2-container {
width: 140px !important; width: 150px !important;
display: inline-block; display: inline-block;
} }
} }
......
...@@ -49,7 +49,6 @@ module LabelsHelper ...@@ -49,7 +49,6 @@ module LabelsHelper
end end
def project_labels_options(project) def project_labels_options(project)
options_for_select([['Any', nil]]) + options_from_collection_for_select(project.labels, 'name', 'name', params[:label_name])
options_from_collection_for_select(project.labels, 'name', 'name', params[:label_name])
end end
end end
...@@ -28,7 +28,6 @@ module MilestonesHelper ...@@ -28,7 +28,6 @@ module MilestonesHelper
Milestone.where(project_id: @projects) Milestone.where(project_id: @projects)
end.active end.active
options_for_select([['Any', nil]]) + options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
end end
end end
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%i.fa.fa-compass %i.fa.fa-compass
All All
%div .issues-details-filters
= form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_id, :label_name]), method: :get, class: 'filter-form' do = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_id, :label_name]), method: :get, class: 'filter-form' do
- if controller.controller_name == 'issues' - if controller.controller_name == 'issues'
.check-all-holder .check-all-holder
...@@ -23,35 +23,19 @@ ...@@ -23,35 +23,19 @@
disabled: !can?(current_user, :modify_issue, @project) disabled: !can?(current_user, :modify_issue, @project)
.issues-other-filters .issues-other-filters
.filter-item.inline .filter-item.inline
%span.light = users_select_tag(:assignee_id, selected: params[:assignee_id],
%i.fa.fa-user placeholder: 'Assignee', class: 'trigger-submit', any_user: true, null_user: true)
Assignee
%strong
= users_select_tag(:assignee_id, selected: params[:assignee_id],
placeholder: 'Any', class: 'trigger-submit', any_user: true, null_user: true)
.filter-item.inline .filter-item.inline
%span.light = users_select_tag(:author_id, selected: params[:author_id],
%i.fa.fa-user placeholder: 'Author', class: 'trigger-submit', any_user: true)
Author
%strong
= users_select_tag(:author_id, selected: params[:author_id],
placeholder: 'Any', class: 'trigger-submit', any_user: true)
.filter-item.inline .filter-item.inline.milestone-filter
%span.light = select_tag('milestone_id', projects_milestones_options, class: "select2 trigger-submit", prompt: 'Milestone')
%i.fa.fa-clock-o
Milestone
%strong
= select_tag('milestone_id', projects_milestones_options, class: "select2 trigger-submit")
- if @project - if @project
.filter-item.inline .filter-item.inline.labels-filter
%span.light = select_tag('label_name', project_labels_options(@project), class: "select2 trigger-submit", prompt: 'Label')
%i.fa.fa-tag
Label
%strong
= select_tag('label_name', project_labels_options(@project), class: "select2 trigger-submit")
.pull-right .pull-right
= render 'shared/sort_dropdown' = render 'shared/sort_dropdown'
......
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