home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

Extra links in label filter dropdown fotoer

Browse Source
This commit is contained in:
Phil Hughes
2016-03-10 13:54:54 +00:00
parent 04fc44841d
commit d6e5ed8a97
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/framework/dropdowns.scss
+8
View File
@@ -301,6 +301,14 @@
border-top: 1px solid $dropdown-divider-color;
}
.dropdown-footer-list {
font-size: 14px;
a {
padding-left: 10px;
}
}
.dropdown-loading {
position: absolute;
top: 0;
app/helpers/dropdowns_helper.rb
+8 -2
View File
@@ -1,5 +1,5 @@
module DropdownsHelper
def dropdown_tag(toggle_text, id: nil, toggle_class: nil, dropdown_class: nil, title: false, filter: false, placeholder: "", data: {}, &block)
def dropdown_tag(toggle_text, id: nil, toggle_class: nil, dropdown_class: nil, title: false, filter: false, placeholder: "", footer_content: false, data: {}, &block)
content_tag :div, class: "dropdown" do
toggle_hash = data.merge({toggle: "dropdown"})
@@ -33,7 +33,13 @@ module DropdownsHelper
end
output += content_tag :div, class: "dropdown-content" do
capture(&block) if block
capture(&block) if block && !footer_content
end
if block && footer_content
output += content_tag :div, class: "dropdown-footer" do
capture(&block)
end
end
output += content_tag :div, class: "dropdown-loading" do
app/views/shared/issuable/_filter.html.haml
+5 -1
View File
@@ -25,7 +25,11 @@
.filter-item.inline.labels-filter
= dropdown_tag("Label", title: "Filter by label", toggle_class: "js-label-select", filter: true, dropdown_class: "dropdown-menu-labels dropdown-menu-selectable",
placeholder: "Search labels", data: {field_name: "label_name", selected: params[:label_name], project_id: @project.id})
placeholder: "Search labels", footer_content: true, data: {field_name: "label_name", selected: params[:label_name], project_id: @project.id}) do
%ul.dropdown-footer-list
%li
= link_to namespace_project_labels_path(@project.namespace, @project) do
Manage labels
.pull-right
= render 'shared/sort_dropdown'