use new icons from icon font

pull/6827/head
Christian Ratz 11 years ago
parent a2da4a3e66
commit 5a0946603d
  1. 2
      lib/open_project/reporting/engine.rb
  2. 14
      lib/widget/entry_table.rb

@ -98,7 +98,7 @@ module OpenProject::Reporting
:after => :cost_objects, :after => :cost_objects,
:caption => :cost_reports_title, :caption => :cost_reports_title,
:if => Proc.new { |project| project.module_enabled?(:reporting_module) }, :if => Proc.new { |project| project.module_enabled?(:reporting_module) },
:html => {:'data-icon2' => "w"} :html => {:class => 'icon2 icon-stats'}
end end
end end
end end

@ -73,13 +73,17 @@ class Widget::Table::EntryTable < Widget::Table
icons = "" icons = ""
with_project(result.fields['project_id']) do with_project(result.fields['project_id']) do
if entry_for(result).editable_by? User.current if entry_for(result).editable_by? User.current
icons = link_to(image_tag('webalys/edit.png'), icons = link_to(icon_wrapper('icon-context icon-edit', l(:button_edit)),
action_for(result, :action => 'edit'), action_for(result, :action => 'edit'),
:class => 'no-decoration-on-hover',
:title => l(:button_edit)) :title => l(:button_edit))
icons << link_to(image_tag('webalys/delete.png'), icons << link_to(icon_wrapper('icon-context icon-delete', l(:button_delete)),
(action_for(result, :action => 'destroy').reverse_merge(:authenticity_token => form_authenticity_token)), (action_for(result, :action => 'destroy').reverse_merge(:authenticity_token => form_authenticity_token)),
:title => l(:button_edit), :confirm => l(:text_are_you_sure), :title => l(:button_edit),
:method => :delete, :title => l(:button_delete)) :confirm => l(:text_are_you_sure),
:method => :delete,
:class => 'no-decoration-on-hover',
:title => l(:button_delete))
end end
end end
icons icons

Loading…
Cancel
Save