Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
d6e5ed8a
Commit
d6e5ed8a
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extra links in label filter dropdown fotoer
parent
04fc4484
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+8
-0
app/helpers/dropdowns_helper.rb
app/helpers/dropdowns_helper.rb
+8
-2
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+5
-1
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
d6e5ed8a
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
app/helpers/dropdowns_helper.rb
View file @
d6e5ed8a
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
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_filter.html.haml
View file @
d6e5ed8a
...
...
@@ -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'
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment