diff --git a/after_init.rb b/after_init.rb index f84fe05..aa87229 100644 --- a/after_init.rb +++ b/after_init.rb @@ -27,7 +27,7 @@ def custom_workflows_init # Administration menu extension Redmine::MenuManager.map :admin_menu do |menu| menu.push :custom_workflows, { controller: 'custom_workflows', action: 'index'}, - caption: :label_custom_workflow_plural, html: { class: 'icon icon-workflow workflows'} + caption: :label_custom_workflow_plural, html: { class: 'icon icon-workflows workflows'} end end diff --git a/app/views/custom_workflows/index.html.erb b/app/views/custom_workflows/index.html.erb index 339747d..b94195e 100644 --- a/app/views/custom_workflows/index.html.erb +++ b/app/views/custom_workflows/index.html.erb @@ -42,13 +42,16 @@ <%= reorder_handle(workflow, url: url_for(action: 'reorder', id: workflow) ) %> +
<% if workflow.active? %> - <%= link_to(l(:button_custom_workflow_deactivate), custom_workflow_status_path(workflow, :active => false), :class => 'icon icon-inactive', :method => :post) %> + <%= link_to(l(:button_custom_workflow_deactivate), custom_workflow_status_path(workflow, active: false), class: 'icon icon-lock', method: :post) %> <% else %> - <%= link_to(l(:button_custom_workflow_activate), custom_workflow_status_path(workflow, :active => true), :class => 'icon icon-active', :method => :post) %> + <%= link_to(l(:button_custom_workflow_activate), custom_workflow_status_path(workflow, active: true), class: 'icon icon-unlock', method: :post) %> <% end %> - <%= link_to(l(:label_custom_workflow_export), export_custom_workflow_path(workflow), :class => 'icon icon-export', :method => :get) %> - <%= link_to(l(:button_delete), workflow, :class => 'icon icon-del', :data => {:confirm => l(:text_are_you_sure)}, :confirm => l(:text_are_you_sure), :method => :delete) %> +
+ <%= link_to(l(:label_custom_workflow_export), export_custom_workflow_path(workflow), class: 'icon icon-export', method: :get) %> +
+ <%= link_to(l(:button_delete), workflow, class: 'icon icon-del', data: { confirm: l(:text_are_you_sure) }, confirm: l(:text_are_you_sure), method: :delete) %> <% end %> diff --git a/assets/images/active.png b/assets/images/active.png deleted file mode 100644 index a662809..0000000 Binary files a/assets/images/active.png and /dev/null differ diff --git a/assets/images/export.png b/assets/images/export.png index 49bfc2b..e319ec6 100644 Binary files a/assets/images/export.png and b/assets/images/export.png differ diff --git a/assets/images/import.png b/assets/images/import.png index 9d233b9..4471090 100644 Binary files a/assets/images/import.png and b/assets/images/import.png differ diff --git a/assets/images/inactive.png b/assets/images/inactive.png deleted file mode 100644 index 6998b88..0000000 Binary files a/assets/images/inactive.png and /dev/null differ diff --git a/assets/stylesheets/custom_workflows.css b/assets/stylesheets/custom_workflows.css index a4674bd..1e923ae 100644 --- a/assets/stylesheets/custom_workflows.css +++ b/assets/stylesheets/custom_workflows.css @@ -57,7 +57,10 @@ table.list.custom-workflows tr.disabled { } /* Icons */ -.icon-export { background-image: url(../images/export.png); } -.icon-import { background-image: url(../images/import.png); } -.icon-active { background-image: url(../images/active.png); } -.icon-inactive { background-image: url(../images/inactive.png); } \ No newline at end of file +.icon-import { + background-image: url(../images/export.png); +} + +.icon-export { + background-image: url(../images/import.png); +} \ No newline at end of file