Move job buttons out of disclosure area into main list

rundeck · Jan 7, 2011 · cee8161 · cee8161
1 parent 31404c4
commit cee8161
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/rundeckapp/grails-app/views/menu/_jobslist.gsp b/rundeckapp/grails-app/views/menu/_jobslist.gsp
@@ -58,7 +58,7 @@
                                 </div>
                             </td>
 
-                        <td class="jobrunning right" colspan="2">
+                        <td class="jobrunning " >
                             <g:if test="${nowrunning && nowrunning[scheduledExecution.id.toString()]}">
                                 <g:link class="timenow"
                                     controller="execution"
@@ -81,6 +81,9 @@
                             <g:else>&nbsp;
                             </g:else>
                         </td>
+                        <td style="width: 80px; vertical-align: top; white-space:nowrap; text-align:right" class="jobbuttons right">
+                            <g:render template="/scheduledExecution/actionButtons" model="${[scheduledExecution:scheduledExecution,authMap:authMap,jobauthorizations:jobauthorizations]}"/>
+                        </td>
 
                         </tr>
                             <g:timerEnd key="jobslistHead"/>
@@ -102,15 +105,11 @@
                                         <td style="width: 80px; vertical-align: top; white-space:nowrap;height:100%; text-align:right" class="jobbuttons ">
                                             <div class="right">
                                             <g:timerEnd key="detail"/>
-                                            <g:timerStart key="actions"/>
-                                            <g:render template="/scheduledExecution/actionButtons" model="${[scheduledExecution:scheduledExecution,authMap:authMap,jobauthorizations:jobauthorizations]}"/>
-                                            <g:timerEnd key="actions"/>
-                                            <g:timerStart key="stats"/>
+
                                             <g:set var="lastrun" value="${scheduledExecution.id?Execution.findByScheduledExecutionAndDateCompletedIsNotNull(scheduledExecution,[max: 1, sort:'dateStarted', order:'desc']):null}"/>
                                             <g:set var="successcount" value="${scheduledExecution.id?Execution.countByScheduledExecutionAndStatus(scheduledExecution,'true'):0}"/>
                                             <g:set var="successrate" value="${execCount>0? (successcount/execCount) : 0}"/>
                                             <g:render template="/scheduledExecution/showStats" model="[scheduledExecution:scheduledExecution,lastrun:lastrun?lastrun:null, successrate:successrate]"/>
-                                            <g:timerEnd key="stats"/>
                                             </div>
                                         </td>
                                     </tr>

diff --git a/rundeckapp/web-app/css/main.css b/rundeckapp/web-app/css/main.css
@@ -1759,9 +1759,6 @@ tr.subsection > td > div.left > div.right{
 tr.subsection > td > div.right{
     padding: 5px 15px 5px 15px;
 }
-tr.sectionhead.expanded td.right{
-  padding-right:15px;
-}
 tr.sectionhead.expanded td{
     border-top:1px solid #aaa;
     padding-top:3px;