kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve UI for issues filters

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2015-03-27 12:00:31 -07:00
parent c1c93f4f7a
commit 70496fe5d8
6 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/stylesheets/generic/filters.scss Normal file
View file

@ -0,0 +1,25 @@
.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;
}
}

8
app/assets/stylesheets/pages/issuable.scss
View file

@ -45,11 +45,3 @@
.btn { font-size: 13px; }
}
.filter-item {
margin-right: 15px;
> span {
margin-right: 4px;
}
}

9
app/assets/stylesheets/pages/issues.scss
View file

@ -41,12 +41,9 @@
}
.check-all-holder {
height: 36px;
line-height: 36px;
float: left;
margin-right: 12px;
padding: 6px 15px;
border: 1px solid #ccc;
@include border-radius(4px);
margin-right: 15px;
}
.issues_content {
@ -73,7 +70,7 @@
.issues-filters,
.issues_bulk_update {
select, .select2-container {
width: 140px !important;
width: 150px !important;
display: inline-block;
}
}

3
app/helpers/labels_helper.rb
View file

@ -49,7 +49,6 @@ module LabelsHelper
end
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

3
app/helpers/milestones_helper.rb
View file

@ -28,7 +28,6 @@ module MilestonesHelper
Milestone.where(project_id: @projects)
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

34
app/views/shared/_issuable_filter.html.haml
View file

@ -14,7 +14,7 @@
%i.fa.fa-compass
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
- if controller.controller_name == 'issues'
.check-all-holder
@ -23,35 +23,19 @@
disabled: !can?(current_user, :modify_issue, @project)
.issues-other-filters
.filter-item.inline
%span.light
%i.fa.fa-user
Assignee
%strong
= users_select_tag(:assignee_id, selected: params[:assignee_id],
placeholder: 'Any', class: 'trigger-submit', any_user: true, null_user: true)
= users_select_tag(:assignee_id, selected: params[:assignee_id],
placeholder: 'Assignee', class: 'trigger-submit', any_user: true, null_user: true)
.filter-item.inline
%span.light
%i.fa.fa-user
Author
%strong
= users_select_tag(:author_id, selected: params[:author_id],
placeholder: 'Any', class: 'trigger-submit', any_user: true)
= users_select_tag(:author_id, selected: params[:author_id],
placeholder: 'Author', class: 'trigger-submit', any_user: true)
.filter-item.inline
%span.light
%i.fa.fa-clock-o
Milestone
%strong
= select_tag('milestone_id', projects_milestones_options, class: "select2 trigger-submit")
.filter-item.inline.milestone-filter
= select_tag('milestone_id', projects_milestones_options, class: "select2 trigger-submit", prompt: 'Milestone')
- if @project
.filter-item.inline
%span.light
%i.fa.fa-tag
Label
%strong
= select_tag('label_name', project_labels_options(@project), class: "select2 trigger-submit")
.filter-item.inline.labels-filter
= select_tag('label_name', project_labels_options(@project), class: "select2 trigger-submit", prompt: 'Label')
.pull-right
= render 'shared/sort_dropdown'