From bae827a73801c062fb4a3ee0904fbfac622f84e2 Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Wed, 10 Jul 2013 11:22:38 -0700
Subject: [PATCH] Tweak execution show controls and page

---
 .../grails-app/i18n/messages.properties       |   1 +
 rundeckapp/grails-app/views/common/_css.gsp   |  88 +----
 .../views/execution/_execDetailsWorkflow.gsp  |   6 +-
 .../grails-app/views/execution/show.gsp       | 302 +++++++-----------
 .../scheduledExecution/_showExecutionHead.gsp |   8 +-
 rundeckapp/web-app/css/main.css               |  57 +++-
 6 files changed, 183 insertions(+), 279 deletions(-)

diff --git a/rundeckapp/grails-app/i18n/messages.properties b/rundeckapp/grails-app/i18n/messages.properties
index 5b0de859f40..f8841e2edcf 100644
--- a/rundeckapp/grails-app/i18n/messages.properties
+++ b/rundeckapp/grails-app/i18n/messages.properties
@@ -277,6 +277,7 @@ button.action.Create=Create
 execution.show.mode.Tail.desc=View the last lines of the output file
 execution.show.mode.Annotated.desc=View all output in grouped contexts sequentially
 execution.show.mode.Compact.desc=View all output collated by node
+execution.show.mode.Compact.title=By Node
 
 execution.log.storage.state.PENDING_REMOTE=Waiting for log output to become available...
 execution.log.storage.state.PENDING_LOCAL=Retrieving log output from storage...
diff --git a/rundeckapp/grails-app/views/common/_css.gsp b/rundeckapp/grails-app/views/common/_css.gsp
index c4ee976f51f..e6f6c928c5f 100644
--- a/rundeckapp/grails-app/views/common/_css.gsp
+++ b/rundeckapp/grails-app/views/common/_css.gsp
@@ -1,24 +1,5 @@
 <style type="text/css">
-    .topbar{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x;--}%
-    }
-    th{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px 0px;--}%
-    }
 
-    th.sortable{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px 0px;--}%
-    }
-    th.sorted,.secondbar{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px -16px;--}%
-    }
-    th.sortable:hover{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px -32px;--}%
-    }
-    td.selected, .selected, tr.selected{
-        %{--background: #bbb url(<g:resource dir='images' file='bggrad-select.png'/>) repeat-x top left;--}%
-        border:1px solid #999;
-    }
     tr.selected.alternateRow{
         %{--background: #bbb url(<g:resource dir='images' file='bggrad-select.png'/>) repeat-x 0px -16px;--}%
         border:1px solid #999;
@@ -32,54 +13,15 @@
         border:1px solid #999;
     }
 
-    a.toptab{
-        %{--background: #eee url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px -16px;--}%
-    }
-    a.toptab:hover{
-        %{--background: #eee url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px -32px;--}%
-    }
-    a.toptab.selected{
-        %{--background: #ddd url(<g:resource dir='images' file='bggrad-rev-pale.png'/>) repeat-x 0px 0px;--}%
-    }
-    td.dashbox div.boxctl:hover span.titlegroup,.boxct.full{
-        %{--background: #ddd url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px -16px;--}%
-    }
-
-    a.action.button:hover, span.action.button:hover,span.titlegroup.action:hover,a.textaction.button:hover, span.textaction.button:hover{
-        %{--background: #eee url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x 0px -32px;--}%
-    }
     a.action.button.selected, span.action.button.selected,a.textaction.button.selected, span.textaction.button.selected{
         %{--background: #eee url(<g:resource dir='images' file='bggrad-select.png'/>) repeat-x 0px 0px;--}%
         border:1px solid #999;
     }
 
-    div.depressed, span.depressed{
-        %{--background: #eee url(<g:resource dir='images' file='bggrad-select.png'/>) repeat-x 0px 0px;--}%
-    }
-    div.pageTop, div.pageBody.solo{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad-rev.png'/>) repeat-x top left;--}%
-
-    }
-    div.progressContainer,span.titlegroup.selected{
-        %{--background: #ddd url(<g:resource dir='images' file='bggrad-rev.png'/>) repeat-x top left;--}%
-    }
     div.progressBar{
         background: #eee url(<g:resource dir='images' file='bggrad-blue2.png'/>) repeat-x 0px 0px;
     }
 
-    table.execoutput tr.contextRow {
-        background: #ddf;
-    }
-
-    table.execoutput tr.contextRow.expandable:hover{
-        background: #ccF ;
-    }
-    table.execoutput tr.contextRow.console {
-        background: #ddd ;
-    }
-    table.execoutput tr.contextRow.expandable.console:hover{
-        background: #ccF ;
-    }
     table.execoutput tr.contextRow td.expandicon.opened{
         background: transparent url(<g:resource dir='images' file='icon-tiny-disclosure-open.png'/>) no-repeat 2px 2px;
     }
@@ -121,18 +63,6 @@
     div.pflow.missingfail {
         background:url(<g:resource dir="images" file="icon-small-warn.png"/>) top left no-repeat;
     }
-    div.login div.row.head{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad1.png'/>) repeat-x;--}%
-    }
-    #loginpage{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad-rev.png'/>) repeat-x top left;--}%
-    }
-    .depress{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad-rev.png'/>) repeat-x top left;--}%
-    }
-    .depress2{
-        %{--background: #fff url(<g:resource dir='images' file='bggrad-rev.png'/>) repeat-x -15px left;--}%
-    }
 
     /* dynamic execution list styles */
 
@@ -147,15 +77,7 @@
         background:url(<g:resource dir="images" file="icon-tiny-warn.png"/>)  2px 5px no-repeat;
     }
 
-    span.btabs span.btab{
-        %{--background: url("${resource(dir:'images', file:'bggrad1.png')}") top left repeat-x;--}%
-    }
-    span.btabs span.btab:hover{
-        %{--background: url("${resource(dir:'images', file:'bggrad1.png')}") -16px left repeat-x;--}%
-    }
-    span.btabs span.btab.selected{
-        %{--background: url("${resource(dir:'images', file:'bggrad-rev.png')}") 0px left repeat-x;--}%
-    }
+
 
     /**
     */
@@ -175,12 +97,6 @@
       background: transparent url("${resource(dir:'images', file:'bg-right-2.png')}") repeat-y top right;
     }
 
-    div.popout.selected, span.popout.selected{
-        %{--background: white url("${resource(dir:'images', file:'bggrad1.png')}") top left repeat-x;--}%
-    }
-    div.filterdef.saved{
-        %{--background: white url("${resource(dir:'images', file:'bggrad1.png')}") top left repeat-x;--}%
-    }
     span.badgeholder{
         background: url("${resource(dir:'images', file:'badge-left-tri.png')}") 0px center no-repeat;
 
@@ -231,4 +147,4 @@
         width: 12px;
         background: transparent url("${resource(dir:'images',file:'icon-tiny-refresh.png')}") center left no-repeat;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/rundeckapp/grails-app/views/execution/_execDetailsWorkflow.gsp b/rundeckapp/grails-app/views/execution/_execDetailsWorkflow.gsp
index ff7705834f4..3a4dc2c4f95 100644
--- a/rundeckapp/grails-app/views/execution/_execDetailsWorkflow.gsp
+++ b/rundeckapp/grails-app/views/execution/_execDetailsWorkflow.gsp
@@ -22,6 +22,7 @@
    $Id$
 --%>
 <g:set var="rkey" value="${g.rkey()}"/>
+<g:unless test="${isAdhoc}">
 <div>
     <span class="label" title="Continue execution if any steps fail.">Keepgoing:</span>
     <g:if test="${edit}">
@@ -33,6 +34,7 @@
     </g:else>
     </div>
 <div>
+
     <span class="label" title="Strategy for iteration">Strategy:</span>
     <g:if test="${edit}">
         <label title="Execute the full workflow on each node before the next node">
@@ -95,10 +97,10 @@
     <g:else>
         <g:message code="Workflow.strategy.label.${workflow?.strategy}"/>
     </g:else>
-
+</g:unless>
 %{--<span class="label">threadcount:</span> ${workflow?.threadcount}--}%
 </div>
-<div class="pflowlist ${edit?'edit':''} rounded" style="">
+<div class="pflowlist ${edit?'edit':''} rounded ${isAdhoc?'adhoc':''}" style="">
     <g:if test="${edit}">
         <div id="wfundoredo" >
             <div style="margin-bottom:10px;">
diff --git a/rundeckapp/grails-app/views/execution/show.gsp b/rundeckapp/grails-app/views/execution/show.gsp
index 247a6540b3e..550c58970d3 100644
--- a/rundeckapp/grails-app/views/execution/show.gsp
+++ b/rundeckapp/grails-app/views/execution/show.gsp
@@ -52,7 +52,7 @@
             lastlines: ${params.lastlines ? params.lastlines : defaultLastLines},
             maxLastLines: ${maxLastLines},
             collapseCtx: {value:${null == execution?.dateCompleted },changed:false},
-
+            showFinalLine: {value:false,changed:false},
             tailmode: ${followmode == 'tail'},
             browsemode: ${followmode == 'browse'},
             nodemode: ${followmode == 'node'},
@@ -97,14 +97,91 @@
             <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                     <td  style="vertical-align: top;">
+                        <div class="jobInfo">
                         <g:render template="/scheduledExecution/showExecutionHead"
                                   model="[scheduledExecution: scheduledExecution, execution: execution, followparams: [mode: followmode, lastlines: params.lastlines]]"/>
+                        <span class="executioncontrol">
+
+                        <g:if test="${null == execution.dateCompleted}">
+                            <g:if test="${authChecks[AuthConstants.ACTION_KILL]}">
+                                <span id="cancelresult" style="margin-left:10px">
+                                    <span class="action button textbtn"
+                                          onclick="followControl.docancel();">Kill <g:message
+                                            code="domain.ScheduledExecution.title"/> <img
+                                            src="${resource(dir: 'images', file: 'icon-tiny-removex.png')}" alt="Kill"
+                                            width="12px" height="12px"/></span>
+                                </span>
+                            </g:if>
+                        </g:if>
+
+                        <span id="execRetry"
+                              style="${wdgt.styleVisible(if: null != execution.dateCompleted && null != execution.failedNodeList)}; margin-right:10px;">
+                            <g:if test="${scheduledExecution}">
+                                <g:if test="${authChecks[AuthConstants.ACTION_RUN]}">
+                                    <g:link controller="scheduledExecution" action="execute"
+                                            id="${scheduledExecution.extid}"
+                                            params="${[retryFailedExecId: execution.id]}"
+                                            title="Run Job on the failed nodes"
+                                            class="action button" style="margin-left:10px">
+                                        <img src="${resource(dir: 'images', file: 'icon-small-run.png')}" alt="run"
+                                             width="16px" height="16px"/>
+                                        Retry Failed Nodes  &hellip;
+                                    </g:link>
+                                </g:if>
+                            </g:if>
+                            <g:else>
+                                <g:if test="${auth.resourceAllowedTest(kind: 'job', action: [AuthConstants.ACTION_CREATE]) || adhocRunAllowed}">
+                                    <g:link controller="scheduledExecution" action="createFromExecution"
+                                            params="${[executionId: execution.id, failedNodes: true]}"
+                                            class="action button"
+                                            title="Retry on the failed nodes&hellip;" style="margin-left:10px">
+                                        <img src="${resource(dir: 'images', file: 'icon-small-run.png')}" alt="run"
+                                             width="16px" height="16px"/>
+                                        Retry Failed Nodes &hellip;
+                                    </g:link>
+                                </g:if>
+                            </g:else>
+                        </span>
+                        <span id="execRerun" style="${wdgt.styleVisible(if: null != execution.dateCompleted)}">
+                            <g:if test="${scheduledExecution}">
+                                <g:if test="${authChecks[AuthConstants.ACTION_RUN]}">
+                                    &nbsp;
+                                    <g:link controller="scheduledExecution"
+                                            action="execute"
+                                            id="${scheduledExecution.extid}"
+                                            params="${[retryExecId: execution.id]}"
+                                            class="action button"
+                                            title="Run this Job Again with the same options">
+                                        <g:img file="icon-small-run.png" alt="run" width="16px" height="16px"/>
+                                        Run Again &hellip;
+                                    </g:link>
+                                </g:if>
+                            </g:if>
+                            <g:else>
+                                <g:if test="${auth.resourceAllowedTest(kind: 'job', action: [AuthConstants.ACTION_CREATE]) || adhocRunAllowed}">
+                                    <g:if test="${!scheduledExecution || scheduledExecution && authChecks[AuthConstants.ACTION_READ]}">
+                                        <g:link
+                                                controller="scheduledExecution"
+                                                action="createFromExecution"
+                                                params="${[executionId: execution.id]}"
+                                                class="action button"
+                                                title="Save these Execution parameters as a Job, or run again...">
+                                            <g:img file="icon-small-run.png" alt="run" width="16px" height="16px"/>
+                                            Run Again or Save &hellip;
+                                        </g:link>
+                                    </g:if>
+                                </g:if>
+                            </g:else>
+                        </span>
+                        </span>
+                        </div>
+
                         <g:set var="isAdhoc" value="${!scheduledExecution}"/>
                         <table>
                         <g:if test="${scheduledExecution}">
                             <tr>
                                 <td>
-                                    Job:
+                                    <span class="label">Job:</span>
                                 </td>
                                 <td>
                                     <g:render template="showJobHead"
@@ -115,21 +192,21 @@
                         <g:if test="${execution.argString}">
                             <tr>
                                 <td>
-                                    Options:
+                                    <span class="label">Options:</span>
                                 </td>
-                                <td colspan="3">
+                                <td>
                                     <span class="argString">${execution?.argString.encodeAsHTML()}</span>
                                 </td>
                             </tr>
                         </g:if>
                         <g:if test="${isAdhoc}">
+                        %{--<span class="label">Adhoc:</span>--}%
                             <tr>
-                                <td>
-                                    Adhoc:
+                                <td >
                                 </td>
                                 <td>
-                                    <g:render template="/execution/execDetailsWorkflow"
-                                              model="${[workflow: execution.workflow, context: execution,  project: execution.project]}"/>
+                                <g:render template="/execution/execDetailsWorkflow"
+                                          model="${[workflow: execution.workflow, context: execution, project: execution.project, isAdhoc: isAdhoc]}"/>
                                 </td>
                             </tr>
                         </g:if>
@@ -140,9 +217,9 @@
                         <div style="">
                         <g:expander key="schedExDetails${scheduledExecution?.id ? scheduledExecution?.id : ''}"
                                     imgfirst="true">Details</g:expander>
-                        <div class="presentation" style="display:none" id="schedExDetails${scheduledExecution?.id}">
-                            <g:render template="execDetails" model="[execdata: execution,showArgString:false,hideAdhoc: isAdhoc]"/>
-                        </div>
+                            <div class="presentation" style="display:none" id="schedExDetails${scheduledExecution?.id}">
+                                <g:render template="execDetails" model="[execdata: execution,showArgString:false,hideAdhoc: isAdhoc]"/>
+                            </div>
                         </div>
                     </td>
                 </tr>
@@ -152,77 +229,11 @@
     </div>
 
   <div id="commandFlow" class="commandFlow">
+
+  <form action="#" id="outputappendform">
       <table width="100%">
           <tr>
               <td >
-
-                  <g:if test="${null==execution.dateCompleted}">
-                      <g:if test="${authChecks[AuthConstants.ACTION_KILL]}">
-                          <span id="cancelresult" style="margin-left:10px">
-                              <span class="action button textbtn" onclick="followControl.docancel();">Kill <g:message
-                                      code="domain.ScheduledExecution.title"/> <img
-                                      src="${resource(dir: 'images', file: 'icon-tiny-removex.png')}" alt="Kill"
-                                      width="12px" height="12px"/></span>
-                          </span>
-                      </g:if>
-                  </g:if>
-
-                  <span id="execRetry"
-                        style="${wdgt.styleVisible(if: null != execution.dateCompleted && null != execution.failedNodeList)}; margin-right:10px;">
-                      <g:if test="${scheduledExecution}">
-                          <g:if test="${authChecks[AuthConstants.ACTION_RUN]}">
-                              <g:link controller="scheduledExecution" action="execute" id="${scheduledExecution.extid}"
-                                      params="${[retryFailedExecId: execution.id]}" title="Run Job on the failed nodes"
-                                      class="action button" style="margin-left:10px">
-                                  <img src="${resource(dir: 'images', file: 'icon-small-run.png')}" alt="run"
-                                       width="16px" height="16px"/>
-                                  Retry Failed Nodes  &hellip;
-                              </g:link>
-                          </g:if>
-                      </g:if>
-                      <g:else>
-                          <g:if test="${auth.resourceAllowedTest(kind: 'job', action: [AuthConstants.ACTION_CREATE]) || adhocRunAllowed}">
-                              <g:link controller="scheduledExecution" action="createFromExecution"
-                                      params="${[executionId: execution.id, failedNodes: true]}" class="action button"
-                                      title="Retry on the failed nodes&hellip;" style="margin-left:10px">
-                                  <img src="${resource(dir: 'images', file: 'icon-small-run.png')}" alt="run"
-                                       width="16px" height="16px"/>
-                                  Retry Failed Nodes &hellip;
-                              </g:link>
-                          </g:if>
-                      </g:else>
-                  </span>
-                  <span id="execRerun" style="${wdgt.styleVisible(if: null != execution.dateCompleted)}">
-                      <g:if test="${scheduledExecution}">
-                          <g:if test="${authChecks[AuthConstants.ACTION_RUN]}">
-                              &nbsp;
-                              <g:link controller="scheduledExecution"
-                                      action="execute"
-                                      id="${scheduledExecution.extid}"
-                                      params="${[retryExecId: execution.id]}"
-                                      class="action button"
-                                      title="Run this Job Again with the same options">
-                                  <g:img file="icon-small-run.png" alt="run" width="16px" height="16px"/>
-                                  Run Again &hellip;
-                              </g:link>
-                          </g:if>
-                      </g:if>
-                      <g:else>
-                          <g:if test="${auth.resourceAllowedTest(kind: 'job', action: [AuthConstants.ACTION_CREATE]) || adhocRunAllowed}">
-                              <g:if test="${!scheduledExecution || scheduledExecution && authChecks[AuthConstants.ACTION_READ]}">
-                                  <g:link
-                                          controller="scheduledExecution"
-                                          action="createFromExecution"
-                                          params="${[executionId: execution.id]}"
-                                          class="action button"
-                                          title="Save these Execution parameters as a Job, or run again...">
-                                      <g:img file="icon-small-run.png" alt="run" width="16px" height="16px"/>
-                                      Run Again or Save &hellip;
-                                  </g:link>
-                              </g:if>
-                          </g:if>
-                      </g:else>
-                  </span>
               </td>
               <td>
                   <div id="progressContainer" class="progressContainer">
@@ -230,77 +241,29 @@
                            title="Progress is an estimate based on average execution time for this ${g.message(code: 'domain.ScheduledExecution.title')}.">0%</div>
                   </div>
               </td>
-          </tr>
-      </table>
-  </div>
+          %{--</tr>--}%
+      %{--</table>--}%
+  %{--</div>--}%
 
 
 
-    <div id="commandPerformOpts" class="outputdisplayopts" style="margin: 0 20px;">
-        <form action="#" id="outputappendform">
+    %{--<div id="commandPerformOpts" class="" style="margin: 0 20px;">--}%
 
-        <table width="100%">
-            <tr>
-                <td class="buttonholder" style="padding:10px;">
-                    <g:link class="tab ${followmode=='tail'?' selected':''}" style="padding:5px;"
+        %{--<table width="100%">--}%
+            %{--<tr>--}%
+                <td class="outputButtons" style="padding:10px; ;text-align: right;">
+                    <g:link class="tab ${followmode=='tail'?' selected':''}" style=""
                         title="${g.message(code:'execution.show.mode.Tail.desc')}"
                         controller="execution"  action="show" id="${execution.id}" params="${[lastlines:params.lastlines,mode:'tail'].findAll{it.value}}"><g:message code="execution.show.mode.Tail.title" default="Tail Output"/></g:link>
-                    <g:link class="tab ${followmode=='browse'?' selected':''}" style="padding:5px;"
+                    <g:link class="tab ${followmode=='browse'?' selected':''}" style=""
                         title="${g.message(code:'execution.show.mode.Annotated.desc')}"
                         controller="execution"  action="show" id="${execution.id}" params="[mode:'browse']"><g:message code="execution.show.mode.Annotated.title" default="Annotated"/></g:link>
-                    <g:link class="tab ${followmode=='node'?' selected':''}" style="padding:5px;"
+                    <g:link class="tab ${followmode=='node'?' selected':''}" style=""
                         title="${g.message(code:'execution.show.mode.Compact.desc')}"
                         controller="execution"  action="show" id="${execution.id}" params="[mode:'node']"><g:message code="execution.show.mode.Compact.title" default="Compact"/></g:link>
                     
             <span id="fullviewopts" style="${followmode!='browse'?'display:none':''}">
-                    <input
-                        type="radio"
-                        name="outputappend"
-                        id="outputappendtop"
-                        value="top"
-                        style="display: none;"/>
-                    <label for="outputappendtop">
-                        <span
-                        class="action textbtn button"
-                        title="Click to change"
-                            id="appendTopLabel"
-                        onclick="followControl.setOutputAppendTop(true);"
-                        >Top</span></label>
-                    <input
-                        type="radio"
-                        name="outputappend"
-                        id="outputappendbottom"
-                        value="bottom"
-                        checked="CHECKED"
-                        style="display: none;"/>
-                    <label
-                        for="outputappendbottom">
-                        <span
-                            class="action textbtn button"
-                            title="Click to change"
-                            id="appendBottomLabel"
-                            onclick="followControl.setOutputAppendTop(false);"
-                        >Bottom</span></label>
-<%--
-            </td>
-            <td>--%>
-                <span class="action textbtn button"
-                      title="Click to change"
-                      id="ctxshowgroupoption"
-                      onclick="followControl.setGroupOutput($('ctxshowgroup').checked);">
-                <input
-                    type="checkbox"
-                    name="ctxshowgroup"
-                    id="ctxshowgroup"
-                    value="true"
-                    ${followmode=='tail'?'':'checked="CHECKED"'}
-                    style=""/>
-                    <label for="ctxshowgroup">Group commands</label>
-                </span>
-<%--
-                </td>
 
-            <td >--%>
                 &nbsp;
                 <span
                     class="action textbtn button"
@@ -316,29 +279,9 @@
                     style=""/>
                     <label for="ctxcollapse">Collapse</label>
                 </span>
-<%--
-            </td>
-            <td>--%>
-                &nbsp;
-                <span class="action textbtn button"
-                      title="Click to change"
-                      id="ctxshowlastlineoption"
-                      style="${wdgt.styleVisible(if: null == execution?.dateCompleted)}"
-                      onclick="followControl.setShowFinalLine($('ctxshowlastline').checked);">
-                <input
-                    type="checkbox"
-                    name="ctxshowlastline"
-                    id="ctxshowlastline"
-                    value="true"
-                    checked="CHECKED"
-                    style=""/>
-                    <label for="ctxshowlastline">Show final line</label>
-                </span>
+
             </span>
             <g:if test="${followmode=='tail'}">
-<%---
-                </td>
-                <td>--%>
                     Show the last
                     <span class="action textbtn button"
                       title="Click to reduce"
@@ -356,35 +299,36 @@
                       title="Click to increase"
                       onmousedown="followControl.modifyLastlines(5);return false;">+</span>
 
-                    lines<span id="taildelaycontrol" style="${execution.dateCompleted?'display:none':''}">,
-                    and update every
+                    lines
+                %{--<span id="taildelaycontrol" style="${execution.dateCompleted?'display:none':''}">,--}%
+                    %{--and update every--}%
 
 
-                    <span class="action textbtn button"
-                      title="Click to reduce"
-                      onmousedown="followControl.modifyTaildelay(-1);return false;">-</span>
-                <input
-                    type="text"
-                    name="taildelay"
-                    id="taildelayvalue"
-                    value="1"
-                    size="2"
-                    onchange="updateTaildelay(this.value)"
-                    onkeypress="var x= noenter();if(!x){this.blur();};return x;"
-                    style=""/>
-                    <span class="action textbtn button"
-                      title="Click to increase"
-                      onmousedown="followControl.modifyTaildelay(1);return false;">+</span>
+                    %{--<span class="action textbtn button"--}%
+                      %{--title="Click to reduce"--}%
+                      %{--onmousedown="followControl.modifyTaildelay(-1);return false;">-</span>--}%
+                %{--<input--}%
+                    %{--type="text"--}%
+                    %{--name="taildelay"--}%
+                    %{--id="taildelayvalue"--}%
+                    %{--value="1"--}%
+                    %{--size="2"--}%
+                    %{--onchange="updateTaildelay(this.value)"--}%
+                    %{--onkeypress="var x= noenter();if(!x){this.blur();};return x;"--}%
+                    %{--style=""/>--}%
+                    %{--<span class="action textbtn button"--}%
+                      %{--title="Click to increase"--}%
+                      %{--onmousedown="followControl.modifyTaildelay(1);return false;">+</span>--}%
 
-                    seconds
-                </span>
+                    %{--seconds--}%
+                %{--</span>--}%
             </g:if>
                 </td>
-                <td align="right">
+                <td style="width:120px">
                     <span style="${execution.dateCompleted ? '' : 'display:none'}" class="sepL" id="viewoptionscomplete">
                         <g:link class="action txtbtn" style="padding:5px;"
                             title="Download entire output file" 
-                            controller="execution" action="downloadOutput" id="${execution.id}"><img src="${resource(dir:'images',file:'icon-small-file.png')}" alt="Download" title="Download output" width="13px" height="16px"/> Download <span id="outfilesize">${filesize?filesize+' bytes':''}</span></g:link>
+                            controller="execution" action="downloadOutput" id="${execution.id}"><img src="${resource(dir:'images',file:'icon-small-file.png')}" alt="Download" title="Download output" width="13px" height="16px"/> <span id="outfilesize">${filesize?filesize+' bytes':''}</span></g:link>
                     </span>
                 </td>
             </tr>
diff --git a/rundeckapp/grails-app/views/scheduledExecution/_showExecutionHead.gsp b/rundeckapp/grails-app/views/scheduledExecution/_showExecutionHead.gsp
index 0f09a9eaeb4..29c44b46180 100644
--- a/rundeckapp/grails-app/views/scheduledExecution/_showExecutionHead.gsp
+++ b/rundeckapp/grails-app/views/scheduledExecution/_showExecutionHead.gsp
@@ -1,8 +1,8 @@
 <%@ page import="rundeck.ScheduledExecution" %>
 
-<div class="jobInfo" id="jobInfo_${execution.id}">
+<span class="jobInfo" id="jobInfo_${execution.id}">
     <g:if test="${execution}">
-        <div class="jobInfoSection">
+        <span class="jobInfoSection">
             <g:link
                     controller="execution"
                     action="show"
@@ -35,7 +35,7 @@
             %{--class="username">${execution.user==session.user?'you': execution.user}</span>--}%
             </g:link>
 
-        </div>
+        </span>
     </g:if>
 
-</div>
+</span>
diff --git a/rundeckapp/web-app/css/main.css b/rundeckapp/web-app/css/main.css
index f1a1354523d..94639ce7309 100644
--- a/rundeckapp/web-app/css/main.css
+++ b/rundeckapp/web-app/css/main.css
@@ -163,15 +163,27 @@ a.toptab.selected{
 a.tab,span.tab{
     padding: 3px;
     border: 1px solid #ccc;
-    color:blue !important;
+    color:blue ;
     font-weight:normal;
 }
+
+.outputButtons a.tab, .outputButtons span.tab{
+    padding: 3px;
+    border: 1px solid #eee;
+    color:blue ;
+    font-weight:normal;
+    background: #f0f0f0;
+}
 a.toptab + a.toptab{
     border-left:0;
 }
 a.tab:hover, a.toptab:hover, a.tab.selected, a.toptab.selected, span.button.selected{
     background: #ddd;
 }
+.outputButtons a.tab:hover, .outputButtons  span.button.selected {
+    background: #eee;
+    border: 1px solid #bbb;
+}
 a.tab.disabled, span.tab.disabled{
     border: 1px solid #ddd;
     color: gray !important;
@@ -757,12 +769,29 @@ table.execoutput{
     font-family: Courier, monospace;
     border: 1px solid #eee;
 }
+
+table.execoutput th {
+    background: none;
+    border:none;
+}
+table.execoutput td{
+    border: 1px solid #eee;
+}
 table.execoutput td{
     padding:0;
     border: 0;
 }
 table.execoutput tr.contextRow{
-    background: #ddF;
+    background: #eee;
+}
+table.execoutput tr.contextRow.expandable:hover {
+    background: #ccF;
+}
+table.execoutput tr.contextRow.console {
+    background: #ddd;
+}
+table.execoutput tr.contextRow.expandable.console:hover {
+    background: #ccF;
 }
 table.execoutput tr.contextRow.down td{
     border-top:1px solid #bbb;
@@ -1104,7 +1133,9 @@ table.jobsList td{
 
 table.executionList tr.nowrunning a, table.jobsList tr.nowrunning a{
 }
-table.jobsList.history td{
+table.jobsList.history td.eventicon,
+table.jobsList.history td.argString,
+table.jobsList.history td.eventtitle{
     vertical-align: top;
 }
 table.jobsList.history td.eventtitle span{
@@ -1649,20 +1680,20 @@ div.filter label.additional{
 
 div.jobHead{
 }
-div.jobHead div.jobInfo{
+div.jobHead .jobInfo{
 
     margin-bottom: 10px;
 }
 div.jobHead span.jobInfoPart{
 }
-div.jobHead div.jobInfoSection{
+div.jobHead .jobInfoSection{
 }
 
 div.jobHead td{
     vertical-align: top;
 }
 
-div.jobHead div.jobInfoSection + div.jobInfoSection {
+div.jobHead .jobInfoSection + .jobInfoSection {
     margin-top: 15px;
 }
 div.jobHead span.jobInfoPart span.partContent{
@@ -1704,6 +1735,9 @@ div.jobHead span.jobSummary{
     display:block;
 }
 
+.executioncontrol a{
+    white-space: nowrap;
+}
 
 span.jobcancel{
     margin: 5px;
@@ -1716,7 +1750,7 @@ span.jobfinal{
 }
 
 #commandFlow{
-    padding: 10px;
+    padding: 10px 0;
     margin: 0 20px;
 }
 div.commandFlowError{
@@ -1813,11 +1847,18 @@ div.pflowlist ol{
     margin:0;
 }
 div.pflowlist.edit{
-    min-width: 500px;
+    width: 100%;
+    margin-right: 10px;
 }
 div.pflowlist.edit ol.flowlist li{
     padding:2px;
 }
+div.pflowlist.rounded.adhoc{
+    border:0;
+}
+div.adhoc ol.flowlist li{
+    list-style: none;
+}
 div.pflow{
     float:left;
     width:100%;