Tweak execution show controls and page

andrecloutier-pd · Jul 10, 2013 · bae827a · bae827a
1 parent 777d28d
commit bae827a
Show file tree

Hide file tree

Showing 6 changed files with 183 additions and 279 deletions.
diff --git 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
@@ -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>
+</style>
diff --git 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;">