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
6374e999
Commit
6374e999
authored
6 years ago
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update sort button to show sort direction icon
parent
a19c84e3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
7 deletions
+10
-7
ee/app/assets/stylesheets/pages/roadmap.scss
ee/app/assets/stylesheets/pages/roadmap.scss
+4
-1
ee/app/helpers/ee/sorting_helper.rb
ee/app/helpers/ee/sorting_helper.rb
+5
-2
ee/app/views/shared/epic/_sort_dropdown.html.haml
ee/app/views/shared/epic/_sort_dropdown.html.haml
+1
-4
No files found.
ee/app/assets/stylesheets/pages/roadmap.scss
View file @
6374e999
...
...
@@ -34,14 +34,17 @@ $column-right-gradient: linear-gradient(
}
.dropdown-toggle-split
{
color
:
$gl-text-color-secondary
;
padding-top
:
$gl-btn-vert-padding
;
border
:
1px
solid
$border-color
;
border-left
:
0
;
border-top-right-radius
:
$border-radius-base
;
border-bottom-right-radius
:
$border-radius-base
;
background-color
:
$white-light
;
color
:
$gl-text-color-secondary
;
&
:hover
{
color
:
$gl-text-color
;
border-color
:
$gray-darkest
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
ee/app/helpers/ee/sorting_helper.rb
View file @
6374e999
...
...
@@ -43,9 +43,12 @@ module EE
# Creates a button with the opposite ordering for the current field in UI.
def
sort_order_button
(
sort
)
opposite_sorting_param
=
epics_ordering_options_hash
[
sort
]
||
epics_ordering_options_hash
.
key
(
sort
)
sort_icon
=
sort
.
end_with?
(
'desc'
)
?
'sort-highest'
:
'
sort-lowest'
sort_icon
=
sort
.
end_with?
(
'desc'
)
?
'sort-highest'
:
'sort-lowest'
link_to
sort_icon
,
page_filter_path
(
sort:
opposite_sorting_param
,
label:
true
)
link_to
sprite_icon
(
sort_icon
,
size:
16
),
page_filter_path
(
sort:
opposite_sorting_param
,
label:
true
),
class:
"dropdown-toggle-split btn-sort-direction"
,
title:
sort
.
end_with?
(
'desc'
)
?
_
(
"Descending"
)
:
_
(
"Ascending"
)
end
def
sort_title_start_date
...
...
This diff is collapsed.
Click to expand it.
ee/app/views/shared/epic/_sort_dropdown.html.haml
View file @
6374e999
...
...
@@ -11,7 +11,4 @@
=
sortable_item
(
sort_title_recently_updated
,
page_filter_path
(
sort:
sort_value_recently_updated
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_start_date
,
page_filter_path
(
sort:
sort_value_start_date_later
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_end_date
,
page_filter_path
(
sort:
sort_value_end_date_later
,
label:
true
),
sorted_by
)
%button
.dropdown-toggle-split.pt-2
{
type:
'button'
}
=
sort_order_button
(
@sort
)
-#= sprite_icon('sort-highest', size: 16)
-#= sprite_icon('sort-lowest', size: 16)
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