Merge branch 'uicrunch' into development

rundeck · Jan 11, 2011 · 8119bff · 8119bff
2 parents ff9b8a2 + 72ad1c1
commit 8119bff
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 57 deletions.
diff --git a/rundeckapp/grails-app/views/common/_topbar.gsp b/rundeckapp/grails-app/views/common/_topbar.gsp
@@ -32,7 +32,53 @@ function doCreateProject(){
 }
 //-->
 </script>
-<div  class="topbar ${session?.user?'':'solo'}" >
+<div  class="topbar solo" >
+<g:if test="${session?.user}">
+<!--<div class="secondbar">-->
+
+   <span id="top_tabs">
+
+        <g:set var="resselected" value=""/>
+        <g:ifPageProperty name='meta.tabpage' >
+        <g:ifPageProperty name='meta.tabpage' equals='nodes'>
+           <g:set var="resselected" value="selected"/>
+        </g:ifPageProperty>
+        </g:ifPageProperty>
+        <g:link controller="framework" action="nodes" class=" toptab ${resselected}"  style="height:29px">
+           <g:message code="gui.menu.Run"/>
+        </g:link>
+
+        <g:set var="wfselected" value=""/>
+        <g:ifPageProperty name='meta.tabpage' >
+        <g:ifPageProperty name='meta.tabpage' equals='jobs'>
+           <g:set var="wfselected" value="selected"/>
+        </g:ifPageProperty>
+        </g:ifPageProperty>
+        <g:link controller="menu" action="jobs" class=" toptab ${wfselected}" style="height:29px">
+           <g:message code="gui.menu.Workflows"/>
+        </g:link>
+
+        <g:set var="eventsselected" value=""/>
+        <g:ifPageProperty name='meta.tabpage' >
+        <g:ifPageProperty name='meta.tabpage' equals='events'>
+            <g:set var="eventsselected" value="selected"/>
+        </g:ifPageProperty>
+        </g:ifPageProperty>
+        <g:link controller="reports"  action="index" class=" toptab ${eventsselected}"  style="height:29px">
+            <g:message code="gui.menu.Events"/>
+        </g:link>
+
+    <g:if test="${session?.project||session?.projects}">
+       <span class="projects" style="font-size:9pt; line-height: 12px; margin-left:20px;">
+            <img src="${resource(dir:'images',file:'icon-tiny-rarrow-sep.png')}" alt="project: " width="7px" height="12px"/>
+            <span id="projectSelect">
+               <span class="action textbtn" onclick="loadProjectSelect();" title="Select project...">${session?.project?session.project:'Select project&hellip;'}</span>
+            </span>
+       </span>
+    </g:if>
+
+</span>
+</g:if>
     <a href="${grailsApplication.config.rundeck.gui.titleLink?grailsApplication.config.rundeck.gui.titleLink:'/'}"
         title="Home" class="home" style="height:29px;">
         <g:set var="appTitle" value="${grailsApplication.config.rundeck.gui.title?grailsApplication.config.rundeck.gui.title:g.message(code:'main.app.name')}"/>
@@ -43,6 +89,7 @@ function doCreateProject(){
         ${appTitle}
     </a>
 
+<!--</div>-->
     %{--<g:if test="${session?.project}">
         <img src="${resource(dir:'images',file:'icon-tiny-rarrow-sep.png')}" alt="project: " width="7px" height="12px"/>
         <span class="projectinfo">
@@ -83,52 +130,5 @@ function doCreateProject(){
         </span>
     </g:else>
 </div>
-<g:if test="${session?.user}">
-<div class="secondbar">
 
-   <span id="top_tabs">
-
-        <g:set var="resselected" value=""/>
-        <g:ifPageProperty name='meta.tabpage' >
-        <g:ifPageProperty name='meta.tabpage' equals='nodes'>
-           <g:set var="resselected" value="selected"/>
-        </g:ifPageProperty>
-        </g:ifPageProperty>
-        <g:link controller="framework" action="nodes" class=" toptab ${resselected}"  style="height:29px">
-           <g:message code="gui.menu.Run"/>
-        </g:link>
-
-        <g:set var="eventsselected" value=""/>
-        <g:ifPageProperty name='meta.tabpage' >
-        <g:ifPageProperty name='meta.tabpage' equals='events'>
-            <g:set var="eventsselected" value="selected"/>
-        </g:ifPageProperty>
-        </g:ifPageProperty>
-        <g:link controller="reports"  action="index" class=" toptab ${eventsselected}"  style="height:29px">
-            <g:message code="gui.menu.Events"/>
-        </g:link>
-
-        <g:set var="wfselected" value=""/>
-        <g:ifPageProperty name='meta.tabpage' >
-        <g:ifPageProperty name='meta.tabpage' equals='jobs'>
-           <g:set var="wfselected" value="selected"/>
-        </g:ifPageProperty>
-        </g:ifPageProperty>
-        <g:link controller="menu" action="jobs" class=" toptab ${wfselected}" style="height:29px">
-           <g:message code="gui.menu.Workflows"/>
-        </g:link>
-
-    <g:if test="${session?.project||session?.projects}">
-       <span class="projects" style="font-size:9pt; line-height: 12px; margin-left:20px;">
-            <img src="${resource(dir:'images',file:'icon-tiny-rarrow-sep.png')}" alt="project: " width="7px" height="12px"/>
-            <span id="projectSelect">
-               <span class="action textbtn" onclick="loadProjectSelect();" title="Select project...">${session?.project?session.project:'Select project&hellip;'}</span>
-            </span>
-       </span>
-    </g:if>
-
-</span>
-
-</div>
-</g:if>
 
diff --git a/rundeckapp/grails-app/views/menu/_groupTree.gsp b/rundeckapp/grails-app/views/menu/_groupTree.gsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <g:timerStart key="gtx"/>
-<div class="jobGroups ${subtree?' subdirs':''} expandComponent" ${subtree && !expanded && !(wasfiltered) ?'style="display:none"':''}>
+<div class="jobGroups ${subtree?' subdirs':'topgroup'} expandComponent" ${subtree && !expanded && !(wasfiltered) ?'style="display:none"':''}>
 <g:if test="${!prefix && wasfiltered && paginateParams.groupPath}">
     <div>
         <a class=" groupname" href="${createLink(controller:'menu',action:'jobs')}" title="Top level"><img src="${resource(dir:'images',file:'icon-small-folder-up.png')}" width="16px" height="15px" alt="dir"/> Top</a>

diff --git a/rundeckapp/grails-app/views/menu/_workflowsFull.gsp b/rundeckapp/grails-app/views/menu/_workflowsFull.gsp
@@ -50,7 +50,7 @@
     <table cellspacing="0" cellpadding="0" width="100%">
         <tr>
 
-            <td style="text-align:left;vertical-align:top;width:200px; ${wdgt.styleVisible(if:filtersOpen)}" id="${rkey}filter" >
+            <td style="text-align:left;vertical-align:top;width:200px; ${wdgt.styleVisible(if:filtersOpen)}" id="${rkey}filter" class="wffilter" >
             <g:form action="jobs" method="get">
                 <g:if test="${params.compact}">
                     <g:hiddenField name="compact" value="${params.compact}"/>
@@ -96,9 +96,9 @@
             </g:form>
 
             </td>
-            <td style="text-align:left;vertical-align:top;" id="${rkey}wfcontent">
+            <td style="text-align:left;vertical-align:top;" id="${rkey}wfcontent" class="wfcontent">
 
-                <div style="margin-bottom: 5px;">
+                <div class="jobscontent head">
 
                 <g:if test="${wasfiltered}">
 

diff --git a/rundeckapp/grails-app/views/menu/jobs.gsp b/rundeckapp/grails-app/views/menu/jobs.gsp
@@ -286,11 +286,6 @@
     <g:javascript library="yellowfade"/>
     <g:render template="/framework/remoteOptionValuesJS"/>
     <style type="text/css">
-    #nowrunning{
-        max-height: 150px;
-        overflow-y: auto;
-        margin: 0 0 10px 0;
-    }
     .error{
         color:red;
     }
@@ -344,6 +339,8 @@
     <span class="prompt">Now running <span class="nowrunningcount">(0)</span></span>
     <div id="nowrunning"><span class="note empty">No running Jobs</span></div>
     <div id="error" class="error" style="display:none;"></div>
+</div>
+<div class="runbox jobs">
     <g:render template="workflowsFull" model="${[jobgroups:jobgroups,wasfiltered:wasfiltered?true:false,nowrunning:nowrunning,nextExecutions:nextExecutions,jobauthorizations:jobauthorizations,authMap:authMap,nowrunningtotal:nowrunningtotal,max:max,offset:offset,paginateParams:paginateParams,sortEnabled:true]}"/>
 </div>
 <div id="execDiv" style="display:none">

diff --git a/rundeckapp/grails-app/views/menu/nowrunningFragment.gsp b/rundeckapp/grails-app/views/menu/nowrunningFragment.gsp
@@ -3,6 +3,8 @@
     <g:if test="${total && max && total.toInteger() > max.toInteger()}">
         <span class="info note">Showing ${nowrunning.size()} of ${total}</span>
     </g:if>
+<g:if test="${total>max}">
 <span class="paginate"><g:paginate action="nowrunning" total="${total}"  max="${max}"/></span>
+</g:if>
 
 <g:render template="/common/boxinfo" model="${[name:'nowrunning',model:[title:'Now Running',total:total]]}"/>
diff --git a/rundeckapp/web-app/css/main.css b/rundeckapp/web-app/css/main.css
@@ -138,7 +138,11 @@ code{
 .topbar a.home{
     padding: 10px;
 }
+.topbar #top_tabs + a.home{
+    margin-left: 20px;
+}
 a.toptab{
+    /*border-left: 1px solid #ccc;*/
     border-right: 1px solid #ccc;
     padding: 8px 10px;
     margin:0;
@@ -2235,4 +2239,37 @@ fieldset{
 .runbox{
     background: #ddd;
     padding:10px ;
+}
+.runbox.sepT{
+    border-top:1px solid #bbb;
+    margin:0;
+}
+.runbox.jobs{
+    padding:0;
+}
+.runbox.jobs .jobscontent, .runbox.jobs .wffilter{
+    padding:  10px;
+}
+.runbox.jobs .wfcontent{
+    padding:  0;
+}
+div.jobscontent{
+    margin-bottom: 5px;
+}
+.runbox.jobs .jobscontent{
+    margin-bottom: 0;
+}
+.runbox div.jobGroups.topgroup{
+    background: #fff;
+    padding: 20px;
+}
+.runbox table.list tr{
+    /*background: #ddd;*/
+}
+
+/** now running content */
+#nowrunning{
+    max-height: 150px;
+    overflow-y: auto;
+    margin:0;
 }