Skip to content

Commit

Permalink
show page has larger toolbar icons
Browse files Browse the repository at this point in the history
  • Loading branch information
gschueler committed Jul 10, 2013
1 parent 608e533 commit 2e23889
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 44 deletions.
76 changes: 40 additions & 36 deletions graphics/icon-file.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 15 additions & 7 deletions rundeckapp/grails-app/views/scheduledExecution/_actionButtons.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -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="${[:]}"/>
Expand All @@ -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>
Expand All @@ -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;">
Expand Down
2 changes: 1 addition & 1 deletion rundeckapp/grails-app/views/scheduledExecution/_show.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file modified rundeckapp/web-app/images/icon-file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified rundeckapp/web-app/images/icon-med-file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified rundeckapp/web-app/images/icon-small-file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2e23889

Please sign in to comment.