incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419344 [7/7] - in /incubator/lokahi/lokahi/trunk: ./ conf/ database/ docs/ src/java/org/apache/lokahi/core/agent/ src/java/org/apache/lokahi/core/agent/dao/ src/java/org/apache/lokahi/core/agent/job/ src/java/org/apache/lokahi/core/agent/r...
Date Wed, 05 Jul 2006 21:11:36 GMT
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm Wed Jul  5 14:11:29 2006
@@ -26,124 +26,128 @@
 #set ($id = $request.getParameter("id"))
 #end
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
+
 <div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>TomcatWorker</b>
-  </td>
-  <td align="right">
-  #parse("/Tomcat/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br>
+  <table width="100%" border="0" cellspacing="0" cellpadding="1">
+    <tr class="info" valign="top">
+      <td colspan="2">Infrastructure - <b>TomcatWorker</b>
+      </td>
+      <td align="right">
+        #parse("/Tomcat/Worker/menu/global.vm")
+      </td>
+    </tr>
+  </table>
+  <br>
 
 
-#if ($id)
+  #if ($id)
   #set ($tomcatWorker = $view.getTomcatWorker($id))
 
-<table width="95%" border="0" cellspacing="0" cellpadding="1">
-  <tr height="15" class="info">
-	<td align="left" valign="center" colspan=2 >
-	  Worker - $!{tomcatWorker.getName()}
-	</b>
-	</td>
-	<td align="right">
-	#set($ent = $tomcatWorker)
-	#if($ent)
-	#parse("/Tomcat/Worker/menu/indiv.vm")
-	#end
-	</td>
+  <table width="95%" border="0" cellspacing="0" cellpadding="1">
+    <tr height="15" class="info">
+      <td align="left" valign="center" colspan=2>
+        Worker - $!{tomcatWorker.getName()}
+      </b>
+    </td>
+    <td align="right">
+      #set($ent = $tomcatWorker)
+      #if($ent)
+      #parse("/Tomcat/Worker/menu/indiv.vm")
+      #end
+    </td>
+  </tr>
+  <tr class="headercolor1">
+    <td>Worker Name</td><td>$!{tomcatWorker.getWorkerName()}</td><td></td>
   </tr>
-			<tr class="headercolor1">
-			<td>Worker Name</td><td>$!{tomcatWorker.getWorkerName()}</td><td> </td>
-			</tr>
-			<tr class="headercolor2">
-			<td>Tomcat</td>
-			<td><A href="$appRoot/Tomcat/Server/details.vm?id=$!{tomcatWorker.getTomcat().getPk()}">$!{tomcatWorker.getTomcat().getName()}</a></td>
-			<td align="right">
-	    <select name=methodToCall onchange='OnChange(this);'>
-       	      <option value="" selected>Select Action
-     <option value="$appRoot/Tomcat/Server/details.vm?id=$!{tomcatWorker.getApache().getPk()}">&nbsp;Details&nbsp;
-     <option value="$appRoot/Tomcat/Server/update.vm?id=$!{tomcatWorker.getApache().getPk()}">&nbsp;Update&nbsp;
-     <option value="$appRoot/Tomcat/Server/delete.vm?id=$!{tomcatWorker.getApache().getPk()}">&nbsp;Delete&nbsp;
+  <tr class="headercolor2">
+    <td>Tomcat</td>
+    <td><A href="$appRoot/Tomcat/Server/details.vm?id=$!{tomcatWorker.getTomcat().getPk()}">$!{tomcatWorker.getTomcat().getName()}</a>
+    </td>
+    <td align="right">
+      <select name=methodToCall onchange='OnChange(this);'>
+        <option value="" selected>Select Action
+        <option value="$appRoot/Tomcat/Server/details.vm?id=$!{tomcatWorker.getApache().getPk()}">&nbsp;Details&nbsp;
+        <option value="$appRoot/Tomcat/Server/update.vm?id=$!{tomcatWorker.getApache().getPk()}">&nbsp;Update&nbsp;
+        <option value="$appRoot/Tomcat/Server/delete.vm?id=$!{tomcatWorker.getApache().getPk()}">&nbsp;Delete&nbsp;
       </select>
-			</td>
-			</tr>
-			<tr class="headercolor1">
-			<td>Hardware</td>
-			<td><A href="$appRoot/Core/Server/details.vm?id=$!{tomcatWorker.getHardware().getPk()}">$!{tomcatWorker.getHardware().getName()}</a></td>
-			<td align="right">
-	    <select name=methodToCall onchange='OnChange(this);'>
-       	      <option value="" selected>Select Action
-          <option value="$appRoot/Core/Server/details.vm?id=$!{tomcatWorker.getHardware().getPk()}">&nbsp;Details&nbsp;
-          <option value="$appRoot/Core/Server/update.vm?id=$!{tomcatWorker.getHardware().getPk()}">&nbsp;Update&nbsp;
-          <option value="$appRoot/Core/Server/delete.vm?id=$!{tomcatWorker.getHardware().getPk()}">&nbsp;Delete&nbsp;
-          </select>
-			</td>
-			</tr>
+    </td>
+  </tr>
+  <tr class="headercolor1">
+    <td>Hardware</td>
+    <td><A href="$appRoot/Core/Server/details.vm?id=$!{tomcatWorker.getHardware().getPk()}">$!{tomcatWorker.getHardware().getName()}</a>
+    </td>
+    <td align="right">
+      <select name=methodToCall onchange='OnChange(this);'>
+        <option value="" selected>Select Action
+        <option value="$appRoot/Core/Server/details.vm?id=$!{tomcatWorker.getHardware().getPk()}">&nbsp;Details&nbsp;
+        <option value="$appRoot/Core/Server/update.vm?id=$!{tomcatWorker.getHardware().getPk()}">&nbsp;Update&nbsp;
+        <option value="$appRoot/Core/Server/delete.vm?id=$!{tomcatWorker.getHardware().getPk()}">&nbsp;Delete&nbsp;
+      </select>
+    </td>
+  </tr>
 
 </table>
 #set ($collection = $view.getTomcatPools($tomcatWorker))
 #if( $collection && ! $collection.isEmpty())
-<br />
+<br/>
 #parse("/Tomcat/Pool/list.vm")
-#end 	## of all tomcatpools
+#end ## of all tomcatpools
 
 
 #set ($projectContexts = $view.getTomcatContexts($User, $tomcatWorker))
 #if( $projectContexts && ! $projectContexts.isEmpty())
-<br />
-  <table width="95%" border="0" cellspacing="0" cellpadding="1">
+<br/>
+<table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
-	<td align="left" valign="center" colspan=4 >
-	  Tomcat applications
-	</b>
-	</td>
-  </tr>
-  <tr class="info">
+    <td align="left" valign="center" colspan=4>
+      Tomcat applications
+    </b>
+  </td>
+</tr>
+<tr class="info">
   <th width=25%> Context </th>
   <th width=15%> Environment </th>
   <th width=30%> Pool </th>
-  <th width=30%>  </th>
-  </tr>
-  #set($c = 1)
-	#foreach ($context in $projectContexts)
-		#set ($count = 1)
-    	<tr class="headercolor$c">
-		  <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()} </td>
-    	<td align="center"> $!{context.getEnv().getName()} </td>
-		<td align="center">
-		  <A href="$appRoot/Tomcat/Pool/details.vm?id=$!{context.getTomcatPool().getPk()}">$!{context.getTomcatPool().getName()} </a><br>
-		</td>
-		<td align="right">
-		<!-- before macro -->
-		<!-- $context -->
-		<!-- start macro -->
-		#contextDropBoxWOproject($User $context)
-		</td>
- 	  </tr>
-		#set ($count = $math.add($count, 1))
-        #if ($c == 1)
-          #set($c=2)
-        #else
-          #set($c=1)
-        #end
-	#end ##of all servers for this context
+  <th width=30%></th>
+</tr>
+#set($c = 1)
+#foreach ($context in $projectContexts)
+#set ($count = 1)
+<tr class="headercolor$c">
+  <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()}</td>
+  <td align="center"> $!{context.getEnv().getName()} </td>
+  <td align="center">
+    <A href="$appRoot/Tomcat/Pool/details.vm?id=$!{context.getTomcatPool().getPk()}">$!{context.getTomcatPool().getName()} </a>
+    <br>
+  </td>
+  <td align="right">
+    <!-- before macro -->
+    <!-- $context -->
+    <!-- start macro -->
+    #contextDropBoxWOproject($User $context)
+  </td>
+</tr>
+#set ($count = $math.add($count, 1))
+#if ($c == 1)
+#set($c=2)
+#else
+#set($c=1)
+#end
+#end ##of all servers for this context
 </table>
-<br />
-#end 	## of all contexts
+<br/>
+#end   ## of all contexts
 #else
 <div class="messagebox">
-Tomcat Worker:
-#set ($tws = $view.getTomcatWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($tw in $tws)
-              			      <option value="$appRoot/Tomcat/Worker/$page?id=$tw.getPk()">$tw.getName()
-              			      #end
-              			      </select><BR>
+  Tomcat Worker:
+  #set ($tws = $view.getTomcatWorkers())
+  <select name=id onchange='OnChange(this);'>
+    <option value="">Select one
+      #foreach ($tw in $tws)
+    <option value="$appRoot/Tomcat/Worker/$page?id=$tw.getPk()">$tw.getName()
+      #end
+  </select><BR>
 </div>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/global.vm Wed Jul  5 14:11:29 2006
@@ -16,14 +16,14 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Tomcat/Worker/details.vm">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/update.vm">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/delete.vm">&nbsp;Delete&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/restarttomcat.vm">&nbsp;Restart&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/stoptomcat.vm">&nbsp;Stop&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/starttomcat.vm">&nbsp;Start&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/viewconf.vm">&nbsp;View server.xml&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/deployconf.vm">&nbsp;Deploy Config File&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Tomcat/Worker/details.vm">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/update.vm">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/delete.vm">&nbsp;Delete&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/restarttomcat.vm">&nbsp;Restart&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/stoptomcat.vm">&nbsp;Stop&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/starttomcat.vm">&nbsp;Start&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/viewconf.vm">&nbsp;View server.xml&nbsp;</option>
+  <option value="$appRoot/Tomcat/Worker/deployconf.vm">&nbsp;Deploy Config File&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm Wed Jul  5 14:11:29 2006
@@ -16,32 +16,32 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if ($page)
-<option value="$appRoot/Tomcat/Worker/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Tomcat/Worker/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateTomcatWorker"))
-<option value="$appRoot/Tomcat/Worker/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteTomcatWorker"))
-<option value="$appRoot/Tomcat/Worker/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-#end
-#if($User.isAllowed("RestartTomcat"))
-<option value="$appRoot/Tomcat/Worker/restarttomcat.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
-#end
-#if($User.isAllowed("StopTomcat"))
-<option value="$appRoot/Tomcat/Worker/stoptomcat.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
-#end
-#if($User.isAllowed("StartTomcat"))
-<option value="$appRoot/Tomcat/Worker/starttomcat.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
-#end
-#if($User.isAllowed("ViewTomcatWorker"))
-<option value="$appRoot/Tomcat/Worker/viewconf.vm?id=$!{ent.getPk()}">&nbsp;View server.xml&nbsp;</option>
-#end
-#if($User.isAllowed("DeployTomcatConfig"))
-<option value="$appRoot/Tomcat/Worker/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Config File&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if ($page)
+  <option value="$appRoot/Tomcat/Worker/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Tomcat/Worker/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateTomcatWorker"))
+  <option value="$appRoot/Tomcat/Worker/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteTomcatWorker"))
+  <option value="$appRoot/Tomcat/Worker/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartTomcat"))
+  <option value="$appRoot/Tomcat/Worker/restarttomcat.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopTomcat"))
+  <option value="$appRoot/Tomcat/Worker/stoptomcat.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartTomcat"))
+  <option value="$appRoot/Tomcat/Worker/starttomcat.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewTomcatWorker"))
+  <option value="$appRoot/Tomcat/Worker/viewconf.vm?id=$!{ent.getPk()}">&nbsp;View server.xml&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeployTomcatConfig"))
+  <option value="$appRoot/Tomcat/Worker/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Config File&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm Wed Jul  5 14:11:29 2006
@@ -19,75 +19,77 @@
 #set ($pageSelected = "Worker")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>TomcatWorker</b>
-  </td>
-  <td align="right">
-  #parse("Tomcat/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
+  <br/><br/>
 
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateTomcatWorker")
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>TomcatWorker</b>
+        </td>
+        <td align="right">
+          #parse("Tomcat/Worker/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
 
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateTomcatWorker")
-#if($id)
-#set ($tw = $view.getTomcatWorker($id))
-<form name="Form" method="post" action='$link.setAction("administration/TomcatWorkerAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-Worker Name: <input type="text" readonly id="name" name="name" value="$!{tw.getWorkerName()}"><BR>
+    <div class="messagebox">
 
-Name: <input type="text" size="45" readonly id="name" name="name" value="$!{tw.getName()}"><BR>
-Tomcat:
-#set($tomcats = $view.getTomcats())
-<select name=tomcatId>
-#foreach ($tomcat in $tomcats)
-#if ($tomcat == $tw.getTomcat())
-<option value="$tomcat.getPk()" selected>$tomcat.getName()
-#else
-<option value="$tomcat.getPk()">$tomcat.getName()
-#end
-#end
-</select>
-<BR>
-State: <input type="text" readonly id="state" name="state" value="Active"><BR>
-<input type="hidden" id="stateId" name="stateId" value="8">
-Hardware: 
-#set($hardware = $view.getHardwares())
-<select name=hardwareId>
-#foreach ($h in $hardware)
-#if ($h == $tw.getHardware())
-<option value="$h.getPk()" selected>$h.getName()
-#else
-<option value="$h.getPk()">$h.getName()
-#end
-#end
-</select>
-<BR>
-<input type="submit" value="update">
-</form>
-#else
-Tomcat Worker:
-#set ($tws = $view.getTomcatWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($tw in $tws)
-              			      <option value="$appRoot/Tomcat/Worker/update.vm?id=$tw.getPk()">$tw.getName()
-              			      #end
-              			      </select><BR>
-#end
-#end
-</div>
-<br />
-</div>
-<br />
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateTomcatWorker")
+
+      #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateTomcatWorker")
+      #if($id)
+      #set ($tw = $view.getTomcatWorker($id))
+      <form name="Form" method="post" action='$link.setAction("administration/TomcatWorkerAction")'>
+        <input type="hidden" id="id" name="id" value="$!{id}">
+        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+        Worker Name: <input type="text" readonly id="name" name="name" value="$!{tw.getWorkerName()}"><BR>
+
+        Name: <input type="text" size="45" readonly id="name" name="name" value="$!{tw.getName()}"><BR>
+        Tomcat:
+        #set($tomcats = $view.getTomcats())
+        <select name=tomcatId>
+          #foreach ($tomcat in $tomcats)
+          #if ($tomcat == $tw.getTomcat())
+          <option value="$tomcat.getPk()" selected>$tomcat.getName()
+            #else
+          <option value="$tomcat.getPk()">$tomcat.getName()
+            #end
+            #end
+        </select>
+        <BR>
+        State: <input type="text" readonly id="state" name="state" value="Active"><BR>
+        <input type="hidden" id="stateId" name="stateId" value="8">
+        Hardware:
+        #set($hardware = $view.getHardwares())
+        <select name=hardwareId>
+          #foreach ($h in $hardware)
+          #if ($h == $tw.getHardware())
+          <option value="$h.getPk()" selected>$h.getName()
+            #else
+          <option value="$h.getPk()">$h.getName()
+            #end
+            #end
+        </select>
+        <BR>
+        <input type="submit" value="update">
+      </form>
+      #else
+      Tomcat Worker:
+      #set ($tws = $view.getTomcatWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($tw in $tws)
+        <option value="$appRoot/Tomcat/Worker/update.vm?id=$tw.getPk()">$tw.getName()
+          #end
+      </select><BR>
+      #end
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm Wed Jul  5 14:11:29 2006
@@ -25,37 +25,39 @@
 #end
 
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>TomcatWorker</b>
-  </td>
-  <td align="right">
-  #parse("Tomcat/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-#if ($id)
-#set ($tomcatWorker = $view.getTomcatWorker($id))
+  <br/><br/>
 
-<TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb()}</textarea>
-#else
-Tomcat Worker:
-#set ($tws = $view.getTomcatWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($tw in $tws)
-              			      <option value="$appRoot/Tomcat/Worker/viewconf.vm?id=$tw.getPk()">$tw.getName()
-              			      #end
-              			      </select><br />
-#end
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>TomcatWorker</b>
+        </td>
+        <td align="right">
+          #parse("Tomcat/Worker/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      #if ($id)
+      #set ($tomcatWorker = $view.getTomcatWorker($id))
+
+      <TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb()}</textarea>
+      #else
+      Tomcat Worker:
+      #set ($tws = $view.getTomcatWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($tw in $tws)
+        <option value="$appRoot/Tomcat/Worker/viewconf.vm?id=$tw.getPk()">$tw.getName()
+          #end
+      </select><br/>
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/error/404.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/error/404.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/error/404.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/error/404.vm Wed Jul  5 14:11:29 2006
@@ -21,21 +21,21 @@
 <span class="subtitle">404 - Page Not Found</span>
 <p><b>The page / file you're seeking was not found because:</b></p>
 <ol>
-<li>Your bookmark or favorites may be outdated.</li>
-<li>The page may no longer exist.</li>
-<li>The page may have been moved or renamed.</li>
-<li>There may be a typo in the  URL on the referring page.</li>
-<script language="JavaScript">
-<!--
-var from = document.referrer;
-document.write("<br />Referrer:<a href=javascript:window.history.go(-1);> " + from + "</a>");
-// -->
-</script>
+  <li>Your bookmark or favorites may be outdated.</li>
+  <li>The page may no longer exist.</li>
+  <li>The page may have been moved or renamed.</li>
+  <li>There may be a typo in the URL on the referring page.</li>
+  <script language="JavaScript">
+    <!--
+    var from = document.referrer;
+    document.write("<br />Referrer:<a href=javascript:window.history.go(-1);> " + from + "</a>");
+    // -->
+  </script>
 </ol>
 <p><b>Solutions:</b></p>
 <ol>
-<li>Check your spelling --- make sure you've typed the correct URL.</li>
-<li>Try clearing your cache</li>.
+  <li>Check your spelling --- make sure you've typed the correct URL.</li>
+  <li>Try clearing your cache</li>.
 </ol>
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/home.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/home.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/home.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/home.vm Wed Jul  5 14:11:29 2006
@@ -26,18 +26,20 @@
 <!-- $focus -->
 #parse ("/layout/header.vm")
 <div align="center" class="contentbox">
-<br /><br />
-<div id="bigleft" >
-#foreach ($alert in $alerts)
-<div class="alertmessagebox">
-$!{alert.buildHTML()}
-</div>
-#end
-</div>
-<div id="right">
-#parse ("layout/login.vm")
-</div>
-<br />
-<br />
+  <br/><br/>
+
+  <div id="bigleft">
+    #foreach ($alert in $alerts)
+    <div class="alertmessagebox">
+      $!{alert.buildHTML()}
+    </div>
+    #end
+  </div>
+
+  <div id="right">
+    #parse ("layout/login.vm")
+  </div>
+  <br/>
+  <br/>
 </div>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/js/common.js
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/js/common.js?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/js/common.js (original)
+++ incubator/lokahi/lokahi/trunk/src/www/js/common.js Wed Jul  5 14:11:29 2006
@@ -17,12 +17,12 @@
 //
 function OnChange(dropdown)
 {
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL = SelValue;
-	top.location.href = baseURL;
+  var myindex = dropdown.selectedIndex;
+  var SelValue = dropdown.options[myindex].value;
+  var baseURL = SelValue;
+  top.location.href = baseURL;
 
-	return true;
+  return true;
 }
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/js/popup.js
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/js/popup.js?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/js/popup.js (original)
+++ incubator/lokahi/lokahi/trunk/src/www/js/popup.js Wed Jul  5 14:11:29 2006
@@ -14,40 +14,42 @@
 var xOffset = 50;
 var yOffset = -20;
 
-function showPopup (targetObjectId, eventObj) {
-    if(eventObj) {
-	// hide any currently-visible popups
-	hideCurrentPopup();
-	// stop event from bubbling up any farther
-	eventObj.cancelBubble = true;
-	// move popup div to current cursor position
-	// (add scrollTop to account for scrolling for IE)
-	var newXCoordinate = (eventObj.pageX)?eventObj.pageX + xOffset:eventObj.x + xOffset + ((document.body.scrollLeft)?document.body.scrollLeft:0);
-	var newYCoordinate = (eventObj.pageY)?eventObj.pageY + yOffset:eventObj.y + yOffset + ((document.body.scrollTop)?document.body.scrollTop:0);
-	moveObject(targetObjectId, newXCoordinate, newYCoordinate);
-	// and make it visible
-	if( changeObjectVisibility(targetObjectId, 'visible') ) {
-	    // if we successfully showed the popup
-	    // store its Id on a globally-accessible object
-	    window.currentlyVisiblePopup = targetObjectId;
-	    return true;
-	} else {
-	    // we couldn't show the popup
-	    return false;
-	}
+function showPopup(targetObjectId, eventObj) {
+  if (eventObj) {
+    // hide any currently-visible popups
+    hideCurrentPopup();
+    // stop event from bubbling up any farther
+    eventObj.cancelBubble = true;
+    // move popup div to current cursor position
+    // (add scrollTop to account for scrolling for IE)
+    var newXCoordinate = (eventObj.pageX)?eventObj.pageX + xOffset:eventObj.x + xOffset + ((document.body.scrollLeft)?document.body.scrollLeft:0);
+    var newYCoordinate = (eventObj.pageY)?eventObj.pageY + yOffset:eventObj.y + yOffset + ((document.body.scrollTop)?document.body.scrollTop:0);
+    moveObject(targetObjectId, newXCoordinate, newYCoordinate);
+    // and make it visible
+    if (changeObjectVisibility(targetObjectId, 'visible')) {
+      // if we successfully showed the popup
+      // store its Id on a globally-accessible object
+      window.currentlyVisiblePopup = targetObjectId;
+      return true;
     } else {
-	// there was no event object, so we won't be able to position anything, so give up
-	return false;
+      // we couldn't show the popup
+      return false;
     }
-} // showPopup
+  } else {
+    // there was no event object, so we won't be able to position anything, so give up
+    return false;
+  }
+}
+// showPopup
 
 function hideCurrentPopup() {
-    // note: we've stored the currently-visible popup on the global object window.currentlyVisiblePopup
-    if(window.currentlyVisiblePopup) {
-	changeObjectVisibility(window.currentlyVisiblePopup, 'hidden');
-	window.currentlyVisiblePopup = false;
-    }
-} // hideCurrentPopup
+  // note: we've stored the currently-visible popup on the global object window.currentlyVisiblePopup
+  if (window.currentlyVisiblePopup) {
+    changeObjectVisibility(window.currentlyVisiblePopup, 'hidden');
+    window.currentlyVisiblePopup = false;
+  }
+}
+// hideCurrentPopup
 
 
 
@@ -62,37 +64,38 @@
 document.onclick = hideCurrentPopup;
 
 function initializeHacks() {
-    // this ugly little hack resizes a blank div to make sure you can click
-    // anywhere in the window for Mac MSIE 5
-    if ((navigator.appVersion.indexOf('MSIE 5') != -1)
-	&& (navigator.platform.indexOf('Mac') != -1)
-	&& getStyleObject('blankDiv')) {
-	window.onresize = explorerMacResizeFix;
-    }
-    resizeBlankDiv();
-    // this next function creates a placeholder object for older browsers
-    createFakeEventObj();
+  // this ugly little hack resizes a blank div to make sure you can click
+  // anywhere in the window for Mac MSIE 5
+  if ((navigator.appVersion.indexOf('MSIE 5') != -1)
+      && (navigator.platform.indexOf('Mac') != -1)
+      && getStyleObject('blankDiv')) {
+    window.onresize = explorerMacResizeFix;
+  }
+  resizeBlankDiv();
+  // this next function creates a placeholder object for older browsers
+  createFakeEventObj();
 }
 
 function createFakeEventObj() {
-    // create a fake event object for older browsers to avoid errors in function call
-    // when we need to pass the event object to functions
-    if (!window.event) {
-	window.event = false;
-    }
-} // createFakeEventObj
+  // create a fake event object for older browsers to avoid errors in function call
+  // when we need to pass the event object to functions
+  if (!window.event) {
+    window.event = false;
+  }
+}
+// createFakeEventObj
 
 function resizeBlankDiv() {
-    // resize blank placeholder div so IE 5 on mac will get all clicks in window
-    if ((navigator.appVersion.indexOf('MSIE 5') != -1)
-	&& (navigator.platform.indexOf('Mac') != -1)
-	&& getStyleObject('blankDiv')) {
-	getStyleObject('blankDiv').width = document.body.clientWidth - 20;
-	getStyleObject('blankDiv').height = document.body.clientHeight - 20;
-    }
+  // resize blank placeholder div so IE 5 on mac will get all clicks in window
+  if ((navigator.appVersion.indexOf('MSIE 5') != -1)
+      && (navigator.platform.indexOf('Mac') != -1)
+      && getStyleObject('blankDiv')) {
+    getStyleObject('blankDiv').width = document.body.clientWidth - 20;
+    getStyleObject('blankDiv').height = document.body.clientHeight - 20;
+  }
 }
 
-function explorerMacResizeFix () {
-    location.reload(false);
+function explorerMacResizeFix() {
+  location.reload(false);
 }
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/checksession.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/checksession.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/checksession.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/checksession.vm Wed Jul  5 14:11:29 2006
@@ -17,9 +17,9 @@
 ##
 #if (!$User && !$allowedWithoutLogin && !$User.isActive())
 #if($request.getQueryString())
-	$response.sendRedirect("$appRoot/index.vm?url='$request.getRequestURI()?$request.getQueryString()'")
+$response.sendRedirect("$appRoot/index.vm?url='$request.getRequestURI()?$request.getQueryString()'")
 #else
-	$response.sendRedirect("$appRoot/index.vm?url='$request.getRequestURI()'")
+$response.sendRedirect("$appRoot/index.vm?url='$request.getRequestURI()'")
 #end
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/footer.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/footer.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/footer.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/footer.vm Wed Jul  5 14:11:29 2006
@@ -16,7 +16,7 @@
 ## $Id$
 ##
 
-<br /><br />
+<br/><br/>
 </body>
 </html>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/header.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/header.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/header.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/header.vm Wed Jul  5 14:11:29 2006
@@ -20,19 +20,22 @@
 #parse("/layout/checksession.vm")
 <html>
 <head>
-#set ($title = $props.get("application.title"))
-<title> $title </title>
-<link type="text/css" rel="stylesheet" href="$!{appRoot}/layout/style.vmcss" />
-<link rel="alternate" title="TMC Alert RSS" href="$rssLink" type="application/rss+xml">
-<script language="javascript" type="text/javascript" src="$!{appRoot}/js/common.js"></script>
-<script language="javascript" type="text/javascript" src="$!{appRoot}/js/popup.js"></script>
+  #set ($title = $props.get("application.title"))
+  <title> $title </title>
+  <link type="text/css" rel="stylesheet" href="$!{appRoot}/layout/style.vmcss"/>
+  <link rel="alternate" title="TMC Alert RSS" href="$rssLink" type="application/rss+xml">
+  <script language="javascript" type="text/javascript" src="$!{appRoot}/js/common.js"></script>
+  <script language="javascript" type="text/javascript" src="$!{appRoot}/js/popup.js"></script>
 </head>
 #if($focus)
 <script>
-<!--
-function ff(){document.$focus}
-// -->
+  <!--
+  function ff() {
+    document.$focus
+  }
+  // -->
 </script>
+
 <body onload="ff()">
 #else
 <body>

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm Wed Jul  5 14:11:29 2006
@@ -32,110 +32,111 @@
 ##
 <!--$collection -->
 #if($plf)
-	<div align="center" class="contentbox">
-	<br /><br />
-	#if ($request.getParameter("e"))
-		#set ($envId = $request.getParameter("e"))
-	#end
-	<div class="projectbox">
-	<table width="100%" border="0" cellspacing="0" cellpadding="1">
-	<tr class="info">
-	#if ($category)
-		<td colspan=3>$category - <b>$entity</b>
-	#else
-		<td colspan=3>Infrastructure - <b>$entity</b>
-	#end
-	#if($usesEnv == "true")
-		&nbsp;
-		#foreach ($env in $view.getEnvironments())
-			<a class="info" href="$currentPage?e=$env.getPk()">$env.getName()</a> &nbsp;
-		#end
-		<a class="info" href="$currentPage">All</a> &nbsp;
-	#end
-	</td>
-	<td colspan="2" align="right">
-	#parse("$path/menu/global.vm")
-	</td>
-	</tr>
-	</table>
-	<br />
+<div align="center" class="contentbox">
+<br/><br/>
+#if ($request.getParameter("e"))
+#set ($envId = $request.getParameter("e"))
 #end
-<!--$collection -->
-<!-- $individual -->
-<!-- $indivPage -->
-#if ($individual && $indivPage)
-#parse($indivPage)
-#else
-#if ($User.isAllowed($function) && $methodToCall && $actionLink)
-<form name="Form" method="post" action='$link.setAction($actionLink)'>
-<input type=hidden name="methodToCall" value="$methodToCall" />
-    <input type="submit" value="$buttonName" />
-  #end
-  #set($c = 1)
-  <!-- $collection -->
-  #if( $collection && ! $collection.isEmpty())
-    <table width="95%" border="0" cellspacing="0" cellpadding="1">
-    <tr class="info">
-    #if ($plf)
-    <td align="left" valign="center" colspan="3" >
-    $entity
-    </td>
-    #else
-    <td align="left" valign="center" colspan="2" >
-    $entity
-    </td>
-    <td align="right">
-    #parse("$path/menu/global.vm")
-    </td>
-    #end
-    </tr>
+<div class="projectbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="1">
     <tr class="info">
-    <td width=50%>Name</td>
-    <td width=15%> 
-    #if($usesEnv == "true")
-      Environment
-    #end 
-    </td>
-    <td width=35%>  </td>
-    </tr>
-    #foreach ($ent in $collection)
-      #if (($usesEnv == "true" && (!$envId || $ent.getEnvId().toString() == $envId)) || ! $usesEnv || $usesEnv == "false")
-	<tr class="headercolor$c">
-        <td>
-        #if ($User.isAllowed($function) && $methodToCall)
-          <input type=checkbox name=id value="$ent.getPk()" />&nbsp;&nbsp;
+      #if ($category)
+      <td colspan=3>$category - <b>$entity</b>
+        #else
+      <td colspan=3>Infrastructure - <b>$entity</b>
         #end
-	<a href="$appRoot/$path/details.vm?id=$!{ent.getPk()}">$!{ent.getName()}</a></td>
-	<td> 
-	#if($usesEnv == "true")
-          $!{ent.getEnv().getName()}
+        #if($usesEnv == "true")
+        &nbsp;
+        #foreach ($env in $view.getEnvironments())
+        <a class="info" href="$currentPage?e=$env.getPk()">$env.getName()</a> &nbsp;
         #end
+        <a class="info" href="$currentPage">All</a> &nbsp;
+        #end
+      </td>
+      <td colspan="2" align="right">
+        #parse("$path/menu/global.vm")
+      </td>
+    </tr>
+  </table>
+  <br/>
+  #end
+  <!--$collection -->
+  <!-- $individual -->
+  <!-- $indivPage -->
+  #if ($individual && $indivPage)
+  #parse($indivPage)
+  #else
+  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
+  <form name="Form" method="post" action='$link.setAction($actionLink)'>
+    <input type=hidden name="methodToCall" value="$methodToCall"/>
+    <input type="submit" value="$buttonName"/>
+    #end
+    #set($c = 1)
+    <!-- $collection -->
+    #if( $collection && ! $collection.isEmpty())
+    <table width="95%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info">
+        #if ($plf)
+        <td align="left" valign="center" colspan="3">
+          $entity
         </td>
-	<td align="right">
-        #parse("$path/menu/indiv.vm")
-	</td>
-	</tr>
-        #if ($c == 1)
-          #set($c=2)
         #else
-          #set($c=1)
+        <td align="left" valign="center" colspan="2">
+          $entity
+        </td>
+        <td align="right">
+          #parse("$path/menu/global.vm")
+        </td>
         #end
-      #end 	## of env
-    #end ## of for
+      </tr>
+      <tr class="info">
+        <td width=50%>Name</td>
+        <td width=15%>
+          #if($usesEnv == "true")
+          Environment
+          #end
+        </td>
+        <td width=35%></td>
+      </tr>
+      #foreach ($ent in $collection)
+      #if (($usesEnv == "true" && (!$envId || $ent.getEnvId().toString() == $envId)) || ! $usesEnv || $usesEnv ==
+      "false")
+      <tr class="headercolor$c">
+        <td>
+          #if ($User.isAllowed($function) && $methodToCall)
+          <input type=checkbox name=id value="$ent.getPk()"/>&nbsp;&nbsp;
+          #end
+          <a href="$appRoot/$path/details.vm?id=$!{ent.getPk()}">$!{ent.getName()}</a></td>
+        <td>
+          #if($usesEnv == "true")
+          $!{ent.getEnv().getName()}
+          #end
+        </td>
+        <td align="right">
+          #parse("$path/menu/indiv.vm")
+        </td>
+      </tr>
+      #if ($c == 1)
+      #set($c=2)
+      #else
+      #set($c=1)
+      #end
+      #end ## of env
+      #end ## of for
     </table>
-  #else
-  No $entity to display.<br />
-  <br />
-  #end 	## end of IF collection.
-  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
+    #else
+    No $entity to display.<br/>
+    <br/>
+    #end ## end of IF collection.
+    #if ($User.isAllowed($function) && $methodToCall && $actionLink)
     <input type="submit" value="$buttonName">
-    </form>
+  </form>
   #end
-#end
-#if($plf)
-<br />
+  #end
+  #if($plf)
+  <br/>
 </div>
-<br />
+<br/>
 </div>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/login.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/login.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/login.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/login.vm Wed Jul  5 14:11:29 2006
@@ -18,19 +18,20 @@
 #if (!$User)
 #set ($url = $request.getParameter("url"))
 <form name="LoginForm" method=post action="$appRoot/Authenticate.do">
-<div class="loginbox">
-      #errorMarkup()
-      #messagesMarkup()
-      $!ResultMessage
-      <div align="right">
-          $props.get("login.label.userName"): <input size="12" type="text" name="userName" value="$!{userName}" /><br />
-          $props.get("login.label.passWord"): <input size="12" type="password" name="passWord" value="" />
-          <input type="hidden" name="redirectUrl" value="$!url" />
-      </div>
-      <div align="center">
-          <input type="submit" name="Login" value="&nbsp;&nbsp;Login&nbsp;&nbsp;" class="button">
-      </div>
-</div>
+  <div class="loginbox">
+    #errorMarkup()
+    #messagesMarkup()
+    $!ResultMessage
+    <div align="right">
+      $props.get("login.label.userName"): <input size="12" type="text" name="userName" value="$!{userName}"/><br/>
+      $props.get("login.label.passWord"): <input size="12" type="password" name="passWord" value=""/>
+      <input type="hidden" name="redirectUrl" value="$!url"/>
+    </div>
+
+    <div align="center">
+      <input type="submit" name="Login" value="&nbsp;&nbsp;Login&nbsp;&nbsp;" class="button">
+    </div>
+  </div>
 </form>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/EntityTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/EntityTop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/EntityTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/EntityTop.vm Wed Jul  5 14:11:29 2006
@@ -19,20 +19,20 @@
 #set ($topSelected = "access")
 #parse ("/layout/menu/top.vm")
 #if ( $pageSelected == "User" )
-   #set ( $ManageUserMenu = ' id="current"' )
+#set ( $ManageUserMenu = ' id="current"' )
 #elseif ( $pageSelected == "Entity" )
-   #set ( $AdminMenu = ' id="current"' )
+#set ( $AdminMenu = ' id="current"' )
 #elseif ( $pageSelected == "enviroment" )
-   #set ( $AdminMenu = ' id="current"' )
+#set ( $AdminMenu = ' id="current"' )
 #end
 <div id="submenu">
-#if($User.isAllowed("AddUserToProject") || $User.isAllowed("AddUser"))
+  #if($User.isAllowed("AddUserToProject") || $User.isAllowed("AddUser"))
   <ul>
-  #if($User.isAllowed("AddUser"))
-    <li $!{ManageUserMenu}><a href="$appRoot/Core/User/index.vm">&nbsp;Manage Users&nbsp;</a></li>
+    #if($User.isAllowed("AddUser"))
+    <li$!{ManageUserMenu}><a href="$appRoot/Core/User/index.vm">&nbsp;Manage Users&nbsp;</a></li>
   #end
-    <li $!{AdminMenu}><a href="$appRoot/Core/Entity/index.vm">&nbsp;Manage Lokahi&nbsp;</a></li>
-  </ul>
+  <li$!{AdminMenu}><a href="$appRoot/Core/Entity/index.vm">&nbsp;Manage Lokahi&nbsp;</a></li>
+</ul>
 #end
 </div>
 <!-- Entity Menu -->

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm Wed Jul  5 14:11:29 2006
@@ -18,13 +18,13 @@
 #set ($topSelected = "help")
 #parse ("/layout/menu/top.vm")
 <div id="submenu">
-<ul>
-#if($User.isAllowed("AddHelpItem"))
-<li><a href="$appRoot/Help/add.vm" class="rowlink" >&nbsp;Add&nbsp;</a></li>
-<li><a href="$appRoot/Help/update.vm" class="rowlink" >&nbsp;Update&nbsp;</a></li>
-<li><a href="$appRoot/Help/delete.vm" class="rowlink" >&nbsp;Delete&nbsp;</a></li>
-#end
-</ul>
+  <ul>
+    #if($User.isAllowed("AddHelpItem"))
+    <li><a href="$appRoot/Help/add.vm" class="rowlink">&nbsp;Add&nbsp;</a></li>
+    <li><a href="$appRoot/Help/update.vm" class="rowlink">&nbsp;Update&nbsp;</a></li>
+    <li><a href="$appRoot/Help/delete.vm" class="rowlink">&nbsp;Delete&nbsp;</a></li>
+    #end
+  </ul>
 </div>
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/HomeTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/HomeTop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/HomeTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/HomeTop.vm Wed Jul  5 14:11:29 2006
@@ -19,20 +19,20 @@
 #set ($topSelected = "home")
 #parse ("/layout/menu/top.vm")
 #if ($pageSelected == "RecentJobs")
-   #set ($JobsImg = ' id="current"')
+#set ($JobsImg = ' id="current"')
 #elseif ($pageSelected == "RecentProjects")
-   #set ($ProjectsImg = ' id="current"')
+#set ($ProjectsImg = ' id="current"')
 #elseif ($pageSelected == "home")
-   #set ($homeindex = ' id="current"')
+#set ($homeindex = ' id="current"')
 #elseif ($pageSelected == "Services")
-   #set ($ServicesImg = ' id="current"')   
+#set ($ServicesImg = ' id="current"')
 #end
 <div id="submenu">
-<ul>
-<li$!{homeindex}><a href="$appRoot/index.vm">&nbsp;Messages&nbsp;</a></li>
-#if($User)
+  <ul>
+    <li$!{homeindex}><a href="$appRoot/index.vm">&nbsp;Messages&nbsp;</a></li>
+  #if($User)
   <li$!{ProjectsImg}><a href="$appRoot/Core/Project/user.vm">&nbsp;&nbsp;My Projects&nbsp;&nbsp;</a></li>
-  <li$!{JobsImg}><a href="$appRoot/Core/JobPool/recent.vm">&nbsp;My Jobs&nbsp;&nbsp;</a></li>
+<li$!{JobsImg}><a href="$appRoot/Core/JobPool/recent.vm">&nbsp;My Jobs&nbsp;&nbsp;</a></li>
 #end
 </ul>
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/PoolTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/PoolTop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/PoolTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/PoolTop.vm Wed Jul  5 14:11:29 2006
@@ -19,18 +19,18 @@
 #set ($topSelected = "pools")
 #parse ("/layout/menu/top.vm")
 #if ( $pageSelected == "Pool")
-  #set ( $Pool = ' id="current"' )
+#set ( $Pool = ' id="current"' )
 #elseif ( $pageSelected == "Worker" )
-  #set ( $Worker = ' id="current"' )
+#set ( $Worker = ' id="current"' )
 #elseif ( $pageSelected == "Server")
-  #set ( $Server = ' id="current"' )
+#set ( $Server = ' id="current"' )
 #elseif ( $pageSelected == "Entity" )
-  #set ( $Entity = ' id="current"' )
+#set ( $Entity = ' id="current"' )
 #end
 <div id="submenu">
-<ul>
-<li$!{Pool}><a href="$appRoot/Core/Pool/search.vm">&nbsp;Pools&nbsp;</a></li>
-<li$!{Worker}><a href="$appRoot/Core/Worker/search.vm">&nbsp;Workers&nbsp;</a></li>
+  <ul>
+    <li$!{Pool}><a href="$appRoot/Core/Pool/search.vm">&nbsp;Pools&nbsp;</a></li>
+  <li$!{Worker}><a href="$appRoot/Core/Worker/search.vm">&nbsp;Workers&nbsp;</a></li>
 <li$!{Server}><a href="$appRoot/Core/Server/search.vm">&nbsp;Servers&nbsp;</a></li>
 <li$!{Entity}><a href="$appRoot/Core/Entity/search.vm">&nbsp;Entities&nbsp;</a></li>
 </ul>

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/ProjectTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/ProjectTop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/ProjectTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/ProjectTop.vm Wed Jul  5 14:11:29 2006
@@ -20,46 +20,46 @@
 #parse ("/layout/menu/top.vm")
 #set($alphabets = ["all","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"] )
 <div id="submenu">
-<ul>
-<!-- TODO add my project link... -->
-#if($letter && $letter != "Last5")
-  <li>
-#else
-  <li id="current">
-#end
-<a href="$appRoot/Core/Project/index.vm">&nbsp;Last 10&nbsp;</a></li>
-#if($letter && $letter == "My")
-  <li id="current">
-#else
-  <li>
-#end
-<a href="$appRoot/Core/Project/my.vm">&nbsp;My Projects&nbsp;</a></li>
-#foreach( $key in $alphabets)
-   ##print this letter as a link only it this is not the one that is currently listed
-   #if($letter && $key == $letter)
-   <li id="current">
-   #else
-   <li>
-   #end
-   <a href="$appRoot/Core/Project/index.vm?Letter=$key">&nbsp;$key&nbsp;</a></li>
-#end
-#if($User.isAllowed("AddProject"))
-  #if($letter && $letter == "Add")
-    <li id="current">
-  #else
+  <ul>
+    <!-- TODO add my project link... -->
+    #if($letter && $letter != "Last5")
     <li>
-  #end
-  <a href='$appRoot/Core/Project/add.vm'>&nbsp;Add&nbsp;</a></li>
-#end
-#if($User.isAllowed("ViewProject"))
-  #if($letter && $letter == "Search")
+      #else
+      <li id="current">
+        #end
+        <a href="$appRoot/Core/Project/index.vm">&nbsp;Last 10&nbsp;</a></li>
+      #if($letter && $letter == "My")
+    <li id="current">
+      #else
+      <li>
+        #end
+        <a href="$appRoot/Core/Project/my.vm">&nbsp;My Projects&nbsp;</a></li>
+      #foreach( $key in $alphabets)
+      ##print this letter as a link only it this is not the one that is currently listed
+      #if($letter && $key == $letter)
+    <li id="current">
+      #else
+      <li>
+        #end
+        <a href="$appRoot/Core/Project/index.vm?Letter=$key">&nbsp;$key&nbsp;</a></li>
+      #end
+      #if($User.isAllowed("AddProject"))
+      #if($letter && $letter == "Add")
+    <li id="current">
+      #else
+      <li>
+        #end
+        <a href='$appRoot/Core/Project/add.vm'>&nbsp;Add&nbsp;</a></li>
+      #end
+      #if($User.isAllowed("ViewProject"))
+      #if($letter && $letter == "Search")
     <li id="current">
-  #else
+      #else
     <li>
-  #end
-  <a href='$appRoot/Core/Project/search.vm'>&nbsp;Search&nbsp;</a></li>
-#end
-</ul>
+      #end
+      <a href='$appRoot/Core/Project/search.vm'>&nbsp;Search&nbsp;</a></li>
+    #end
+  </ul>
 </div>
 <!-- Project Menu -->
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/UserTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/UserTop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/UserTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/UserTop.vm Wed Jul  5 14:11:29 2006
@@ -19,18 +19,18 @@
 #set ($topSelected = "access")
 #parse ("/layout/menu/top.vm")
 #if ( $pageSelected == "User" )
-   #set ( $ManageUserMenu = ' id="current"' )
+#set ( $ManageUserMenu = ' id="current"' )
 #elseif ( $pageSelected == "admin" )
-   #set ( $AdminMenu = ' id="current"' )
+#set ( $AdminMenu = ' id="current"' )
 #end
 <div id="submenu">
-#if($User.isAllowed("AddUserToProject") || $User.isAllowed("AddUser"))
+  #if($User.isAllowed("AddUserToProject") || $User.isAllowed("AddUser"))
   <ul>
-  #if($User.isAllowed("AddUser"))
-    <li $!{ManageUserMenu}><a href="$appRoot/Core/User/index.vm">&nbsp;Manage Users&nbsp;</a></li>
+    #if($User.isAllowed("AddUser"))
+    <li$!{ManageUserMenu}><a href="$appRoot/Core/User/index.vm">&nbsp;Manage Users&nbsp;</a></li>
   #end
-    <li $!{AdminMenu}><a href="$appRoot/Core/Entity/index.vm">&nbsp;Manage Lokahi&nbsp;</a></li>
-  </ul>
+  <li$!{AdminMenu}><a href="$appRoot/Core/Entity/index.vm">&nbsp;Manage Lokahi&nbsp;</a></li>
+</ul>
 #end
 </div>
 <!-- User Menu -->

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm Wed Jul  5 14:11:29 2006
@@ -16,56 +16,60 @@
 ## $Id$
 ##
 <div zIndex=5 id="header">
-#if ($User)
-  <div id="topRightMenu"><a href="$appRoot/Authenticate.do?logout=true" id="logout" >[Logout:$User.getName()]</a></div>
-#end
-<div id="Tabs" >
-<ul>
-#if ($User)
-   #if ($topSelected == "home")
-     <li id="current">
-   #else
-     <li>
-   #end
-   <a href="$appRoot/index.vm">Lokahi</a></li>
-   #if ($topSelected == "projects")
-     <li id="current">
-   #else
-     <li>
-   #end
-   <a href="$appRoot/Core/Project/index.vm">Projects</a></li>
-   #if($User.isAllowed("AddUser") || $User.isAllowed("AddUserToProject"))
-     #if ($topSelected == "access")
-      <li id="current">
-     #else
-      <li>
-     #end
-     <a href="$appRoot/Core/User/index.vm">Administration</a></li>
+  #if ($User)
+  <div id="topRightMenu"><a href="$appRoot/Authenticate.do?logout=true" id="logout">[Logout:$User.getName()]</a></div>
   #end
-  #if($User.isAllowed("AddHostingPool") || $User.isAllowed("ViewHostingPool") || $User.isAllowed("UpdateHostingPool") || $User.isAllowed("DeleteHostingPool") || $User.isAllowed("AddApachePool") || $User.isAllowed("ViewApachePool") || $User.isAllowed("UpdateApachePool") || $User.isAllowed("DeleteApachePool") || $User.isAllowed("AddTomcatPool") || $User.isAllowed("ViewTomcatPool") || $User.isAllowed("UpdateTomcatPool") || $User.isAllowed("DeleteTomcatPool"))
-    #if ($topSelected == "pools" || $topSelected == "server")
+  <div id="Tabs">
+    <ul>
+      #if ($User)
+      #if ($topSelected == "home")
+      <li id="current">
+        #else
+        <li>
+          #end
+          <a href="$appRoot/index.vm">Lokahi</a></li>
+        #if ($topSelected == "projects")
+      <li id="current">
+        #else
+        <li>
+          #end
+          <a href="$appRoot/Core/Project/index.vm">Projects</a></li>
+        #if($User.isAllowed("AddUser") || $User.isAllowed("AddUserToProject"))
+        #if ($topSelected == "access")
+      <li id="current">
+        #else
+        <li>
+          #end
+          <a href="$appRoot/Core/User/index.vm">Administration</a></li>
+        #end
+        #if($User.isAllowed("AddHostingPool") || $User.isAllowed("ViewHostingPool") ||
+        $User.isAllowed("UpdateHostingPool") || $User.isAllowed("DeleteHostingPool") || $User.isAllowed("AddApachePool")
+        || $User.isAllowed("ViewApachePool") || $User.isAllowed("UpdateApachePool") ||
+        $User.isAllowed("DeleteApachePool") || $User.isAllowed("AddTomcatPool") || $User.isAllowed("ViewTomcatPool") ||
+        $User.isAllowed("UpdateTomcatPool") || $User.isAllowed("DeleteTomcatPool"))
+        #if ($topSelected == "pools" || $topSelected == "server")
       <li id="current">
-    #else
+        #else
+        <li>
+          #end
+          <a href="$appRoot/Core/infrastructure.vm">Infrastructure</a></li>
+        #end
+        #if ($topSelected == "help")
+      <li id="current">
+        #else
+        <li>
+          #end
+          <a href="$appRoot/Help/index.vm">Help</a></li>
+        #else
+        #if ($topSelected == "home")
+      <li id="current">
+        #else
       <li>
-    #end
-    <a href="$appRoot/Core/infrastructure.vm">Infrastructure</a></li>
-  #end
-  #if ($topSelected == "help")
-    <li id="current">
-  #else
-    <li>
-  #end
-  <a href="$appRoot/Help/index.vm">Help</a></li>
-#else
-  #if ($topSelected == "home")
-    <li id="current">
-  #else
-    <li>
-  #end
-  <a href="$appRoot/index.vm">Lokahi</a></li>
-#end
-</ul>
-</div>
+        #end
+        <a href="$appRoot/index.vm">Lokahi</a></li>
+      #end
+    </ul>
+  </div>
 </div>
 
 



Mime
View raw message