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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
fe823be9
Commit
fe823be9
authored
Jan 22, 2019
by
Martin Hobert
Committed by
Annabel Dunstone Gray
Jan 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(labels): Move the primary button out of breadcrumbs and into the project section
parent
30c141c9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
14 deletions
+13
-14
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-6
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+1
-6
app/views/shared/labels/_nav.html.haml
app/views/shared/labels/_nav.html.haml
+4
-0
changelogs/unreleased/fix-56558-move-primary-button.yml
changelogs/unreleased/fix-56558-move-primary-button.yml
+5
-0
qa/qa/page/label/index.rb
qa/qa/page/label/index.rb
+1
-1
spec/features/projects/labels/update_prioritization_spec.rb
spec/features/projects/labels/update_prioritization_spec.rb
+1
-1
No files found.
app/views/groups/labels/index.html.haml
View file @
fe823be9
...
@@ -6,15 +6,10 @@
...
@@ -6,15 +6,10 @@
-
subscribed
=
params
[
:subscribed
]
-
subscribed
=
params
[
:subscribed
]
-
labels_or_filters
=
@labels
.
exists?
||
search
.
present?
||
subscribed
.
present?
-
labels_or_filters
=
@labels
.
exists?
||
search
.
present?
||
subscribed
.
present?
-
if
@labels
.
present?
&&
can_admin_label
-
content_for
(
:header_content
)
do
.nav-controls
=
link_to
_
(
'New label'
),
new_group_label_path
(
@group
),
class:
"btn btn-success"
-
if
labels_or_filters
-
if
labels_or_filters
#promote-label-modal
#promote-label-modal
%div
{
class:
container_class
}
%div
{
class:
container_class
}
=
render
'shared/labels/nav'
=
render
'shared/labels/nav'
,
labels_or_filters:
labels_or_filters
,
can_admin_label:
can_admin_label
.labels-container.prepend-top-5
.labels-container.prepend-top-5
-
if
@labels
.
any?
-
if
@labels
.
any?
...
...
app/views/projects/labels/index.html.haml
View file @
fe823be9
...
@@ -5,15 +5,10 @@
...
@@ -5,15 +5,10 @@
-
subscribed
=
params
[
:subscribed
]
-
subscribed
=
params
[
:subscribed
]
-
labels_or_filters
=
@labels
.
exists?
||
@prioritized_labels
.
exists?
||
search
.
present?
||
subscribed
.
present?
-
labels_or_filters
=
@labels
.
exists?
||
@prioritized_labels
.
exists?
||
search
.
present?
||
subscribed
.
present?
-
if
labels_or_filters
&&
can_admin_label
-
content_for
(
:header_content
)
do
.nav-controls
=
link_to
_
(
'New label'
),
new_project_label_path
(
@project
),
class:
"btn btn-success qa-label-create-new"
-
if
labels_or_filters
-
if
labels_or_filters
#promote-label-modal
#promote-label-modal
%div
{
class:
container_class
}
%div
{
class:
container_class
}
=
render
'shared/labels/nav'
=
render
'shared/labels/nav'
,
labels_or_filters:
labels_or_filters
,
can_admin_label:
can_admin_label
.labels-container.prepend-top-10
.labels-container.prepend-top-10
-
if
can_admin_label
-
if
can_admin_label
...
...
app/views/shared/labels/_nav.html.haml
View file @
fe823be9
...
@@ -18,3 +18,7 @@
...
@@ -18,3 +18,7 @@
%button
.btn.btn-default
{
type:
"submit"
,
"aria-label"
=>
_
(
'Submit search'
)
}
%button
.btn.btn-default
{
type:
"submit"
,
"aria-label"
=>
_
(
'Submit search'
)
}
=
icon
(
"search"
)
=
icon
(
"search"
)
=
render
'shared/labels/sort_dropdown'
=
render
'shared/labels/sort_dropdown'
-
if
labels_or_filters
&&
can_admin_label
&&
@project
=
link_to
_
(
'New label'
),
new_project_label_path
(
@project
),
class:
"btn btn-success qa-label-create-new"
-
if
labels_or_filters
&&
can_admin_label
&&
@group
=
link_to
_
(
'New label'
),
new_group_label_path
(
@group
),
class:
"btn btn-success qa-label-create-new"
changelogs/unreleased/fix-56558-move-primary-button.yml
0 → 100644
View file @
fe823be9
---
title
:
Moved primary button for labels to follow the design patterns used on rest of the site
merge_request
:
author
:
Martin Hobert
type
:
fixed
qa/qa/page/label/index.rb
View file @
fe823be9
...
@@ -2,7 +2,7 @@ module QA
...
@@ -2,7 +2,7 @@ module QA
module
Page
module
Page
module
Label
module
Label
class
Index
<
Page
::
Base
class
Index
<
Page
::
Base
view
'app/views/
projects/labels/index
.html.haml'
do
view
'app/views/
shared/labels/_nav
.html.haml'
do
element
:label_create_new
element
:label_create_new
end
end
...
...
spec/features/projects/labels/update_prioritization_spec.rb
View file @
fe823be9
...
@@ -125,7 +125,7 @@ describe 'Prioritize labels' do
...
@@ -125,7 +125,7 @@ describe 'Prioritize labels' do
wait_for_requests
wait_for_requests
end
end
page
.
within
(
'.
breadcrumbs-container
'
)
do
page
.
within
(
'.
top-area
'
)
do
expect
(
page
).
to
have_link
(
'New label'
)
expect
(
page
).
to
have_link
(
'New label'
)
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