meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Replaces icon-sorted-asc and icon-sorted-desc with SVG icons (#23980).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@23042 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2024-09-08 17:25:49 +00:00
parent 166540d743
commit 09938ac490
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/application.css
View File

@ -1776,8 +1776,8 @@ span.icon-label {
.icon-bookmark:not(:has(svg)) { background-image: url(/tag_blue_delete.png); }
.icon-bookmark-off:not(:has(svg)) { background-image: url(/tag_blue_add.png); }
.icon-bookmarked-project:not(:has(svg)) { background-image: url(/tag_blue.png); }
.icon-sorted-asc { background-image: url(/arrow_down.png); }
.icon-sorted-desc { background-image: url(/arrow_up.png); }
.icon-sorted-asc:not(:has(svg)) { background-image: url(/arrow_down.png); }
.icon-sorted-desc:not(:has(svg)) { background-image: url(/arrow_up.png); }
.icon-toggle-plus { background-image: url(/bullet_toggle_plus.png) }
.icon-toggle-minus { background-image: url(/bullet_toggle_minus.png) }
.icon-clear-query:not(:has(svg)) { background-image: url(/close_hl.png); }

4
app/helpers/queries_helper.rb
View File

@ -205,9 +205,11 @@ module QueriesHelper
if column.name.to_s == query.sort_criteria.first_key
if query.sort_criteria.first_asc?
css = 'sort asc icon icon-sorted-desc'
icon = 'angle-up'
order = 'desc'
else
css = 'sort desc icon icon-sorted-asc'
icon = 'angle-down'
order = 'asc'
end
end
@ -223,7 +225,7 @@ module QueriesHelper
end
content =
link_to(
column.caption,
icon_with_label(icon, column.caption),
{:params => request.query_parameters.deep_merge(sort_param)},
link_options
)

4
app/helpers/sort_helper.rb
View File

@ -116,16 +116,18 @@ module SortHelper
if column.to_s == @sort_criteria.first_key
if @sort_criteria.first_asc?
css = 'sort asc icon icon-sorted-desc'
icon = 'angle-up'
order = 'desc'
else
css = 'sort desc icon icon-sorted-asc'
icon = 'angle-down'
order = 'asc'
end
end
caption = column.to_s.humanize unless caption
sort_options = {:sort => @sort_criteria.add(column.to_s, order).to_param}
link_to(caption, {:params => request.query_parameters.merge(sort_options)}, :class => css)
link_to(icon_with_label(icon, caption), {:params => request.query_parameters.merge(sort_options)}, :class => css)
end
# Returns a table header <th> tag with a sort link for the named column