meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Use the regular "icon icon-*" classes for sort-handle (#31433).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18203 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-05-27 21:19:51 +00:00
parent 069577c133
commit 5b29b2b5d1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -595,7 +595,7 @@ module ApplicationHelper
:reorder_param => options[:param] || object.class.name.underscore :reorder_param => options[:param] || object.class.name.underscore
} }
content_tag('span', '', content_tag('span', '',
:class => "sort-handle", :class => "icon-only icon-sort-handle sort-handle",
:data => data, :data => data,
:title => l(:button_sort)) :title => l(:button_sort))
end end

4
app/helpers/my_helper.rb
View File

@ -34,10 +34,10 @@ module MyHelper
def render_block(block, user) def render_block(block, user)
content = render_block_content(block, user) content = render_block_content(block, user)
if content.present? if content.present?
handle = content_tag('span', '', :class => 'sort-handle', :title => l(:button_move)) handle = content_tag('span', '', :class => 'icon-only icon-sort-handle sort-handle', :title => l(:button_move))
close = link_to(l(:button_delete), close = link_to(l(:button_delete),
{:action => "remove_block", :block => block}, {:action => "remove_block", :block => block},
:remote => true, :method => 'post', :remote => true, :method => 'post',
:class => "icon-only icon-close", :title => l(:button_delete)) :class => "icon-only icon-close", :title => l(:button_delete))
content = content_tag('div', handle + close, :class => 'contextual') + content content = content_tag('div', handle + close, :class => 'contextual') + content

2
app/views/custom_field_enumerations/index.html.erb
View File

@ -6,7 +6,7 @@
<ul id="custom_field_enumerations" class="flat"> <ul id="custom_field_enumerations" class="flat">
<% @custom_field.enumerations.each_with_index do |value, position| %> <% @custom_field.enumerations.each_with_index do |value, position| %>
<li> <li>
<span class="sort-handle"></span> <span class="icon-only icon-sort-handle sort-handle"></span>
<%= hidden_field_tag "custom_field_enumerations[#{value.id}][position]", position, :class => 'position' %> <%= hidden_field_tag "custom_field_enumerations[#{value.id}][position]", position, :class => 'position' %>
<%= text_field_tag "custom_field_enumerations[#{value.id}][name]", value.name, :size => 40 %> <%= text_field_tag "custom_field_enumerations[#{value.id}][name]", value.name, :size => 40 %>
<%= hidden_field_tag "custom_field_enumerations[#{value.id}][active]", 0 %> <%= hidden_field_tag "custom_field_enumerations[#{value.id}][active]", 0 %>

3
public/stylesheets/application.css
View File

@ -1500,6 +1500,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
.icon-add-bullet { background-image: url(../images/bullet_add.png); } .icon-add-bullet { background-image: url(../images/bullet_add.png); }
.icon-shared { background-image: url(../images/link.png); } .icon-shared { background-image: url(../images/link.png); }
.icon-actions { background-image: url(../images/3_bullets.png); } .icon-actions { background-image: url(../images/3_bullets.png); }
.icon-sort-handle { background-image: url(../images/reorder.png); }
.icon-bookmark { background-image: url(../images/tag_blue_delete.png); } .icon-bookmark { background-image: url(../images/tag_blue_delete.png); }
.icon-bookmark-off { background-image: url(../images/tag_blue_add.png); } .icon-bookmark-off { background-image: url(../images/tag_blue_add.png); }
@ -1522,7 +1523,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
.icon-file.application-zip { background-image: url(../images/files/zip.png); } .icon-file.application-zip { background-image: url(../images/files/zip.png); }
.icon-file.application-x-gzip { background-image: url(../images/files/zip.png); } .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
.sort-handle { width:16px; height:16px; background:url(../images/reorder.png) no-repeat 0 50%; cursor:move; } .sort-handle { cursor:move; }
.sort-handle.ajax-loading { background-image: url(../images/loading.gif); } .sort-handle.ajax-loading { background-image: url(../images/loading.gif); }
tr.ui-sortable-helper { border:1px solid #e4e4e4; } tr.ui-sortable-helper { border:1px solid #e4e4e4; }