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
iv
gitlab-ce
Commits
0cb7d834
Commit
0cb7d834
authored
Jun 14, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add handler icon to prioritized labels
parent
8bfbafbb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
7 deletions
+32
-7
app/assets/javascripts/LabelManager.js.coffee
app/assets/javascripts/LabelManager.js.coffee
+5
-2
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+1
-1
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+6
-0
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+14
-0
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+4
-4
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+2
-0
No files found.
app/assets/javascripts/LabelManager.js.coffee
View file @
0cb7d834
...
...
@@ -42,10 +42,10 @@ class @LabelManager
$from
=
@
prioritizedLabels
if
$from
.
find
(
'li'
).
length
is
1
$from
.
find
(
'.empty-message'
).
show
(
)
$from
.
find
(
'.empty-message'
).
removeClass
(
'hidden'
)
if
not
$target
.
find
(
'li'
).
length
$target
.
find
(
'.empty-message'
).
hide
(
)
$target
.
find
(
'.empty-message'
).
addClass
(
'hidden'
)
$label
.
detach
().
appendTo
(
$target
)
...
...
@@ -54,6 +54,9 @@ class @LabelManager
if
action
is
'remove'
xhr
=
$
.
ajax
url
:
url
,
type
:
'DELETE'
# Restore empty message
$from
.
find
(
'.empty-message'
).
removeClass
(
'hidden'
)
unless
$from
.
find
(
'li'
).
length
else
xhr
=
@
savePrioritySort
(
$label
,
action
)
...
...
app/assets/stylesheets/framework/lists.scss
View file @
0cb7d834
...
...
@@ -159,7 +159,7 @@ ul.content-list {
background-color
:
$gray-light
;
border
:
dotted
1px
$gray-dark
;
margin
:
1px
0
;
min-height
:
30
px
;
min-height
:
52
px
;
}
}
}
...
...
app/assets/stylesheets/framework/nav.scss
View file @
0cb7d834
...
...
@@ -242,6 +242,12 @@
}
}
}
&
.adjust
{
.nav-text
,
.nav-controls
{
width
:
auto
;
}
}
}
.layout-nav
{
...
...
app/assets/stylesheets/pages/labels.scss
View file @
0cb7d834
...
...
@@ -115,6 +115,13 @@
}
}
.draggable-handler
{
display
:
inline-block
;
opacity
:
0
;
transition
:
opacity
.3s
;
color
:
$gray-darkest
;
}
.prioritized-labels
{
margin-bottom
:
30px
;
...
...
@@ -122,6 +129,13 @@
display
:
none
;
color
:
$gray-light
;
}
li
:hover
{
.draggable-handler
{
display
:
inline-block
;
opacity
:
1
;
}
}
}
.other-labels
{
...
...
app/views/projects/labels/index.html.haml
View file @
0cb7d834
...
...
@@ -4,9 +4,10 @@
=
render
"projects/issues/head"
%div
{
class:
(
container_class
)
}
.top-area
.top-area
.adjust
.nav-text
Labels can be applied to issues and merge requests.
Labels can be applied to issues and merge requests. Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.
.nav-controls
-
if
can?
(
current_user
,
:admin_label
,
@project
)
=
link_to
new_namespace_project_label_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
do
...
...
@@ -19,10 +20,9 @@
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
%h5
Prioritized Labels
%ul
.content-list.manage-labels-list.js-prioritized-labels
{
"data-url"
=>
set_priorities_namespace_project_labels_path
(
@project
.
namespace
,
@project
)
}
%p
.empty-message
{
class:
(
'hidden'
unless
@prioritized_labels
.
empty?
)
}
No prioritized labels yet
-
if
@prioritized_labels
.
present?
=
render
@prioritized_labels
-
else
%p
.empty-message
No prioritized labels yet
.other-labels
-
if
can?
(
current_user
,
:admin_label
,
@project
)
%h5
{
class:
(
'hide'
if
hide
)
}
Other Labels
...
...
app/views/shared/_label_row.html.haml
View file @
0cb7d834
%span
.label-row
-
if
can?
(
current_user
,
:admin_label
,
@project
)
.draggable-handler
=
icon
(
'bars'
)
.js-toggle-priority.toggle-priority
{
data:
{
url:
remove_priority_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
),
dom_id:
dom_id
(
label
)
}
}
%button
.add-priority.btn.has-tooltip
{
title:
'Prioritize'
,
:'data-placement'
=>
'top'
}
...
...
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