From a3d3544191ca3fa773fe684730d3e6203840a6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Thu, 22 Aug 2019 15:01:45 +0200 Subject: [PATCH] Missing command icons --- after_init.rb | 2 +- app/views/custom_workflows/index.html.erb | 11 +++++++---- assets/images/active.png | Bin 316 -> 0 bytes assets/images/export.png | Bin 265 -> 247 bytes assets/images/import.png | Bin 279 -> 259 bytes assets/images/inactive.png | Bin 330 -> 0 bytes assets/stylesheets/custom_workflows.css | 11 +++++++---- 7 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 assets/images/active.png delete mode 100644 assets/images/inactive.png 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 a662809d43348f68f86d599fb3406075c8652c5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPVk-lnPX{%hSa% z#KJ%M$N&HKGLu=`HZuCYkNRJIx4$h}KwhhrYlGy2I(?xvnFqgH7Vtc3KC;kDfZ;B~ z1Yd>LV0-_@$0y^}nlmR@w0U3PWw?3e!#Y-Vwv)}GhZuG-Dntv-fA+_}ZWjA-1v{SP z3g){E-M|0+|NH*VO0|RG)M`SSr1Gg{;GcwGYBLNg-FY)wsWq-^e z#$%|);`3V-C?uO15>euupPQSSR|4cRFgO>bCYGe8D3oWGWGJ|M`Ua%vrLqIXqdi?5 zLo7}wCoB*!FfuSOSh94fA&@dyv2y0$5cROfYonJ-q@SI2)S>#qW#i}ej`{+NcP>$B zov6aR;bzZS0k@#Jy?GqUE9>0MTOJuCEHatq#+#6kpg1KlV_rBzL8*fKmap9+AP0E5 L`njxgN@xNA3jawu delta 237 zcmey)*vT|OrJg0-(btiIVPik{pF~y$1_sUokH}&M2EIce%qXhi)c_QfC~=J_3C>R| zDNig)Whh9@%q!8$OD$0_(KFC9O>H$w1*&QHba4!^@W0w~nzO+`fOR_q_eQzf8#-fj z9XGJ9K5^4Z<+{rE8LhErrb`@YX69FU$7AEDX&RB1y>z~}yE?VO0|RG)M`SSr1Gg{;GcwGYBLNg-FY)wsWq-^e z#$zaQX7;M3Kq1-8kcblJ{M_8syb>Unfx)>bHL)Z$MWH;iBtya7(>EYRFO?lAp6==5 z7-DfcIbnf-!J|nY-rmid)6dRoz04pMBb1PpmG)n7Po#xz(xNNei`f>qCi|bC^S{Mp z%9JGrk9^sG@Hk%YF;+}8W|^I~M^o^oK+G&orldnHjanNgOqC4Q<(|AT_S+9~jHj!g%Q~loCIE2JPy_$~ delta 251 zcmV2^eEGBQgX8_OkcBWc@q<0dpw>9neTXWVs!~>H?N?0Ug@h53qbE z02$mq;SAPR@G%$A|5;nvFC6isKyJPZJb|^h5KU=GRuiDHhZ_I@002ovPDHLkV1jpB BUf2Kt diff --git a/assets/images/inactive.png b/assets/images/inactive.png deleted file mode 100644 index 6998b886eca28bf2cd057fb38728785771957bab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@p-JULvAr}70KmPx>mzm7kwvqAutY81{fB)2;EFiDd%C$kV;QU?oH7|e9 zDJ|f6)O=*2mjJ_Eh6%n3t@D@bv_00JEZ&$o!J^Ik0xyI0_J!=~Y$uyV4>9awREVCZ zmiD)P)|}o03U(sN70h=Vev5_ufB(DvZ@qv3-!TOHq)$ 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