incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419579 [4/5] - in /incubator/lokahi/lokahi/trunk: conf/ src/java/org/apache/lokahi/core/agent/dao/ src/java/org/apache/lokahi/core/agent/jmx/ src/java/org/apache/lokahi/core/agent/runnable/ src/java/org/apache/lokahi/core/agent/tomcat/ src...
Date Thu, 06 Jul 2006 15:23:26 GMT
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm Thu Jul  6 08:23:21 2006
@@ -20,123 +20,125 @@
 #parse("/layout/header.vm")
 
 <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>Apache</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Server/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan="2">Infrastructure - <b>Apache</b>
+    </td>
+    <td align="right">
+      #parse("Apache/Server/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
+
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
 <table>
 
 <tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="name" name="name" value="$!{name}">
-</td>
+  <td>
+    Name:
+  </td>
+  <td>
+    <input type="text" id="name" name="name" value="$!{name}">
+  </td>
 </tr>
 <tr>
-<td>
-Server Root:
-</td>
-<td>
-<input type="text" id="serverRoot" name="serverRoot" value="$!{serverRoot}">
-</td>
+  <td>
+    Server Root:
+  </td>
+  <td>
+    <input type="text" id="serverRoot" name="serverRoot" value="$!{serverRoot}">
+  </td>
 </tr>
 <tr>
-<td>
-Log Location:
-</td>
-<td>
-<input type="text" id="logLocation" name="logLocation" value="$!{logLocation}">
-</td>
+  <td>
+    Log Location:
+  </td>
+  <td>
+    <input type="text" id="logLocation" name="logLocation" value="$!{logLocation}">
+  </td>
 </tr>
 <tr>
-<td>
-System User:
-</td>
-<td>
-<input type="text" id="sysUser" name="sysUser" value="$!{sysUser}">
-</td>
+  <td>
+    System User:
+  </td>
+  <td>
+    <input type="text" id="sysUser" name="sysUser" value="$!{sysUser}">
+  </td>
 </tr>
 <tr>
-<td>
-System Group:
-</td>
-<td>
-<input type="text" id="sysGroup" name="sysGroup" value="$!{sysGroup}">
-</td>
+  <td>
+    System Group:
+  </td>
+  <td>
+    <input type="text" id="sysGroup" name="sysGroup" value="$!{sysGroup}">
+  </td>
 </tr>
 <tr>
-<td>
-Start Command:
-</td>
-<td>
-<input type="text" id="startCommand" name="startCommand" value="$!{startCommand}">
-</td>
+  <td>
+    Start Command:
+  </td>
+  <td>
+    <input type="text" id="startCommand" name="startCommand" value="$!{startCommand}">
+  </td>
 </tr>
 <tr>
-<td>
-Stop Command:
-</td>
-<td>
-<input type="text" id="stopCommand" name="stopCommand" value="$!{stopCommand}">
-</td>
+  <td>
+    Stop Command:
+  </td>
+  <td>
+    <input type="text" id="stopCommand" name="stopCommand" value="$!{stopCommand}">
+  </td>
 </tr>
 <tr>
-<td>
-Restart Command:
-</td>
-<td>
-<input type="text" id="restartCommand" name="restartCommand" value="$!{restartCommand}">
-</td>
+  <td>
+    Restart Command:
+  </td>
+  <td>
+    <input type="text" id="restartCommand" name="restartCommand" value="$!{restartCommand}">
+  </td>
 </tr>
 <tr>
-<td>
-Fork Wait:
-</td>
-<td>
-<input type="text" id="forkWait" name="forkWait" value="$!{forkWait}">
-</td>
+  <td>
+    Fork Wait:
+  </td>
+  <td>
+    <input type="text" id="forkWait" name="forkWait" value="$!{forkWait}">
+  </td>
 </tr>
 <tr>
-<td>
-Environment Variables:
-</td>
-<td>
-<input type="text" id="envVaribles" name="envVaribles" value="$!{envVaribles}">
-</td>
+  <td>
+    Environment Variables:
+  </td>
+  <td>
+    <input type="text" id="envVaribles" name="envVaribles" value="$!{envVaribles}">
+  </td>
 </tr>
 <tr>
-<td>
-Pid File Location:
-</td>
-<td>
-<input type="text" id="pidFileLocation" name="pidFileLocation" value="$!{pidFileLocation}">
-</td>
+  <td>
+    Pid File Location:
+  </td>
+  <td>
+    <input type="text" id="pidFileLocation" name="pidFileLocation" value="$!{pidFileLocation}">
+  </td>
 </tr>
 <tr>
-<td>
-Apache Main:
-</td>
-<td>
-#set ($allFiles = $view.getFiles())
+  <td>
+    Apache Main:
+  </td>
+  <td>
+    #set ($allFiles = $view.getFiles())
 
-<select name=mainId>
-			      #foreach ($file in $allFiles)
-			      <option value="$file.getPk()">$file.getName()
-			      #end
-			      </select>
-</td>
+    <select name=mainId>
+      #foreach ($file in $allFiles)
+      <option value="$file.getPk()">$file.getName()
+        #end
+    </select>
+  </td>
 </tr>
 <!--
 <tr>
@@ -160,9 +162,9 @@
 </form>
 
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm Thu Jul  6 08:23:21 2006
@@ -17,11 +17,11 @@
 ##
 #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"><BR>
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
+  <input type=hidden name="methodToCall" value="$methodToCall">
+  <input type="submit" value="$buttonName"><BR>
+  $methodToCall
+  <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+  $individual.getName()
 </form>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm Thu Jul  6 08:23:21 2006
@@ -22,77 +22,78 @@
 
 #if ($request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
-    <!-- $id -->
+<!-- $id -->
 #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>Apache</b>
-  </td>
-  <td align="right">
-  #parse("/Apache/Server/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-
-
-#if ($id)
-  #set ($apache = $view.getApache($id))
-  #set ($ent = $apache)
-  <!-- $apache -->
-<table width="95%" border="0" cellspacing="0" cellpadding="1">
-  <tr height="15" class="info">
-	<td align="left" valign="center" colspan=2 >
-	  Apache - $!{apache.getName()}
-	</td>
-	<td align="right">
-#if ($ent)
-#parse("/Apache/Server/menu/indiv.vm")
-#end
-</td></tr>
+  <br/><br/>
 
-<tr class="headercolor1"><td>Server Root:</td><td>$!{apache.getServerRoot()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Log Location:</td><td>$!{apache.getLogLocation()}</td><td> </td></tr>
-<tr class="headercolor1"><td>System User:</td><td>$!{apache.getSysUser()}</td><td> </td></tr>
-<tr class="headercolor2"><td>System Group:</td><td>$!{apache.getSysGroup()}</td><td> </td></tr>
-<tr class="headercolor1"><td>Start Command:</td><td>$!{apache.getStartCommand()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Stop Command:</td><td>$!{apache.getStopCommand()}</td><td> </td></tr>
-<tr class="headercolor1"><td>Restart Command:</td><td>$!{apache.getRestartCommand()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Environment Varibles:</td><td>$!{apache.getEnvVaribles()}</td><td> </td></tr>
-<tr class="headercolor1"><td>Pid File Location:</td><td>$!{apache.getPidFileLocation()}</td><td> </td></tr>
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Apache</b>
+        </td>
+        <td align="right">
+          #parse("/Apache/Server/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+
+    #if ($id)
+    #set ($apache = $view.getApache($id))
+    #set ($ent = $apache)
+    <!-- $apache -->
+    <table width="95%" border="0" cellspacing="0" cellpadding="1">
+      <tr height="15" class="info">
+        <td align="left" valign="center" colspan=2>
+          Apache - $!{apache.getName()}
+        </td>
+        <td align="right">
+          #if ($ent)
+          #parse("/Apache/Server/menu/indiv.vm")
+          #end
+        </td></tr>
+
+      <tr class="headercolor1"><td>Server Root:</td><td>$!{apache.getServerRoot()}</td><td></td></tr>
+      <tr class="headercolor2"><td>Log Location:</td><td>$!{apache.getLogLocation()}</td><td></td></tr>
+      <tr class="headercolor1"><td>System User:</td><td>$!{apache.getSysUser()}</td><td></td></tr>
+      <tr class="headercolor2"><td>System Group:</td><td>$!{apache.getSysGroup()}</td><td></td></tr>
+      <tr class="headercolor1"><td>Start Command:</td><td>$!{apache.getStartCommand()}</td><td></td></tr>
+      <tr class="headercolor2"><td>Stop Command:</td><td>$!{apache.getStopCommand()}</td><td></td></tr>
+      <tr class="headercolor1"><td>Restart Command:</td><td>$!{apache.getRestartCommand()}</td><td></td></tr>
+      <tr class="headercolor2"><td>Environment Varibles:</td><td>$!{apache.getEnvVaribles()}</td><td></td></tr>
+      <tr class="headercolor1"><td>Pid File Location:</td><td>$!{apache.getPidFileLocation()}</td><td></td></tr>
 <tr class="headercolor2"><td>Apache Main:</td><td><a href="$appRoot/Core/File/details.vm?id=$!{apache.getMain().getPk()}"> $!{apache.getMain().getDescriptor()}</a></td><td> </td></tr>
 
-</table>
+    </table>
 
 
-#set ($collection = $view.getApacheWorkers($apache))
-#if( $collection && ! $collection.isEmpty())
-<br />
-#parse("/Apache/Worker/list.vm")
-#end 	## of all apaches
-
-#else
-<div class="messagebox">
-  Apache:
-  #set ($aps = $view.getApaches())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($ap in $aps)
-              			      <option value="$appRoot/Apache/Server/details.vm?id=$ap.getPk()">$ap.getName()
-              			      #end
-              			      </select><BR>
-</div>
-#end
+    #set ($collection = $view.getApacheWorkers($apache))
+    #if( $collection && ! $collection.isEmpty())
+    <br/>
+    #parse("/Apache/Worker/list.vm")
+    #end ## of all apaches
+
+    #else
+    <div class="messagebox">
+      Apache:
+      #set ($aps = $view.getApaches())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($ap in $aps)
+        <option value="$appRoot/Apache/Server/details.vm?id=$ap.getPk()">$ap.getName()
+          #end
+      </select><BR>
+    </div>
+    #end
 
 
-<br>
+    <br>
 
 
-</div>
+  </div>
 
-#parse("/layout/footer.vm")
+  #parse("/layout/footer.vm")
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm Thu Jul  6 08:23:21 2006
@@ -16,10 +16,10 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Apache/Server/details.vm">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Apache/Server/add.vm">&nbsp;Add&nbsp;</option>
-<option value="$appRoot/Apache/Server/update.vm">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Apache/Server/delete.vm">&nbsp;Delete&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Apache/Server/details.vm">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Apache/Server/add.vm">&nbsp;Add&nbsp;</option>
+  <option value="$appRoot/Apache/Server/update.vm">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Apache/Server/delete.vm">&nbsp;Delete&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm Thu Jul  6 08:23:21 2006
@@ -16,9 +16,9 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Apache/Server/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Apache/Server/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Apache/Server/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Apache/Server/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Apache/Server/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Apache/Server/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm Thu Jul  6 08:23:21 2006
@@ -20,78 +20,68 @@
 #parse("/layout/header.vm")
 
 <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>Apache</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Server/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+<div class="messagebox">
+#set ($id = $request.getParameter("id"))
+#set ($methodToCall = "UpdateApache")
+#if($id)
+#set ($apache = $view.getApache($id))
 
-  <div class="projectbox">
-    <table width="100%" border="0" cellspacing="0" cellpadding="1">
-      <tr class="info" valign="top">
-        <td colspan="2">Infrastructure - <b>Apache</b>
-        </td>
-        <td align="right">
-          #parse("Apache/Server/menu/global.vm")
-        </td>
-      </tr>
-    </table>
-    <br/>
+#if ($User.isAllowed("UpdateApache") && $methodToCall == "UpdateApache")
+<form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
+<input type="hidden" id="id" name="id" value="$!{id}">
+<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+Name: <input type="text"  id="name" name="name" value="$!{apache.getName()}"><br>
+Server Root: <input type="text" size="45" id="serverRoot" name="serverRoot" value="$!{apache.getServerRoot()}"><br>
+Log Location: <input type="text"size="45" id="logLocation" name="logLocation" value="$!{apache.getLogLocation()}"><br>
+System User: <input type="text" id="sysUser" name="sysUser" value="$!{apache.getSysUser()}"><br>
+System Group: <input type="text" id="sysGroup" name="sysGroup" value="$!{apache.getSysGroup()}"><br>
+Start Command: <input type="text" id="startCommand" name="startCommand" value="$!{apache.getStartCommand()}"><br>
+Stop Command: <input type="text" id="stopCommand" name="stopCommand" value="$!{apache.getStopCommand()}"><br>
+Restart Command: <input type="text" id="restartCommand" name="restartCommand" value="$!{apache.getRestartCommand()}"><br>
+Environment Varibles: <input type="text" id="envVaribles" name="envVaribles" value="$!{apache.getEnvVaribles()}"><br>
+	Pid File Location: <input type="text" id="pidFileLocation" name="pidFileLocation" value="$!{apache.getPidFileLocation()}"><br>
+Apache Main:
+#set ($allFiles = $view.getFiles())
+#if ($apache.getMain())
+#if ($allfiles.remove($apache.getMain()))
 
-    <div class="messagebox">
-      #set ($id = $request.getParameter("id"))
-      #set ($methodToCall = "UpdateApache")
-      #if($id)
-      #set ($apache = $view.getApache($id))
-
-      #if ($User.isAllowed("UpdateApache") && $methodToCall == "UpdateApache")
-      <form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
-        <input type="hidden" id="id" name="id" value="$!{id}">
-        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-        Name: <input type="text" id="name" name="name" value="$!{apache.getName()}"><br>
-        Server Root: <input type="text" size="45" id="serverRoot" name="serverRoot" value="$!{apache.getServerRoot()}">
-        <br>
-        Log Location: <input type="text" size="45" id="logLocation" name="logLocation"
-                             value="$!{apache.getLogLocation()}"><br>
-        System User: <input type="text" id="sysUser" name="sysUser" value="$!{apache.getSysUser()}"><br>
-        System Group: <input type="text" id="sysGroup" name="sysGroup" value="$!{apache.getSysGroup()}"><br>
-        Start Command: <input type="text" id="startCommand" name="startCommand" value="$!{apache.getStartCommand()}">
-        <br>
-        Stop Command: <input type="text" id="stopCommand" name="stopCommand" value="$!{apache.getStopCommand()}"><br>
-        Restart Command: <input type="text" id="restartCommand" name="restartCommand"
-                                value="$!{apache.getRestartCommand()}"><br>
-        Environment Varibles: <input type="text" id="envVaribles" name="envVaribles"
-                                     value="$!{apache.getEnvVaribles()}"><br>
-        Pid File Location: <input type="text" id="pidFileLocation" name="pidFileLocation"
-                                  value="$!{apache.getPidFileLocation()}"><br>
-        Apache Main:
-        #set ($allFiles = $view.getFiles())
-        #if ($apache.getMain())
-        #if ($allfiles.remove($apache.getMain()))
-
-        #end
-        #end
-        <select name=mainId>
-          <option value="$!{apache.getMain().getPk()}">$!{apache.getMain().getDescriptor()}
-            #foreach ($file in $allFiles)
-          <option value="$file.getPk()">$file.getDescriptor()
-            #end
-        </select>
-        <br/>
-        <br/>
-        <input type="submit" value="Update"><br>
-      </form>
-      #end
-      #else
-      Apache:
-      #set ($aps = $view.getApaches())
-      <select name=id onchange='OnChange(this);'>
-        <option value="">Select one
-          #foreach ($ap in $aps)
-        <option value="$appRoot/Apache/Server/update.vm?id=$ap.getPk()">$ap.getName()
-          #end
-      </select><BR>
-      #end
-    </div>
-    <br/>
-  </div>
-  <br/>
+#end
+#end
+<select name=mainId>
+<option value="$!{apache.getMain().getPk()}">$!{apache.getMain().getDescriptor()}
+#foreach ($file in $allFiles)
+<option value="$file.getPk()">$file.getDescriptor()
+#end
+</select>
+<input type="submit" value="Update"><br>
+</form>
+#end
+#else
+  Apache:
+  #set ($aps = $view.getApaches())
+               <select name=id onchange='OnChange(this);'>
+                  	<option value="">Select one
+              	    #foreach ($ap in $aps)
+              	      	<option value="$appRoot/Apache/Server/update.vm?id=$ap.getPk()">$ap.getName()
+              	    #end
+              	</select><BR>
+#end
+</div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm Thu Jul  6 08:23:21 2006
@@ -25,25 +25,25 @@
 #end
 
 <div id="bigright">
-<div class="messagebox">
+  <div class="messagebox">
 
-#if ($id)
-#set ($apacheWorker = $view.getApacheWorker($id))
+    #if ($id)
+    #set ($apacheWorker = $view.getApacheWorker($id))
 
-<TextArea cols="90" READONLY rows="30">$apacheWorker.buildConfForWeb()</textarea>
+    <TextArea cols="90" READONLY rows="30">$apacheWorker.buildConfForWeb()</textarea>
 
-#else
-Apache Worker:
-#set ($aws = $view.getApacheWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($aw in $aws)
-              			      <option value="$appRoot/Apache/Server/viewconf.vm?id=$aw.getPk()">$aw.getName()
-              			      #end
-              			      </select><BR>
-#end
+    #else
+    Apache Worker:
+    #set ($aws = $view.getApacheWorkers())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($aw in $aws)
+      <option value="$appRoot/Apache/Server/viewconf.vm?id=$aw.getPk()">$aw.getName()
+        #end
+    </select><BR>
+    #end
 
-</div>
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm Thu Jul  6 08:23:21 2006
@@ -19,103 +19,104 @@
 #set ($pageSelected = "ApachePool")
 #parse("/layout/header.vm")
 <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=3>Infrastructure - <b>ApacheWorker</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-#if ($request.getParameter("workers"))
-#set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
-#else
-#set($numberOfWorkers = 1)
-#end
-
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#end
-
-
-Debug: Number of workers: $numberOfWorkers<BR><BR>
-
-<form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
-<table>
-<tr>
-<td>
-Pool Name:
-</td>
-<td>
-#if($id)
-#set ($apachePool = $view.getApachePool($id))
-<input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}">
-#end
-<input type="text" id="poolName" name="poolName" value="$!{poolName}">
-</td>
-</tr>
-<tr>
-<td>
-Environment:
-</td>
-<td>
-#set ($envs = $view.getEnvironments())
-<select name=envId>
-			      #foreach ($env in $envs)
-			      <option value="$env.getPk()">$env.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-<tr>
-<td collspan="2">
-<A href="add.vm?workers=$math.add($numberOfWorkers, 1)"> Add another Apache Worker</A>
-</td>
-</tr>
-<tr>
-<td>
-Apache Container:
-</td>
-<td>
-Hardware:
-</td>
-</tr>
-#set($Apaches = $view.getApaches())
-#set($hardware = $view.getHardwares())
-#foreach($run in [1..$numberOfWorkers])
-<tr>
-<td>
-$run
-<select name=apacheId>
-			      #foreach ($apache in $Apaches)
-			      <option value="$apache.getPk()">$apache.getName()
-			      #end
-			      </select>
-
-</td>
-<td>
-<select name=hardwareId>
-			      #foreach ($h in $hardware)
-			      <option value="$h.getPk()">$h.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-#end
-</table>
-<input type="hidden" name="methodToCall" value="AddApachePool">
-<input type="submit" value="submit">
-</form>
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - <b>ApacheWorker</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Worker/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      #if ($request.getParameter("workers"))
+      #set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
+      #else
+      #set($numberOfWorkers = 1)
+      #end
+
+      #if ($request.getParameter("id"))
+      #set ($id = $request.getParameter("id"))
+      #end
+
+
+      Debug: Number of workers: $numberOfWorkers<BR><BR>
+
+      <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
+        <table>
+          <tr>
+            <td>
+              Pool Name:
+            </td>
+            <td>
+              #if($id)
+              #set ($apachePool = $view.getApachePool($id))
+              <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}">
+              #end
+              <input type="text" id="poolName" name="poolName" value="$!{poolName}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Environment:
+            </td>
+            <td>
+              #set ($envs = $view.getEnvironments())
+              <select name=envId>
+                #foreach ($env in $envs)
+                <option value="$env.getPk()">$env.getName()
+                  #end
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td collspan="2">
+              <A href="add.vm?workers=$math.add($numberOfWorkers, 1)"> Add another Apache Worker</A>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Apache Container:
+            </td>
+            <td>
+              Hardware:
+            </td>
+          </tr>
+          #set($Apaches = $view.getApaches())
+          #set($hardware = $view.getHardwares())
+          #foreach($run in [1..$numberOfWorkers])
+          <tr>
+            <td>
+              $run
+              <select name=apacheId>
+                #foreach ($apache in $Apaches)
+                <option value="$apache.getPk()">$apache.getName()
+                  #end
+              </select>
+
+            </td>
+            <td>
+              <select name=hardwareId>
+                #foreach ($h in $hardware)
+                <option value="$h.getPk()">$h.getName()
+                  #end
+              </select>
+            </td>
+          </tr>
+          #end
+        </table>
+        <input type="hidden" name="methodToCall" value="AddApachePool">
+        <input type="submit" value="submit">
+      </form>
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm Thu Jul  6 08:23:21 2006
@@ -17,11 +17,11 @@
 ##
 #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"><BR>
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
+  <input type=hidden name="methodToCall" value="$methodToCall">
+  <input type="submit" value="$buttonName"><BR>
+  $methodToCall
+  <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+  $individual.getName()
 </form>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm Thu Jul  6 08:23:21 2006
@@ -26,116 +26,120 @@
 #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>Apache Worker</b>
-  </td>
-  <td align="right">
-  #parse("/Apache/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>Apache Worker</b>
+      </td>
+      <td align="right">
+        #parse("/Apache/Worker/menu/global.vm")
+      </td>
+    </tr>
+  </table>
+  <br/>
 
 
-#if ($id)
+  #if ($id)
   #set ($apacheWorker = $view.getApacheWorker($id))
   #set ($ent = $apacheWorker)
-<table width="95%" border="0" cellspacing="0" cellpadding="1">
-  <tr height="15" class="info">
-	<td align="left" valign="center" colspan=2 >
-	  Worker - $!{apacheWorker.getName()}
-	</b>
-	</td>
-	<td align="right">
-#if ($ent)
-#parse("/Apache/Worker/menu/indiv.vm")
-#end
-</td></tr>
-			<tr class="headercolor1">
-			<td>Apache</td>
-			<td><A href="$appRoot/Apache/Server/details.vm?id=$!{apacheWorker.getApache().getPk()}">$!{apacheWorker.getApache().getName()}</a></td>
-			<td align="right">
-			#set($ent = $apacheWorker.getApache())
-			#if($ent)
-			#parse("/Apache/Server/menu/indiv.vm")
-			#end
-			</td>
-			</tr>
-			<tr class="headercolor2">
-			<td>Hardware</td>
-			<td><A href="$appRoot/Core/Server/details.vm?id=$!{apacheWorker.getHardware().getPk()}">$!{apacheWorker.getHardware().getName()}</a></td>
-			<td align="right">
-			#set($ent = $apacheWorker.getHardware())
-			#if($ent)
-			#parse("/Core/Server/menu/indiv.vm")
-			#end
-			</td>
-			</tr>
+  <table width="95%" border="0" cellspacing="0" cellpadding="1">
+    <tr height="15" class="info">
+      <td align="left" valign="center" colspan=2>
+        Worker - $!{apacheWorker.getName()}
+      </b>
+    </td>
+    <td align="right">
+      #if ($ent)
+      #parse("/Apache/Worker/menu/indiv.vm")
+      #end
+    </td></tr>
+  <tr class="headercolor1">
+    <td>Apache</td>
+    <td><A href="$appRoot/Apache/Server/details.vm?id=$!{apacheWorker.getApache().getPk()}">$!{apacheWorker.getApache().getName()}</a>
+    </td>
+    <td align="right">
+      #set($ent = $apacheWorker.getApache())
+      #if($ent)
+      #parse("/Apache/Server/menu/indiv.vm")
+      #end
+    </td>
+  </tr>
+  <tr class="headercolor2">
+    <td>Hardware</td>
+    <td><A href="$appRoot/Core/Server/details.vm?id=$!{apacheWorker.getHardware().getPk()}">$!{apacheWorker.getHardware().getName()}</a>
+    </td>
+    <td align="right">
+      #set($ent = $apacheWorker.getHardware())
+      #if($ent)
+      #parse("/Core/Server/menu/indiv.vm")
+      #end
+    </td>
+  </tr>
 
 </table>
 
 
 #set ($collection = $view.getApachePools($apacheWorker))
 #if( $collection && ! $collection.isEmpty())
-<br />
+<br/>
 #parse("/Apache/Pool/list.vm")
-#end 	## of all apachepools
+#end ## of all apachepools
 
 #set ($vhosts = $view.getVirtualHosts($User, $apacheWorker))
 #if( $vhosts && ! $vhosts.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="3">
-	  Virtualhosts
-	</td>
-	<td align="right">
-	#parse("/Apache/Entity/menu/global.vm")
-	</td>
+    <td align="left" valign="center" colspan="3">
+      Virtualhosts
+    </td>
+    <td align="right">
+      #parse("/Apache/Entity/menu/global.vm")
+    </td>
   </tr>
   <tr class="info">
-  <td width=25%> Hostname </td>
-  <td width=15%> Environment </td>
-  <td width=30%> Apache Pool </td>
-  <td width=30%>  </td>
+    <td width=25%> Hostname </td>
+    <td width=15%> Environment </td>
+    <td width=30%> Apache Pool </td>
+    <td width=30%></td>
   </tr>
   #set($c = 1)
-	#foreach ($vhost in $vhosts)
-		#set ($count = 1)
-    	<tr class="headercolor$c">
-		  <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()} </td>
-    	<td align="center"> $!{vhost.getEnv().getName()} </td>
-		<td align="center">
-		  <a href="$appRoot/Apache/Pool/details.vm?id=$!{vhost.getApachePool().getPk()}">$!{vhost.getApachePool().getName()} </a><br>
-		</td>
-		<td align="right">
-		#set($ent = $vhost)
-		#parse("/Apache/Entity/menu/indiv.vm")
-		</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
+  #foreach ($vhost in $vhosts)
+  #set ($count = 1)
+  <tr class="headercolor$c">
+    <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()}</td>
+    <td align="center"> $!{vhost.getEnv().getName()} </td>
+    <td align="center">
+      <a href="$appRoot/Apache/Pool/details.vm?id=$!{vhost.getApachePool().getPk()}">$!{vhost.getApachePool().getName()} </a>
+      <br>
+    </td>
+    <td align="right">
+      #set($ent = $vhost)
+      #parse("/Apache/Entity/menu/indiv.vm")
+    </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>
-#end 	## of all vhosts
+#end ## of all vhosts
 
 #else
 <div class="messagebox">
-    Apache Worker:
-    #set ($aws = $view.getApacheWorkers().orderByName().values())
-       <select name=id onchange='OnChange(this);'>
-          <option value="">Select one
-          #foreach ($aw in $aws)
-            <option value="$appRoot/Apache/Worker/$page?id=$aw.getPk()">$aw.getName()
-          #end
-        </select><BR>
+  Apache Worker:
+  #set ($aws = $view.getApacheWorkers().orderByName().values())
+  <select name=id onchange='OnChange(this);'>
+    <option value="">Select one
+      #foreach ($aw in $aws)
+    <option value="$appRoot/Apache/Worker/$page?id=$aw.getPk()">$aw.getName()
+      #end
+  </select><BR>
 </div>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm Thu Jul  6 08:23:21 2006
@@ -36,7 +36,6 @@
 #end
 
 
-
 #parse("/layout/list2.vm")
 #if($plf)
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm Thu Jul  6 08:23:21 2006
@@ -16,35 +16,35 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($User.isAllowed("ViewApacheWorker"))
-<option value="$appRoot/Apache/Worker/details.vm">&nbsp;Details&nbsp;&nbsp;</option>
-#if($User.isAllowed("UpdateApacheWorker"))
-<option value="$appRoot/Apache/Worker/update.vm">&nbsp;Update&nbsp;&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteApacheWorker"))
-<option value="$appRoot/Apache/Worker/delete.vm">&nbsp;Delete&nbsp;&nbsp;</option>
-#end
-#if($User.isAllowed("RestartApache"))
-<option value="$appRoot/Apache/Worker/restartapache.vm">&nbsp;Restart&nbsp;&nbsp;</option>
-#end
-#if($User.isAllowed("GracefulApache"))
-<option value="$appRoot/Apache/Worker/gracefulapache.vm">&nbsp;Graceful&nbsp;&nbsp;</option>
-#end
-#if($User.isAllowed("StopApache"))
-<option value="$appRoot/Apache/Worker/stopapache.vm">&nbsp;Stop&nbsp;&nbsp;</option>
-#end
-#if($User.isAllowed("StartApache"))
-<option value="$appRoot/Apache/Worker/startapache.vm">&nbsp;Start&nbsp;&nbsp;</option>
-#end
-#if($User.isAllowed("ConfigtestApache"))
-<option value="$appRoot/Apache/Worker/configtestapache.vm">&nbsp;Configtest&nbsp;&nbsp;</option>
-#end
-<option value="$appRoot/Apache/Worker/viewconf.vm">&nbsp;View Config File&nbsp;&nbsp;</option>
-<option value="$appRoot/Apache/Worker/viewprop.vm">&nbsp;View workers.properties&nbsp;&nbsp;</option>
-#if($User.isAllowed("DeployApacheConfig"))
-<option value="$appRoot/Apache/Worker/deployconf.vm">&nbsp;Deploy Config Files&nbsp;&nbsp;</option>
-#end
-#end
+  <option value="" selected>Select Action
+    #if($User.isAllowed("ViewApacheWorker"))
+  <option value="$appRoot/Apache/Worker/details.vm">&nbsp;Details&nbsp;&nbsp;</option>
+  #if($User.isAllowed("UpdateApacheWorker"))
+  <option value="$appRoot/Apache/Worker/update.vm">&nbsp;Update&nbsp;&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteApacheWorker"))
+  <option value="$appRoot/Apache/Worker/delete.vm">&nbsp;Delete&nbsp;&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartApache"))
+  <option value="$appRoot/Apache/Worker/restartapache.vm">&nbsp;Restart&nbsp;&nbsp;</option>
+  #end
+  #if($User.isAllowed("GracefulApache"))
+  <option value="$appRoot/Apache/Worker/gracefulapache.vm">&nbsp;Graceful&nbsp;&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopApache"))
+  <option value="$appRoot/Apache/Worker/stopapache.vm">&nbsp;Stop&nbsp;&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartApache"))
+  <option value="$appRoot/Apache/Worker/startapache.vm">&nbsp;Start&nbsp;&nbsp;</option>
+  #end
+  #if($User.isAllowed("ConfigtestApache"))
+  <option value="$appRoot/Apache/Worker/configtestapache.vm">&nbsp;Configtest&nbsp;&nbsp;</option>
+  #end
+  <option value="$appRoot/Apache/Worker/viewconf.vm">&nbsp;View Config File&nbsp;&nbsp;</option>
+  <option value="$appRoot/Apache/Worker/viewprop.vm">&nbsp;View workers.properties&nbsp;&nbsp;</option>
+  #if($User.isAllowed("DeployApacheConfig"))
+  <option value="$appRoot/Apache/Worker/deployconf.vm">&nbsp;Deploy Config Files&nbsp;&nbsp;</option>
+  #end
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm Thu Jul  6 08:23:21 2006
@@ -16,41 +16,41 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($page)
-<option value="$appRoot/Apache/Worker/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Apache/Worker/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateApacheWorker"))
-<option value="$appRoot/Apache/Worker/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteApacheWorker"))
-<option value="$appRoot/Apache/Worker/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-#end
-#if($User.isAllowed("RestartApache"))
-<option value="$appRoot/Apache/Worker/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
-#end
-#if($User.isAllowed("GracefulApache"))
-<option value="$appRoot/Apache/Worker/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful&nbsp;</option>
-#end
-#if($User.isAllowed("StopApache"))
-<option value="$appRoot/Apache/Worker/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
-#end
-#if($User.isAllowed("StartApache"))
-<option value="$appRoot/Apache/Worker/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
-#end
-#if($User.isAllowed("ConfigtestApache"))
-<option value="$appRoot/Apache/Worker/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest&nbsp;</option>
-#end
-#if($User.isAllowed("ViewApacheWorker"))
-<option value="$appRoot/Apache/Worker/viewconf.vm?id=$!{ent.getPk()}">&nbsp;View Config File&nbsp;</option>
-#end
-#if($User.isAllowed("ViewApacheWorker"))
-<option value="$appRoot/Apache/Worker/viewprop.vm?id=$!{ent.getPk()}">&nbsp;View workers.properties&nbsp;</option>
-#end
-#if($User.isAllowed("DeployApacheConfig"))
-<option value="$appRoot/Apache/Worker/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Config Files&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Apache/Worker/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Apache/Worker/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateApacheWorker"))
+  <option value="$appRoot/Apache/Worker/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteApacheWorker"))
+  <option value="$appRoot/Apache/Worker/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartApache"))
+  <option value="$appRoot/Apache/Worker/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
+  #end
+  #if($User.isAllowed("GracefulApache"))
+  <option value="$appRoot/Apache/Worker/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopApache"))
+  <option value="$appRoot/Apache/Worker/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartApache"))
+  <option value="$appRoot/Apache/Worker/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
+  #end
+  #if($User.isAllowed("ConfigtestApache"))
+  <option value="$appRoot/Apache/Worker/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewApacheWorker"))
+  <option value="$appRoot/Apache/Worker/viewconf.vm?id=$!{ent.getPk()}">&nbsp;View Config File&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewApacheWorker"))
+  <option value="$appRoot/Apache/Worker/viewprop.vm?id=$!{ent.getPk()}">&nbsp;View workers.properties&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeployApacheConfig"))
+  <option value="$appRoot/Apache/Worker/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Config Files&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm Thu Jul  6 08:23:21 2006
@@ -20,66 +20,67 @@
 #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>Apache Worker</b>
-  </td>
-  <td align="right">
-  #parse("/Apache/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
+  <br/><br/>
 
-<div class="messagebox">
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Apache Worker</b>
+        </td>
+        <td align="right">
+          #parse("/Apache/Worker/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
 
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateApacheWorker")
+    <div class="messagebox">
 
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateApacheWorker")
-#if($id)
-#set ($aw = $view.getApacheWorker($id))
-<form name="Form" method="post" action='$link.setAction("administration/ApacheWorkerAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-Name: <input type="text" size="45" readonly id="name" name="name" value="$!{aw.getName()}"><BR>
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateApacheWorker")
 
-Apache: 
-#set($Apaches = $view.getApaches())
-<select name=apacheId>
-#foreach ($apache in $Apaches)
-<option value="$apache.getPk()">$apache.getName()
-#end
-</select>
-<BR>
-State: <input type="text" readonly  id="state" name="state" value="Active"><BR>
-Hardware: 
-#set($hardware = $view.getHardwares())
-<select name=hardwareId>
-#foreach ($h in $hardware)
-<option value="$h.getPk()">$h.getName()
-#end
-</select>
-<BR>
-<input type="submit" value="update">
-</form>
-#else
-Apache Worker:
-#set ($aws = $view.getApacheWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($aw in $aws)
-              			      <option value="$appRoot/Apache/Worker/update.vm?id=$aw.getPk()">$aw.getName()
-              			      #end
-              			      </select><BR>
-#end
-#end
-</div>
-<br />
-</div>
-<br />
+      #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateApacheWorker")
+      #if($id)
+      #set ($aw = $view.getApacheWorker($id))
+      <form name="Form" method="post" action='$link.setAction("administration/ApacheWorkerAction")'>
+        <input type="hidden" id="id" name="id" value="$!{id}">
+        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+        Name: <input type="text" size="45" readonly id="name" name="name" value="$!{aw.getName()}"><BR>
+
+        Apache:
+        #set($Apaches = $view.getApaches())
+        <select name=apacheId>
+          #foreach ($apache in $Apaches)
+          <option value="$apache.getPk()">$apache.getName()
+            #end
+        </select>
+        <BR>
+        State: <input type="text" readonly id="state" name="state" value="Active"><BR>
+        Hardware:
+        #set($hardware = $view.getHardwares())
+        <select name=hardwareId>
+          #foreach ($h in $hardware)
+          <option value="$h.getPk()">$h.getName()
+            #end
+        </select>
+        <BR>
+        <input type="submit" value="update">
+      </form>
+      #else
+      Apache Worker:
+      #set ($aws = $view.getApacheWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($aw in $aws)
+        <option value="$appRoot/Apache/Worker/update.vm?id=$aw.getPk()">$aw.getName()
+          #end
+      </select><BR>
+      #end
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm Thu Jul  6 08:23:21 2006
@@ -24,40 +24,42 @@
 #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>Apache Worker</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#if ($id)
-#set ($apacheWorker = $view.getApacheWorker($id))
-
-<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildConfForWeb()}</textarea>
-
-#else
-Apache Worker:
-#set ($aws = $view.getApacheWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($aw in $aws)
-              			      <option value="$appRoot/Apache/Worker/viewconf.vm?id=$aw.getPk()">$aw.getName()
-              			      #end
-              			      </select><BR>
-#end
-
-</div>
-<br />
-</div>
-<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>Apache Worker</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Worker/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      #if ($id)
+      #set ($apacheWorker = $view.getApacheWorker($id))
+
+      <TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildConfForWeb()}</textarea>
+
+      #else
+      Apache Worker:
+      #set ($aws = $view.getApacheWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($aw in $aws)
+        <option value="$appRoot/Apache/Worker/viewconf.vm?id=$aw.getPk()">$aw.getName()
+          #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm Thu Jul  6 08:23:21 2006
@@ -25,40 +25,42 @@
 #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>Apache Worker</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Worker/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#if ($id)
-#set ($apacheWorker = $view.getApacheWorker($id))
-
-<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildWorkersProperties()}</textarea>
-
-#else
-Apache Worker:
-#set ($aws = $view.getApacheWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($aw in $aws)
-              			      <option value="$appRoot/Apache/Worker/viewprop.vm?id=$aw.getPk()">$aw.getName()
-              			      #end
-              			      </select><BR>
-#end
-
-</div>
-<br />
-</div>
-<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>Apache Worker</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Worker/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      #if ($id)
+      #set ($apacheWorker = $view.getApacheWorker($id))
+
+      <TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildWorkersProperties()}</textarea>
+
+      #else
+      Apache Worker:
+      #set ($aws = $view.getApacheWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($aw in $aws)
+        <option value="$appRoot/Apache/Worker/viewprop.vm?id=$aw.getPk()">$aw.getName()
+          #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm Thu Jul  6 08:23:21 2006
@@ -19,73 +19,72 @@
 #set ($pageSelected = "Pool")
 #parse("/layout/header.vm")
 <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=3>Infrastructure - <b>Tomcat Pool</b>
-        </TD>
-      </TR>
-    </table>
-    <div class="messagebox">
-      #set ($id = $request.getParameter("id"))
-      #set ($methodToCall = "UpdateTomcatPool")
-      #if($id)
-      <br/>
-      #set ($tomcatPool = $view.getTomcatPool($id))
+<div class="projectbox">
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+<TR CLASS="info" valign="top">
+	<TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
+  </TD>
+</TR>
+</table>
+<div class="messagebox">
+#set ($id = $request.getParameter("id"))
+#set ($methodToCall = "UpdateTomcatPool")
+#if($id)
+#set ($tomcatPool = $view.getTomcatPool($id))
 
-      #if ($User.isAllowed("UpdateTomcatPool") && $methodToCall == "UpdateTomcatPool")
-      <form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
-        <input type="hidden" id="poolId" name="poolId" value="$!{id}">
-        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-        Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tomcatPool.getWorkerName()}"><BR>
-        Pool Name: <input type="text" readonly id="poolName" name="poolName" value="$!{tomcatPool.getName()}"><BR>
-        Environment:
-        #set ($envs = $view.getEnvironments())
-        <select name=envId>
-          #if ($tomcatPool.getEnv())
-          #if ($envs.remove($tomcatPool.getEnv()))
+#if ($User.isAllowed("UpdateTomcatPool") && $methodToCall == "UpdateTomcatPool")
+<form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
+<input type="hidden" id="id" name="id" value="$!{id}">
+<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tomcatPool.getWorkerName()}"><BR>
+Pool Name: <input type="text" readonly id="poolName" name="poolName" value="$!{tomcatPool.getName()}"><BR>
+Environment:
+#set ($envs = $view.getEnvironments())
+<select name=envId>
+#if ($tomcatPool.getEnv())
+#if ($envs.remove($tomcatPool.getEnv()))
 
-          #end
-          #end
-          <option value="$tomcatPool.getEnv().getPk()">$tomcatPool.getEnv().getName()
-            #foreach ($env in $envs)
-          <option value="$env.getPk()">$env.getName()
-            #end
-        </select><BR>
-        Tomcat Workers:
+#end
+#end
+            <option value="$tomcatPool.getEnv().getPk()">$tomcatPool.getEnv().getName()
+			      #foreach ($env in $envs)
+			      <option value="$env.getPk()">$env.getName()
+			      #end
+			      </select><BR>
+Tomcat Workers:
 
-        <select name="tomcatIds" size="5" style="width:150px" multiple>
-          #set ($tomcatWorkers = $Users.getTomcatWorkers())
-          #if ($tomcatPool.getTomcats())
-          #foreach ($worker in $tomcatPool.getTomcats())
-          <option value="$worker.getPk()"> $worker.getName()
-            #end
-            #if ($tomcatWorkers.removeAll($tomcatPool.getTomcats()))
-            #end
-            #end
-            #foreach ($worker in $tomcatWorkers)
-          <option value="$worker.getPk()"> $worker.getName()
-            #end
-        </select>
-        <BR><BR><input type="submit" value="submit">
-        #end
-        #else
-        Tomcat Pool:
-        #set ($aps = $view.getTomcatPools())
-        <select name=id onchange='OnChange(this);'>
-          <option value="">Select one
-            #foreach ($ap in $aps)
-          <option value="$appRoot/Tomcat/Pool/update.vm?id=$ap.getPk()">$ap.getName()
-            #end
-        </select><BR>
-        #end
-      </form>
-    </div>
-    <br/>
-  </div>
-  <br/>
+<select name="tomcatIds" size="5" style="width:150px" multiple>
+	#set ($tomcatWorkers = $Users.getTomcatWorkers())
+	#if ($tomcatPool.getTomcats())
+		#foreach ($worker in $tomcatPool.getTomcats())
+			<option value="$worker.getPk()" > $worker.getName()
+		#end
+		#if ($tomcatWorkers.removeAll($tomcatPool.getTomcats()))
+		#end
+	#end
+	#foreach ($worker in $tomcatWorkers)
+		<option value="$worker.getPk()" > $worker.getName()
+	#end
+</select>
+<BR><BR><input type="submit" value="submit">
+#end
+#else
+  Tomcat Pool:
+  #set ($aps = $view.getTomcatPools())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($ap in $aps)
+              			      <option value="$appRoot/Tomcat/Pool/update.vm?id=$ap.getPk()">$ap.getName()
+              			      #end
+              			      </select><BR>
+#end
+</form>
+</div>
+<br />
+</div>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm Thu Jul  6 08:23:21 2006
@@ -19,123 +19,124 @@
 #set ($pageSelected = "Server")
 #parse("/layout/header.vm")
 <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=3>Infrastructure - <b>Tomcat</b>
-  </TD>
-  <td align="right">
-  #parse("Tomcat/Server/menu/global.vm")
-  </td>
-</TR>
+  <TR CLASS="info" valign="top">
+    <TD colspan=3>Infrastructure - <b>Tomcat</b>
+    </TD>
+    <td align="right">
+      #parse("Tomcat/Server/menu/global.vm")
+    </td>
+  </TR>
 </table>
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/TomcatAction")'>
 <table>
 <tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="name" name="name" value="$!{name}">
-</td>
+  <td>
+    Name:
+  </td>
+  <td>
+    <input type="text" id="name" name="name" value="$!{name}">
+  </td>
 </tr>
 <tr>
-<td>
-Description:
-</td>
-<td>
-<input type="text" id="description" name="description" value="$!{description}">
-</td>
+  <td>
+    Description:
+  </td>
+  <td>
+    <input type="text" id="description" name="description" value="$!{description}">
+  </td>
 </tr>
 <tr>
-<td>
-Version:
-</td>
-<td>
+  <td>
+    Version:
+  </td>
+  <td>
 <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType value="5"> 5.0.27 <input type=radio name=tomcatType value="6"> 5.5.9
-</td>
+  </td>
 </tr>
 <tr>
-<td>
-Base Location:
-</td>
-<td>
-<input type="text" id="baseLocation" name="baseLocation" value="$!{baseLocation}">
-</td>
+  <td>
+    Base Location:
+  </td>
+  <td>
+    <input type="text" id="baseLocation" name="baseLocation" value="$!{baseLocation}">
+  </td>
 </tr>
 <tr>
-<td>
-Tomcat Home:
-</td>
-<td>
-<input type="text" id="tomcatHome" name="tomcatHome" value="$!{tomcatHome}">
-</td>
+  <td>
+    Tomcat Home:
+  </td>
+  <td>
+    <input type="text" id="tomcatHome" name="tomcatHome" value="$!{tomcatHome}">
+  </td>
 </tr>
 <tr>
-<td>
-HTTP Port:
-</td>
-<td>
-<input type="text" id="httpPort" name="httpPort" value="$!{httpPort}">
-</td>
+  <td>
+    HTTP Port:
+  </td>
+  <td>
+    <input type="text" id="httpPort" name="httpPort" value="$!{httpPort}">
+  </td>
 </tr>
 <tr>
-<td>
-System User:
-</td>
-<td>
-<input type="text" id="sysUser" name="sysUser" value="$!{sysUser}">
-</td>
+  <td>
+    System User:
+  </td>
+  <td>
+    <input type="text" id="sysUser" name="sysUser" value="$!{sysUser}">
+  </td>
 </tr>
 <tr>
-<td>
-System Group:
-</td>
-<td>
-<input type="text" id="sysGroup" name="sysGroup" value="$!{sysGroup}">
-</td>
+  <td>
+    System Group:
+  </td>
+  <td>
+    <input type="text" id="sysGroup" name="sysGroup" value="$!{sysGroup}">
+  </td>
 </tr>
 <tr>
-<td>
-Java Home:
-</td>
-<td>
-<input type="text" id="javaHome" name="javaHome" value="$!{javaHome}">
-</td>
+  <td>
+    Java Home:
+  </td>
+  <td>
+    <input type="text" id="javaHome" name="javaHome" value="$!{javaHome}">
+  </td>
 </tr>
 <tr>
-<td>
-Standard Out Log:
-</td>
-<td>
-<input type="text" id="stdOutLog" name="stdOutLog" value="$!{stdOutLog}">
-</td>
+  <td>
+    Standard Out Log:
+  </td>
+  <td>
+    <input type="text" id="stdOutLog" name="stdOutLog" value="$!{stdOutLog}">
+  </td>
 </tr>
 <tr>
-<td>
-Start Class:
-</td>
-<td>
-<input type="text" id="startClass" name="startClass" value="$!{startClass}">
-</td>
+  <td>
+    Start Class:
+  </td>
+  <td>
+    <input type="text" id="startClass" name="startClass" value="$!{startClass}">
+  </td>
 </tr>
 <tr>
-<td>
-Environment Varibles:
-</td>
-<td>
-<textarea id="env" cols="70" rows="7" name="env">$!{env}</textarea>
-</td>
+  <td>
+    Environment Varibles:
+  </td>
+  <td>
+    <textarea id="env" cols="70" rows="7" name="env">$!{env}</textarea>
+  </td>
 </tr>
 <tr>
-<td>
-Java Options:
-</td>
-<td>
-<textarea id="javaOpts" cols="70" rows="7" name="javaOpts">$!{javaOpts}</textarea>
-</td>
+  <td>
+    Java Options:
+  </td>
+  <td>
+    <textarea id="javaOpts" cols="70" rows="7" name="javaOpts">$!{javaOpts}</textarea>
+  </td>
 </tr>
 <!--
 <input type="hidden" id="pidFileLocation" name="pidFileLocation" value="$!{pidFileLocation}">
@@ -161,9 +162,9 @@
 <input type="submit" value="submit">
 </form>
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm Thu Jul  6 08:23:21 2006
@@ -17,11 +17,11 @@
 ##
 #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"><BR>
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
+  <input type=hidden name="methodToCall" value="$methodToCall">
+  <input type="submit" value="$buttonName"><BR>
+  $methodToCall
+  <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+  $individual.getName()
 </form>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm Thu Jul  6 08:23:21 2006
@@ -23,69 +23,71 @@
 #set ($id = $request.getParameter("id"))
 #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>Tomcat</b>
-  </td>
-  <td align="right">
-  #parse("/Tomcat/Server/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br>
-
-
-#if ($id)
-  #set ($tomcat = $view.getTomcat($id))
-  #set ($ent = $tomcat)
-
-<table width="95%" border="0" cellspacing="0" cellpadding="1">
-  <tr height="15" class="info">
-	<td align="left" valign="center" colspan="2">
-	  Tomcat - $!{tomcat.getName()}
-	</b>
-	</td>
-	<td align="right">
-	#if($ent)
-	#parse("/Tomcat/Server/menu/indiv.vm")
-	#end
-	</td>
- </tr>
-<tr class="headercolor1"><td>Name:</td><td>$!{tomcat.getServerName()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Description:</td><td>$!{tomcat.getDescription()}</td><td> </td></tr>
-<tr class="headercolor1"><td>Base Location:</td><td>$!{tomcat.getBaseLocation()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Tomcat Home:</td><td>$!{tomcat.getTomcatHome()}</td><td> </td></tr>
-<tr class="headercolor1"><td>HTTP Port:</td><td>$!{tomcat.getHttpPort()}</td><td> </td></tr>
-<tr class="headercolor2"><td>System User:</td><td>$!{tomcat.getSysUser()}</td><td> </td></tr>
-<tr class="headercolor1"><td>System Group:</td><td>$!{tomcat.getSysGroup()}</td><td> </td></tr>
-<tr class="headercolor2"><td>JVM Options:</td><td colspan="2"><textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{tomcat.getEntry()} </textarea></td></tr>
-</table>
-
-#set ($collection = $view.getTomcatWorkers($tomcat))
-#if( $collection && ! $collection.isEmpty())
-<br />
-#parse("/Tomcat/Worker/list.vm")
-#end 	## of all tomcatworkers
+  <br/><br/>
 
-
-
-#else
-<div class="messagebox">
-  Tomcat:
-  #set ($aps = $view.getTomcats())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($ap in $aps)
-              			      <option value="$appRoot/Tomcat/Server/details.vm?id=$ap.getPk()">$ap.getName()
-              			      #end
-              			      </select><BR>
-</div>
-#end
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Tomcat</b>
+        </td>
+        <td align="right">
+          #parse("/Tomcat/Server/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br>
+
+
+    #if ($id)
+    #set ($tomcat = $view.getTomcat($id))
+    #set ($ent = $tomcat)
+
+    <table width="95%" border="0" cellspacing="0" cellpadding="1">
+      <tr height="15" class="info">
+        <td align="left" valign="center" colspan="2">
+          Tomcat - $!{tomcat.getName()}
+        </b>
+      </td>
+      <td align="right">
+        #if($ent)
+        #parse("/Tomcat/Server/menu/indiv.vm")
+        #end
+      </td>
+    </tr>
+    <tr class="headercolor1"><td>Name:</td><td>$!{tomcat.getServerName()}</td><td></td></tr>
+    <tr class="headercolor2"><td>Description:</td><td>$!{tomcat.getDescription()}</td><td></td></tr>
+    <tr class="headercolor1"><td>Base Location:</td><td>$!{tomcat.getBaseLocation()}</td><td></td></tr>
+    <tr class="headercolor2"><td>Tomcat Home:</td><td>$!{tomcat.getTomcatHome()}</td><td></td></tr>
+    <tr class="headercolor1"><td>HTTP Port:</td><td>$!{tomcat.getHttpPort()}</td><td></td></tr>
+    <tr class="headercolor2"><td>System User:</td><td>$!{tomcat.getSysUser()}</td><td></td></tr>
+    <tr class="headercolor1"><td>System Group:</td><td>$!{tomcat.getSysGroup()}</td><td></td></tr>
+    <tr class="headercolor2"><td>JVM Options:</td><td colspan="2"><textarea readonly id="entry" name="entry" cols="40"
+                                                                            rows="5"> $!{tomcat.getEntry()} </textarea>
+    </td></tr>
+  </table>
+
+  #set ($collection = $view.getTomcatWorkers($tomcat))
+  #if( $collection && ! $collection.isEmpty())
+  <br/>
+  #parse("/Tomcat/Worker/list.vm")
+  #end ## of all tomcatworkers
+
+
+  #else
+  <div class="messagebox">
+    Tomcat:
+    #set ($aps = $view.getTomcats())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($ap in $aps)
+      <option value="$appRoot/Tomcat/Server/details.vm?id=$ap.getPk()">$ap.getName()
+        #end
+    </select><BR>
+  </div>
+  #end
+  <br/>
 </div>
-<br />
+<br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm Thu Jul  6 08:23:21 2006
@@ -19,32 +19,34 @@
 #set ($pageSelected = "Server")
 #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=3>Infrastructure - <b>Tomcat</b>
-  </TD>
-  <td align="right">
-  #parse("Tomcat/Server/menu/global.vm")
-  </td>
-</TR>
-</table>
-<br>
-<div class="messagebox">
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateTomcat")
+  <br/><br/>
 
-#if($id)
-#set ($tomcat = $view.getTomcat($id))
+  <div class="projectbox">
+    <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+      <TR CLASS="info" valign="top">
+        <TD colspan=3>Infrastructure - <b>Tomcat</b>
+        </TD>
+        <td align="right">
+          #parse("Tomcat/Server/menu/global.vm")
+        </td>
+      </TR>
+    </table>
+    <br>
 
-#if ($User.isAllowed("UpdateTomcat") && $methodToCall == "UpdateTomcat")
-<form name="Form" method="post" action='$link.setAction("administration/TomcatAction")'>
-<input type="hidden" id="id" name="id" value="$id">
-Name: <input type="text" id="name" name="name" value="$!{tomcat.getServerName()}"><BR>
-Description: <input type="text" id="description" name="description" value="$!{tomcat.getDescription()}"><BR>
-<!-- $tomcat.getType() -->
-#if ($tomcat.getType() == 5)
+    <div class="messagebox">
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateTomcat")
+
+      #if($id)
+      #set ($tomcat = $view.getTomcat($id))
+
+      #if ($User.isAllowed("UpdateTomcat") && $methodToCall == "UpdateTomcat")
+      <form name="Form" method="post" action='$link.setAction("administration/TomcatAction")'>
+        <input type="hidden" id="id" name="id" value="$id">
+        Name: <input type="text" id="name" name="name" value="$!{tomcat.getServerName()}"><BR>
+        Description: <input type="text" id="description" name="description" value="$!{tomcat.getDescription()}"><BR>
+        <!-- $tomcat.getType() -->
+        #if ($tomcat.getType() == 5)
 Version: <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType CHECKED value="5"> 5.0.27 <input type=radio name=tomcatType value="6"> 5.5.9<BR>
 #elseif ($tomcat.getType() == 6)
 Version: <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType value="5"> 5.0.27 <input type=radio name=tomcatType CHECKED value="6"> 5.5.9 <BR>
@@ -61,25 +63,25 @@
 Java Home: <input type="text" id="javaHome" name="javaHome" value="$!{tomcat.getJavaHome()}"><BR>
 Environment Varibles:  <textarea id="env" name="env" cols="40" rows="5"> $!{tomcat.getEnv()} </textarea><BR>
 Java Options:  <textarea id="javaOpts" name="javaOpts" cols="40" rows="5"> $!{tomcat.getJavaOpts()} </textarea><BR>
-<input type="hidden" name="methodToCall" value="UpdateTomcat">
-<input type="submit" value="Update"><BR>
-</form>
-#end
-#else
-  Tomcat:
-  #set ($aps = $view.getTomcats())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($ap in $aps)
-              			      <option value="$appRoot/Tomcat/Server/update.vm?id=$ap.getPk()">$ap.getName()
-              			      #end
-              			      </select><BR>
+        <input type="hidden" name="methodToCall" value="UpdateTomcat">
+        <input type="submit" value="Update"><BR>
+      </form>
+      #end
+      #else
+      Tomcat:
+      #set ($aps = $view.getTomcats())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($ap in $aps)
+        <option value="$appRoot/Tomcat/Server/update.vm?id=$ap.getPk()">$ap.getName()
+          #end
+      </select><BR>
 
-#end
-</div>
-<br />
-</div>
-<br />
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

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=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm Thu Jul  6 08:23:21 2006
@@ -19,77 +19,78 @@
 #set ($pageSelected = "Worker")
 #parse("/layout/header.vm")
 <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 />
+<div class="messagebox">
 
-  <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/>
+#set ($id = $request.getParameter("id"))
+#set ($methodToCall = "UpdateTomcatWorker")
 
-    <div class="messagebox">
+#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="workerId" name="workerId" value="$!{id}">
+<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+Worker Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tw.getWorkerName()}"><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/>
+Name: <input type="text" size="45" readonly id="name" name="name" value="$!{tw.getName()}"><BR>
+Tomcat:
+#set($tomcats = $view.getTomcats())
+#set ($twpk = $tw.getTomcat())
+<select name=tomcatId>
+#foreach ($tomcat in $tomcats)
+#if ($tomcat.getPk() == $twpk.getPk())
+<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.getPk() == $tw.getHardware().getPk())
+<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
+<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/update.vm?id=$tw.getPk()">$tw.getName()
+              			      #end
+              			      </select><BR>
+<br />
+#end
+#end
+</div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

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=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/header.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/header.vm Thu Jul  6 08:23:21 2006
@@ -20,22 +20,19 @@
 #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=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm Thu Jul  6 08:23:21 2006
@@ -32,111 +32,110 @@
 ##
 <!--$collection -->
 #if($plf)
-<div align="center" class="contentbox">
-<br/><br/>
-#if ($request.getParameter("e"))
-#set ($envId = $request.getParameter("e"))
+	<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 />
 #end
-<div class="projectbox">
-  <table width="100%" border="0" cellspacing="0" cellpadding="1">
+<!--$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 ($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;
+    #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>
+    <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 class="info" href="$currentPage">All</a> &nbsp;
+	<a href="$appRoot/$path/details.vm?id=$!{ent.getPk()}">$!{ent.getName()}</a></td>
+	<td> 
+	#if($usesEnv == "true")
+          $!{ent.getEnv().getName()}
         #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
-        <td align="left" valign="center" colspan="2">
-          $entity
-        </td>
-        <td align="right">
-          #parse("$path/menu/global.vm")
-        </td>
+          #set($c=1)
         #end
-      </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
+      #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>
-  #end
+    </form>
   #end
-  #if($plf)
-  <br/>
+#end
+#if($plf)
+<br />
 </div>
-<br/>
+<br />
 </div>
 #end
 



Mime
View raw message