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
Léo-Paul Géneau
gitlab-ce
Commits
a718a9af
Commit
a718a9af
authored
Feb 18, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle labels filter to match common style
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
638f8541
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
13 deletions
+14
-13
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
app/views/shared/_project_filter.html.haml
app/views/shared/_project_filter.html.haml
+9
-8
features/steps/project/project_filter_labels.rb
features/steps/project/project_filter_labels.rb
+3
-3
No files found.
app/helpers/projects_helper.rb
View file @
a718a9af
...
@@ -83,9 +83,9 @@ module ProjectsHelper
...
@@ -83,9 +83,9 @@ module ProjectsHelper
def
label_filter_class
(
label_name
)
def
label_filter_class
(
label_name
)
if
selected_label?
(
label_name
)
if
selected_label?
(
label_name
)
'l
ist-group
-item active'
'l
abel-filter
-item active'
else
else
'l
ist-group-item
'
'l
abel-filter-item light
'
end
end
end
end
...
...
app/views/shared/_project_filter.html.haml
View file @
a718a9af
...
@@ -29,15 +29,16 @@
...
@@ -29,15 +29,16 @@
-
if
defined?
(
labels
)
-
if
defined?
(
labels
)
%fieldset
%fieldset
%legend
Labels
%legend
Labels
%ul
.
list-group
%ul
.
nav.nav-pills.nav-stacked.nav-small.labels-filter
-
issue_label_names
.
each
do
|
label_name
|
-
issue_label_names
.
each
do
|
label_name
|
=
link_to
labels_filter_path
(
label_name
),
class:
label_filter_class
(
label_name
)
do
%li
{
class:
label_filter_class
(
label_name
)}
%span
{
class:
"label #{label_css_class(label_name)}"
}
=
link_to
labels_filter_path
(
label_name
)
do
%i
.icon-tag
%span
{
class:
"label #{label_css_class(label_name)}"
}
=
label_name
%i
.icon-tag
-
if
selected_label?
(
label_name
)
=
label_name
.pull-right
-
if
selected_label?
(
label_name
)
%i
.icon-remove
.pull-right
%i
.icon-remove
%fieldset
%fieldset
-
if
%w(state scope milestone_id assignee_id label_name)
.
select
{
|
k
|
params
[
k
].
present?
}.
any?
-
if
%w(state scope milestone_id assignee_id label_name)
.
select
{
|
k
|
params
[
k
].
present?
}.
any?
...
...
features/steps/project/project_filter_labels.rb
View file @
a718a9af
...
@@ -4,19 +4,19 @@ class ProjectFilterLabels < Spinach::FeatureSteps
...
@@ -4,19 +4,19 @@ class ProjectFilterLabels < Spinach::FeatureSteps
include
SharedPaths
include
SharedPaths
Then
'I should see "bug" in labels filter'
do
Then
'I should see "bug" in labels filter'
do
within
".l
ist-group
"
do
within
".l
abels-filter
"
do
page
.
should
have_content
"bug"
page
.
should
have_content
"bug"
end
end
end
end
And
'I should see "feature" in labels filter'
do
And
'I should see "feature" in labels filter'
do
within
".l
ist-group
"
do
within
".l
abels-filter
"
do
page
.
should
have_content
"feature"
page
.
should
have_content
"feature"
end
end
end
end
And
'I should see "enhancement" in labels filter'
do
And
'I should see "enhancement" in labels filter'
do
within
".l
ist-group
"
do
within
".l
abels-filter
"
do
page
.
should
have_content
"enhancement"
page
.
should
have_content
"enhancement"
end
end
end
end
...
...
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