From 2e23889a4da90d74f9bdda95d9d04d16293d17ba Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Wed, 10 Jul 2013 13:12:18 -0700
Subject: [PATCH] show page has larger toolbar icons

---
 graphics/icon-file.svg                        |  76 +++++++++---------
 .../scheduledExecution/_actionButtons.gsp     |  22 +++--
 .../views/scheduledExecution/_show.gsp        |   2 +-
 rundeckapp/web-app/images/icon-file.png       | Bin 668 -> 676 bytes
 rundeckapp/web-app/images/icon-med-file.png   | Bin 479 -> 499 bytes
 rundeckapp/web-app/images/icon-small-file.png | Bin 399 -> 392 bytes
 6 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/graphics/icon-file.svg b/graphics/icon-file.svg
index 666be26da7f..8faa0683ce6 100644
--- a/graphics/icon-file.svg
+++ b/graphics/icon-file.svg
@@ -16,16 +16,15 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="icon-file.svg"
-   inkscape:export-filename="/Users/greg/devel/rundeck/rundeckapp/web-app/images/icon-file.png"
-   inkscape:export-xdpi="6.0976253"
-   inkscape:export-ydpi="6.0976253">
+   inkscape:export-filename="/Users/greg/devel/rundeck/rundeckapp/web-app/images/icon-small-file.png"
+   inkscape:export-xdpi="3.0208426"
+   inkscape:export-ydpi="3.0208426">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3882">
       <stop
-         style="stop-color:#646464;stop-opacity:1;"
+         style="stop-color:#4b4b4b;stop-opacity:1;"
          offset="0"
          id="stop3884" />
       <stop
@@ -93,14 +92,6 @@
        x2="450.40686"
        y2="430.71918"
        gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter3818">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.9990995"
-         id="feGaussianBlur3820" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3870"
@@ -110,23 +101,31 @@
        x2="414.78818"
        y2="316.06274"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3882"
+       id="linearGradient3888"
+       x1="475.37787"
+       y1="478.24966"
+       x2="412.50797"
+       y2="290.13843"
+       gradientUnits="userSpaceOnUse" />
     <filter
        inkscape:collect="always"
-       id="filter3878">
+       id="filter3777">
       <feGaussianBlur
          inkscape:collect="always"
-         stdDeviation="7.8000028"
-         id="feGaussianBlur3880" />
+         stdDeviation="5.8453125"
+         id="feGaussianBlur3779" />
     </filter>
-    <linearGradient
+    <filter
        inkscape:collect="always"
-       xlink:href="#linearGradient3882"
-       id="linearGradient3888"
-       x1="507.00153"
-       y1="462.82349"
-       x2="438.73245"
-       y2="274.71225"
-       gradientUnits="userSpaceOnUse" />
+       id="filter3781">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.8494855"
+         id="feGaussianBlur3783" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -135,11 +134,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.32412449"
-     inkscape:cx="381.38763"
-     inkscape:cy="504"
+     inkscape:zoom="1.296498"
+     inkscape:cx="347.45005"
+     inkscape:cy="689.11406"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1035"
      inkscape:window-height="815"
@@ -161,18 +160,23 @@
   <g
      inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="shadow">
+     inkscape:label="shadow"
+     sodipodi:insensitive="true">
     <path
-       style="color:#000000;fill:url(#linearGradient3876);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3878);enable-background:accumulate"
-       d="M 211.28125 333.5 L 211.28125 768.375 L 551.28125 768.375 L 551.28125 451.4375 L 433.3125 333.5 L 211.28125 333.5 z "
-       id="path3858" />
+       style="color:#000000;fill:url(#linearGradient3876);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3777);enable-background:accumulate"
+       d="m 211.28125,333.5 0,448.6307 340,0 0,-330.6932 L 433.3125,333.5 z"
+       id="path3858"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/Users/greg/devel/rundeck/rundeckapp/web-app/images/icon-small-file.png"
+       inkscape:export-xdpi="3.0208426"
+       inkscape:export-ydpi="3.0208426" />
   </g>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <path
        style="color:#000000;fill:url(#linearGradient3761);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 211.28572,328.36218 216.90928,0 123.091,123.09 -2.8e-4,316.91 -340,0 z"
@@ -183,8 +187,8 @@
        sodipodi:nodetypes="csssccc"
        inkscape:connector-curvature="0"
        id="path3808"
-       d="m 434.6273,329.86218 c 0,0 -0.31502,0.26065 3.31424,2.27763 22.47037,12.48806 39.85628,34.39106 57.76475,52.83436 17.08275,17.59292 32.98225,35.23662 47.08224,55.29955 2.56102,3.64409 17.82317,10.19524 17.82317,10.19524 l -116.94535,-2.4652 z"
-       style="fill:url(#linearGradient3888);fill-opacity:1;stroke:none;filter:url(#filter3818)" />
+       d="m 434.6273,329.86218 c 0,0 -0.31502,0.26065 3.31424,2.27763 22.47037,12.48806 39.85628,34.39106 57.76475,52.83436 17.08275,17.59292 32.98225,35.23662 47.08224,55.29955 2.56102,3.64409 10.11008,10.19524 10.11008,10.19524 l -116.94535,1.39134 z"
+       style="fill:url(#linearGradient3888);fill-opacity:1;stroke:none;filter:url(#filter3781)" />
     <path
        style="fill:url(#linearGradient3804);fill-opacity:1;stroke:none"
        d="m 428.195,328.36218 c 0,0 7.79555,3.22585 11.42481,5.24283 22.47037,12.48806 40.67801,31.92586 58.58648,50.36916 17.08275,17.59292 32.98225,35.23662 47.08224,55.29955 2.56102,3.64409 5.99747,12.17846 5.99747,12.17846 0,0 1.5494,-21.34224 -101.11805,-19.57974 C 446.25212,324.61889 433.33242,334.93802 428.195,328.36218 z"
diff --git a/rundeckapp/grails-app/views/scheduledExecution/_actionButtons.gsp b/rundeckapp/grails-app/views/scheduledExecution/_actionButtons.gsp
index 91c3f0967b2..6e91e8cea07 100644
--- a/rundeckapp/grails-app/views/scheduledExecution/_actionButtons.gsp
+++ b/rundeckapp/grails-app/views/scheduledExecution/_actionButtons.gsp
@@ -25,6 +25,14 @@
 <g:timerStart key="actionButtonsNew"/>
 <g:set var="ukey" value="${g.rkey()}"/>
 <g:set var="idKey" value="${scheduledExecution.id.toString()}"/>
+<g:set var="width" value="16px"/>
+<g:set var="iname" value="icon-small"/>
+<g:if test="${iconname}">
+    <g:set var="iname" value="icon-${iconname}"/>
+</g:if>
+<g:if test="${iconsize}">
+    <g:set var="width" value="-${iconsize}"/>
+</g:if>
 <g:if test="${!jobauthorizations}">
     <%-- evaluate auth for the job on demand --%>
     <g:set var="jobauthorizations" value="${[:]}"/>
@@ -42,20 +50,20 @@
                 <g:if test="${!execPage}">
                     <auth:resourceAllowed kind="job" action="${AuthConstants.ACTION_DELETE}">
                         <g:if test="${jobAuths[AuthConstants.ACTION_DELETE]?.contains(idKey) }">
-                            <span class="icon button floatl" title="Delete ${g.message(code:'domain.ScheduledExecution.title')}" onclick="menus.showRelativeTo(this,'${ukey}jobDisplayDeleteConf${scheduledExecution.id}',-2,-2);return false;"><img src="${resource(dir:'images',file:'icon-small-removex.png')}" alt="delete" width="24px" height="24px"/></span>
+                            <span class="icon button floatl" title="Delete ${g.message(code:'domain.ScheduledExecution.title')}" onclick="menus.showRelativeTo(this,'${ukey}jobDisplayDeleteConf${scheduledExecution.id}',-2,-2);return false;"><img src="${resource(dir:'images',file: iname+'-removex.png')}" alt="delete" width="${width}" height="${width}"/></span>
                         </g:if>
                     </auth:resourceAllowed>
                 </g:if>
                 <g:if test="${jobAuths[AuthConstants.ACTION_CREATE] && jobAuths[AuthConstants.ACTION_READ]?.contains(idKey) }">
-                    <g:link controller="scheduledExecution" title="Copy Job" action="copy" id="${scheduledExecution.extid}" class="icon button floatl"><img src="${resource(dir:'images',file:'icon-small-copy.png')}" alt="copy" width="24px" height="24px"/></g:link>
+                    <g:link controller="scheduledExecution" title="Copy Job" action="copy" id="${scheduledExecution.extid}" class="icon button floatl"><img src="${resource(dir:'images',file: iname +'-copy.png')}" alt="copy" width="${width}" height="${width}"/></g:link>
                 </g:if>
                 <g:if test="${!execPage}">
                 <g:if test="${jobAuths[AuthConstants.ACTION_UPDATE]?.contains(idKey) }">
-                    <g:link controller="scheduledExecution" title="Edit Job" action="edit" id="${scheduledExecution.extid}" class="icon button floatl"><img src="${resource(dir:'images',file:'icon-small-edit.png')}" alt="edit" width="24px" height="24px"/></g:link>
+                    <g:link controller="scheduledExecution" title="Edit Job" action="edit" id="${scheduledExecution.extid}" class="icon button floatl"><img src="${resource(dir:'images',file: iname +'-edit.png')}" alt="edit" width="${width}" height="${width}"/></g:link>
                 </g:if>
                 </g:if>
                 <g:if test="${jobAuths[AuthConstants.ACTION_READ]?.contains(idKey) }">
-                    <span class="icon action button textbtn floatl obs_bubblepopup" id="downloadlink" title="Download Job definition file"><img src="${resource(dir: 'images', file: 'icon-small-file.png')}" alt="download" width="19px" height="24px"/></span>
+                    <span class="icon action button textbtn floatl obs_bubblepopup" id="downloadlink" title="Download Job definition file"><img src="${resource(dir: 'images', file: iname +'-file.png')}" alt="download" width="19px" height="${width}"/></span>
                     <div  id="downloadlink_popup" style="display:none;">
                         <span class="prompt">Select a format:</span>
                         <ul>
@@ -66,13 +74,13 @@
                 </g:if>
             </g:if>
             <g:if test="${jobAuthorized || jobAuths[AuthConstants.ACTION_RUN]?.contains(idKey) }">
-                <g:link controller="scheduledExecution" action="execute" id="${scheduledExecution.extid}" class="icon button floatl" onclick="if(typeof(loadExec)=='function'){loadExec(${scheduledExecution.id});return false;}"><img src="${resource(dir:'images',file:'icon-small-run.png')}" title="Run ${g.message(code:'domain.ScheduledExecution.title')}&hellip;" alt="run" width="24px" height="24px"/></g:link>
+                <g:link controller="scheduledExecution" action="execute" id="${scheduledExecution.extid}" class="icon button floatl" onclick="if(typeof(loadExec)=='function'){loadExec(${scheduledExecution.id});return false;}"><img src="${resource(dir:'images',file: iname +'-run.png')}" title="Run ${g.message(code:'domain.ScheduledExecution.title')}&hellip;" alt="run" width="${width}" height="${width}"/></g:link>
             </g:if>
             <g:elseif test="${ !jobAuthorized }">
-                <span class="info note floatl" style="width:24px;padding: 2px;" title="${message(code:'unauthorized.job.run')}"><img src="${resource(dir:'images',file:'icon-small-warn.png')}" alt="" width="24px" height="24px"/></span>
+                <span class="info note floatl" style="width:${width};padding: 2px;" title="${message(code:'unauthorized.job.run')}"><img src="${resource(dir:'images',file: iname +'-warn.png')}" alt="" width="${width}" height="${width}"/></span>
             </g:elseif>
             <g:else>
-                %{--<span class="floatl" style="width:24px;padding: 2px;"></span>--}%
+                %{--<span class="floatl" style="width:${width};padding: 2px;"></span>--}%
             </g:else>
         </span>
         <div id="${ukey}jobDisplayDeleteConf${scheduledExecution.id}" class="confirmBox popout" style="display:none;">
diff --git a/rundeckapp/grails-app/views/scheduledExecution/_show.gsp b/rundeckapp/grails-app/views/scheduledExecution/_show.gsp
index dde4c312b30..0851ac7b316 100644
--- a/rundeckapp/grails-app/views/scheduledExecution/_show.gsp
+++ b/rundeckapp/grails-app/views/scheduledExecution/_show.gsp
@@ -32,7 +32,7 @@
     </div>
 
     <div style="vertical-align:top;width: 200px;" class="toolbar small">
-        <g:render template="/scheduledExecution/actionButtons" model="${[scheduledExecution:scheduledExecution,objexists:objexists,jobAuthorized:jobAuthorized]}"/>
+        <g:render template="/scheduledExecution/actionButtons" model="${[scheduledExecution:scheduledExecution,objexists:objexists,jobAuthorized:jobAuthorized,iconsize:'24px',iconname:'med']}"/>
     </div>
     <div class="clear"></div>
 </div>
diff --git a/rundeckapp/web-app/images/icon-file.png b/rundeckapp/web-app/images/icon-file.png
index 9abdb42de96349e4daef484ffa7d553a914cd85c..59ac0f8cb6bf6b9168c8dd7086c4ac1a21dfba72 100644
GIT binary patch
delta 591
zcmV-V0<is@1*8R#JPPdq008X)t8bH8kwz$gAxT6*R7i=nRk4oRKoEViUL%txQX+Is
zWF;kwA{RbEl|G7ejqfMu@&_Oag!qAoo`NO~McPP7x`>VfrGXy^6&4n<@umniHZt~}
z&5bm&wL3F!=IzWb0btYV^n+=d_b4IT?RMcf&QB?&%(LSFUanTFFYR_)BsU8DVj&`b
zZ$6*@=yto0lgVU%&5i*eDJ3T&B$Y9yq@44*ZQCCm$N4iJkKg72of1m}scH}e0DxAj
z^~SdC#c()$mkU&sc^;7O`_OeA&1Um;r_))CMx(pZ6<tdp3`6Yqd(>*R2<(+*S-%H^
zfsq8_NuV-vJRae?E_7Xw*DT924~N5lFCywlDZ>beh=>?t*J8zz)rmn6V7Xkv^Smfy
zXqpBg#QkhG`$|NQQcB5B0hB7rvf-R#v)N$1ULy>{Sf!L`G#U@RUhfltZyZrcC8-la
zKnQVdoA>+u&qVY+KBKbK70GV5GXcEd_&>0$EOiRWX#l7)bqYWPB-&erx{M%yg*H(I
zmF7s%hebeC7DzQ8B+sY}b$}9mXX;eDE;CB8pB4itI#iNMT^C6neNxJ}87j|Fo^PtX
ztDI4hBnMXcnRr6*_@9UvqV~p(=O`H~bw;-ay2MQZ-I6*WMc?@fdXC#W5$}8jsXpap
zF@ZC6?AFu)F@4WV9T3yU01yE>xHAl6S+CcPe7C3L0D$Ydp6~nb>9k-(8>es9KQ7ku
dY%l%({sYIgwy=eRhgkps002ovPDHLkV1jdW4gdfE

delta 583
zcmV-N0=WI81)K$tJPPmt008g->r3tckwz$g8A(JzR7i=vmcgqMQ5eO~x!$?K%aD2-
z%NAk#Xg~r<aiM`A{w0EoaMP;AfUEuoTieq1wGD<qsIA~8P>B|1sCe&f@qDJQw3(~#
zeQ;rh`998^-#v2~0uVtE+$VWkYfZ$gFbu!<dc7akT79Tb0yrxci|^Cv^wYQ^08lP}
zm%r8P^|vHnTWeSQ`UC)PKA)eFgv&}MlMgDD%Bya-`?1kz+&v^j073`>mz78)ptWW`
zpMPGhRzJ5|t$X`~z>9KnB&Eb+v4H1!@O}SLsZ{DWo6Ym9LJ|P2wIE~X007{59;VYN
zlu{rG-}fJCtv}^*xhG*5{@NDWU~sK}*=z=-)aE{y%RO$jS|3Ojt+h+w1n5X&Hk*MY
zlv40K4@xN%3WaB#PUjs-wQ;l-b9OWw4$*G6VT{?(Nu^TAWHR+22;Pu<c@lKBS`Auj
z7-O(ntze9~ye7#P*=+V)ZliN8DJ7(o|9mzckHugxSRI|Z2u0ve>Uaz~Ywdo2m9>GB
zgyGQaj?l4t6y+t3O5Gu3TS5fDqrwnn=El%rJ9Q+TKiDYvc7$9V{clbPv2jFf_U!bv
zc1&k<QITCba1KM%{;R3GwzKXpp{VGhBHI#j3xlI`-UPbcFvLk+9DGNG!KGIMutErX
zUFd`m7J!uimZQ<=Yro%zF=j6^zqn~zi<rq|@&&+>xcIlb1K<|cC+!K#0+<8%`5Spz
VsS8IEJkJ0C002ovPDHLkV1klY7gGQL

diff --git a/rundeckapp/web-app/images/icon-med-file.png b/rundeckapp/web-app/images/icon-med-file.png
index ac6328025e2321d1738c71a8d79f25fac3452d27..a1d21a79bedd6569a7105881e43a842af5bb5b01 100644
GIT binary patch
delta 413
zcmV;O0b>5&1M>rrJPNV^006Q9Ym{i<kwz$ga7jc#R5*>TQ@v^eK^UA_58bO0<j4c0
z4e0}^Y!-ZgJi+-8sY1Hs0Yt7kut*@~^}$X^8L+SwL|ai10^z(A-kz89R`<|><zxS5
z=bP_a0=SH#=v7L20RxgG(eZaSoArF(|0+920QbY;@YC}=X(G#Gu~__!MkBw|>AV+z
z_XGfvgb>1NIF2KgQg2}xK9-URA!tjsUa#T0E|gL)K@dEbk?ma~Svr=>C8U&SG#Y5P
z+fP9dJmkr?<`piPl+EXJOs7+<Rx6NXtJV7GcDuI#;N;V^LA_qbU@$-&$JlH(5JIq4
zt3?2=oqPdopp@EM8;{3VB=58`YqBDL(jFuLS1ZfX)D3Ej)MEl*mgaVjELK4(gq1xr
z3Czf<RP*f0N__pNtddv7v&90Olx9j!M=zX6Mqu}yP9@8fSy$84(8i{<P;i(mRd<x^
z$Rj+LXFFy6em`zDo7F#MipgY>03ZQ)0B-anhInXC$L~L71zIf!^RYAl00008NkvXX
Hu0mjftA4;K

delta 392
zcmV;30eAlM1K$IXJPNb`006WB>z6Ehkwz$gTuDShR5*>zlQC|>KoCX$u6J0=$TX=^
zP&kE^hBh^o8ze;Gr134%Z~`Qdf@H~ZK~0lGBvD*aQ<FMPE`YUh3IsC7#!KQNUz%by
zqo<iaJ1mMK>ALPcG^CXJPLkwpI-P!&<;7;Rx%ND7sRILmcDwyGo6Y?3c>G?>aitW0
z<D6q3jIpy}+xC_3`>$ab1}888N5y$?S)^%-PN&01qtP;s<Hr+N9Uvdu?G{o>SeC^G
zgTd2$K7aTVjEG>GCM?Th!{P9GGMU@~fY^Ihr7X*i-b94OVgVrpTCEm{h;_T&mmmmk
z#on_j6?2Z`z;T>nnY~)A%-YU$rIccG0@!)hgoKpxVp!2f0FYAd7I4n9GL_XgKjy!J
z<^8LKm6=?oynmIS_R^&Q8t0^|=C?^iwVmnsM?|dl&~@^M&VUBT<eX<sz&Pg_>-YPj
m*X!LVrG5=E3<K-+`r`-4MrSZC)bEf00000<MNUMnLSTZ)%)*cW

diff --git a/rundeckapp/web-app/images/icon-small-file.png b/rundeckapp/web-app/images/icon-small-file.png
index b60a80c4af5fc01212e6e55d08c3a66919ed2f3b..a845235daf6ebf37bbe17f5a0192011062b35411 100644
GIT binary patch
delta 365
zcmV-z0h0cY1Be5VB!2{RLP=Bz2nYy#2xN!=000SaNLh0L004IY004IZoIJ$r0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$R1xZ9fR49?1kuhq8Komvq
zof+_3*;$8J2_Xq4oscG}0`{o{YrEg1bQ`X~)+PKESj0995Puh-A_QKFAo2S(`N@T0
z-aL4m`|dDJ)0ZfUUI9QvuvF7Dha^e%^PU;U@!s>i+o`b}bY1tREX&8buJ5ue`v3qV
zB2-G95GD=7z%UH2NxlQP1R#o}(pqEdv~7#N?-2ySMNt%Q0AK(pt@R0EvgtSus;UA2
z>~_1WIF6rxwPxr0{`|>2&qG5}uaUMSBFX^Z*3jA)kW@xQ)KB)dNUK3?iKH_8TIw9a
zH%UbFf9#z_TH5>5PDeqk#k(Oz%d(zq+kOB*5#i)wb|2MU*Bw3qygXiQ^N4lR00000
LNkvXXu0mjfM6jK{

delta 372
zcmV-)0gL{K1CIlcB!32COGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc
z0WV2JK~yNueUTw=gg_95A=RX^{Rb5!#rF50IYZK1a3|Y}OI00z0fR@PkVqt^!Sy(j
z-WKS4n;pVYsCb!UXTEuF_bl7C@4_&AjiTrs^+*LlaP)ou4S#xZUH1ty7Ib5(WjT)H
z)pgw|rN*Xd257|hSXI@K=lKX-03QSp=&>xzFANUQ1;a{|Wtl?nhYOM5V+nP}fuL0F
zR1`%I=$m~w?k5OaH8hVW5z{ms<2deFlO*}X{Ots_Z97485k!&!j)YEdde9IbLLgJG
zB(V{<<NO5ivTXn~G?&CC#Jf)r4mY8BYy){$PS9ZL64c9h_diaA*j$5n#^tN=#A&WA
z=xhdh6LG2DK<CwXYff^`Ie|P}ur;sLZ;5@pUaMaZ|L{G2?4UjL{Eyh*asC&iLP_F0
S<KiFy0000<MNUMnLSTX<l&F0G