Merge pull request #62 from HDinger/task/22113-apply-new-icon-styling

[22113] Apply new icon styling (Reporting Engine)
pull/6827/head
Oliver Günther 9 years ago
commit 40a297114c
  1. 4
      lib/assets/stylesheets/reporting_engine/reporting.css.erb
  2. 2
      lib/widget/controls/save.rb
  3. 6
      lib/widget/controls/save_as.rb

@ -465,10 +465,6 @@ td:hover .drill_down, th:hover .drill_down {
background-image: url(<%= asset_path 'reporting_engine/disk.gif' %>); background-image: url(<%= asset_path 'reporting_engine/disk.gif' %>);
} }
.button .icon-save-as {
background-image: url(<%= asset_path 'reporting_engine/disks.gif' %>);
}
.button .icon-delete { .button .icon-delete {
background-image: url(<%= asset_path 'reporting_engine/delete.gif' %>); background-image: url(<%= asset_path 'reporting_engine/delete.gif' %>);
} }

@ -23,7 +23,7 @@ class Widget::Controls::Save < Widget::Controls
write link_to(l(:button_save), write link_to(l(:button_save),
'#', '#',
id: 'query-breadcrumb-save', id: 'query-breadcrumb-save',
class: 'button icon-context icon-save1', class: 'button icon-context icon-save',
:"data-target" => url_for(action: 'update', id: @subject.id, set_filter: '1')) :"data-target" => url_for(action: 'update', id: @subject.id, set_filter: '1'))
end end
end end

@ -21,10 +21,10 @@ class Widget::Controls::SaveAs < Widget::Controls
def render def render
if @subject.new_record? if @subject.new_record?
link_name = l(:button_save) link_name = l(:button_save)
icon = 'icon-save1' icon = 'icon-save'
else else
link_name = l(:button_save_as) link_name = l(:button_save_as)
icon = 'icon-save1' icon = 'icon-save'
end end
button = link_to(link_name, '#', id: 'query-icon-save-as', class: "button icon-context #{icon}") button = link_to(link_name, '#', id: 'query-icon-save-as', class: "button icon-context #{icon}")
write(button + render_popup) write(button + render_popup)
@ -61,7 +61,7 @@ class Widget::Controls::SaveAs < Widget::Controls
save = link_to(l(:button_save), save = link_to(l(:button_save),
'#', '#',
id: 'query-icon-save-button', id: 'query-icon-save-button',
class: 'button -highlight icon-context icon-save1', class: 'button -highlight icon-context icon-save',
:"data-target" => url_for(action: 'create', set_filter: '1')) :"data-target" => url_for(action: 'create', set_filter: '1'))
cancel = link_to(l(:button_cancel), cancel = link_to(l(:button_cancel),

Loading…
Cancel
Save