Merge branch 'issue83-tabreorder' into development

rundeck · Nov 23, 2010 · ee9349e · ee9349e
2 parents 63f2e54 + 1fc212f
commit ee9349e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 38 deletions.
diff --git a/rundeckapp/grails-app/controllers/MenuController.groovy b/rundeckapp/grails-app/controllers/MenuController.groovy
@@ -83,7 +83,7 @@ class MenuController {
 
 
     def index ={
-        redirect(action:'jobs')
+        redirect(controller:'framework',action:'nodes')
     }
 
     def workflows = {ScheduledExecutionQuery query ->

diff --git a/rundeckapp/grails-app/i18n/messages.properties b/rundeckapp/grails-app/i18n/messages.properties
@@ -29,7 +29,7 @@ default.paginate.next=next&raquo;
 
 # main menu item names
 gui.menu.Workflows=Jobs
-gui.menu.Events=Events
+gui.menu.Events=History
 gui.menu.Nodes=Nodes
 gui.menu.Resources=Resources
 gui.menu.Admin=Admin

diff --git a/rundeckapp/grails-app/views/common/_topbar.gsp b/rundeckapp/grails-app/views/common/_topbar.gsp
@@ -114,38 +114,36 @@ function createProject(value){
 
    <span id="top_tabs">
 
-    <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">
-        %{--<img src="${resource(dir: 'images', file: 'icon-med-job.png')}" width="24px" height="24px" alt=""/>--}%
-        <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:if test="${session?.user}">
-        <a href="${createLink(controller: 'reports', action: 'index')}" class=" toptab ${eventsselected}"  style="height:29px">
-            %{--<img src="${resource(dir: 'images', file: 'icon-med-Reportcenter.png')}" width="24px" height="24px" alt=""/>--}%
+        <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.Resources"/>
+        </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"/>
-        </a>
-    </g:if>
-    <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">
-        %{--<img src="${resource(dir: 'images', file: 'icon-med-NodeManager.png')}" width="24px" height="24px" alt=""/>--}%
-        <g:message code="gui.menu.Resources"/>
-    </g:link>
+        </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>
+
        <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">

diff --git a/rundeckapp/grails-app/views/execution/mailNotification/status.gsp b/rundeckapp/grails-app/views/execution/mailNotification/status.gsp
@@ -133,9 +133,9 @@
 </div>
 <div class="foot">
     Run Deck:
-    <g:link absolute="true" controller="menu" action="jobs">Jobs &raquo;</g:link>
-    <g:link absolute="true" controller="reports" action="index">Events &raquo;</g:link>
-    <g:link absolute="true" controller="framework" action="nodes">Resources &raquo;</g:link>
+    <g:link absolute="true" controller="framework" action="nodes"><g:message code="gui.menu.Resources"/> &raquo;</g:link>
+    <g:link absolute="true" controller="reports" action="index"><g:message code="gui.menu.Events"/> &raquo;</g:link>
+    <g:link absolute="true" controller="menu" action="jobs"><g:message code="gui.menu.Workflows"/> &raquo;</g:link>
 </div>
 
 </body>

diff --git a/rundeckapp/grails-app/views/framework/_nodes.gsp b/rundeckapp/grails-app/views/framework/_nodes.gsp
@@ -66,8 +66,8 @@
                     </g:elseif>
 
                     <g:if test="${expanddetail}">
-                        <g:link  controller="reports" action="index" params="${[nodeFilter:node.nodename]}" title="View Events for Node ${node.nodename}">
-                            &raquo; events
+                        <g:link  controller="reports" action="index" params="${[nodeFilter:node.nodename]}" title="View History for Node ${node.nodename}">
+                            &raquo; history
                         </g:link>
                         <div id="${ukey}node_detail_${i}" class="detail_content nodedetail" style="display:none">
                             <g:render template="nodeDetailsSimple" model="[node:node,key:ukey+'_'+node.nodename+'_key',projects:nodedata.projects]"/>