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 [4/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/Core/Pool/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/indiv.vm Wed Jul  5 14:11:29 2006
@@ -16,47 +16,47 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($page)
-<option value="$appRoot/Core/Pool/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Core/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateHostingPool"))
-<option value="$appRoot/Core/Pool/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteHostingPool"))
-<option value="$appRoot/Core/Pool/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-#end
-#if($User.isAllowed("RestartApache"))
-<option value="$appRoot/Core/Pool/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart Apache&nbsp;</option>
-#end
-#if($User.isAllowed("GracefulApache"))
-<option value="$appRoot/Core/Pool/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful Apache&nbsp;</option>
-#end
-#if($User.isAllowed("StopApache"))
-<option value="$appRoot/Core/Pool/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop Apache&nbsp;</option>
-#end
-#if($User.isAllowed("StartApache"))
-<option value="$appRoot/Core/Pool/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start Apache&nbsp;</option>
-#end
-#if($User.isAllowed("ConfigtestApache"))
-<option value="$appRoot/Core/Pool/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest Apache&nbsp;</option>
-#end
-#if($User.isAllowed("DeployApacheConfig"))
-<option value="$appRoot/Core/Pool/deployapacheconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Apache Config&nbsp;</option>
-#end
-#if($User.isAllowed("RestartTomcat"))
-<option value="$appRoot/Core/Pool/restarttomcat.vm?id=$!{ent.getPk()}">&nbsp;Restart Tomcat&nbsp;</option>
-#end
-#if($User.isAllowed("StopTomcat"))
-<option value="$appRoot/Core/Pool/stoptomcat.vm?id=$!{ent.getPk()}">&nbsp;Stop Tomcat&nbsp;</option>
-#end
-#if($User.isAllowed("StartTomcat"))
-<option value="$appRoot/Core/Pool/starttomcat.vm?id=$!{ent.getPk()}">&nbsp;Start Tomcat&nbsp;</option>
-#end
-#if($User.isAllowed("DeployTomcatConfig"))
-<option value="$appRoot/Core/Pool/deploytomcatconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Tomcat Config&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Core/Pool/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Core/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateHostingPool"))
+  <option value="$appRoot/Core/Pool/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteHostingPool"))
+  <option value="$appRoot/Core/Pool/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartApache"))
+  <option value="$appRoot/Core/Pool/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart Apache&nbsp;</option>
+  #end
+  #if($User.isAllowed("GracefulApache"))
+  <option value="$appRoot/Core/Pool/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful Apache&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopApache"))
+  <option value="$appRoot/Core/Pool/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop Apache&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartApache"))
+  <option value="$appRoot/Core/Pool/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start Apache&nbsp;</option>
+  #end
+  #if($User.isAllowed("ConfigtestApache"))
+  <option value="$appRoot/Core/Pool/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest Apache&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeployApacheConfig"))
+  <option value="$appRoot/Core/Pool/deployapacheconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Apache Config&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartTomcat"))
+  <option value="$appRoot/Core/Pool/restarttomcat.vm?id=$!{ent.getPk()}">&nbsp;Restart Tomcat&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopTomcat"))
+  <option value="$appRoot/Core/Pool/stoptomcat.vm?id=$!{ent.getPk()}">&nbsp;Stop Tomcat&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartTomcat"))
+  <option value="$appRoot/Core/Pool/starttomcat.vm?id=$!{ent.getPk()}">&nbsp;Start Tomcat&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeployTomcatConfig"))
+  <option value="$appRoot/Core/Pool/deploytomcatconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Tomcat Config&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm Wed Jul  5 14:11:29 2006
@@ -22,90 +22,92 @@
 
 
 <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 - Pool - <b>Search</b></td>
-<td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
-<option value="">Select one
-#parse("/Core/Pool/menu/search.vm")
-</select></td>
-</tr>
-</table>
-<br />
-#if ($name && $type != "")
-<div class="messagebox" width="75%" align="center">
-<br />
-<form name="Form1" method="post" action='$appRoot/Core/Pool/search.vm'>
-
-Component <select name=type>
-<option value="">Select one</option>
-<option value="HostingPool">Hosting Pool</option>
-<option value="ApachePool">Apache Pool</option>
-<option value="TomcatPool">Tomcat Pool</option>
-</select>
-<input type="text" id="name" name="name" value="$!{name}"><br />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
-<br />
-#if ($type == "HostingPool")
-#set($collection = $view.searchHostingPools($name))
-#set($path = "Core/Pool")
-#elseif ($type == "ApachePool")
-#set($collection = $view.searchApachePools($name))
-#set($path = "Apache/Pool")
-#elseif ($type == "TomcatPool")
-#set($collection = $view.searchTomcatPools($name))
-#set($path = "Tomcat/Pool")
-#elseif ($type == "ApacheWorker")
-#set($collection = $view.searchApacheWorkers($name))
-#set($path = "Apache/Worker")
-#elseif ($type == "TomcatWorker")
-#set($collection = $view.searchTomcatWorkers($name))
-#set($path = "Tomcat/Worker")
-#elseif ($type == "Hardware")
-#set($path = "Core/Server")
-#set($collection = $view.searchHardwares($name))
-#elseif ($type == "Apache")
-#set($path = "Apache/Server")
-#set($collection = $view.searchApaches($name))
-#elseif ($type == "Tomcat")
-#set($collection = $view.searchTomcats($name))
-#set($path = "Tomcat/Server")
-#elseif ($type == "Virtualhost")
-#set($path = "Apache/Entity")
-#set($collection = $view.searchVirtualHosts($name))
-#elseif ($type == "Context")
-#set($path = "Tomcat/Entity")
-#set($collection = $view.searchContexts($name))
-#end
-#parse("$path/list.vm")
-#end
-<div class="messagebox" width="75%" align="center">
-<br />
-#if ($name && $type != "")
-<form name="Form2" method="post" action='$appRoot/Core/Pool/search.vm'>
-#else
-<form name="Form1" method="post" action='$appRoot/Core/Pool/search.vm'>
-#end
-Component <select name=type>
-<option value="">Select one</option>
-<option value="HostingPool">Hosting Pool</option>
-<option value="ApachePool">Apache Pool</option>
-<option value="TomcatPool">Tomcat Pool</option>
-</select> <input type="text" id="name" name="name" value="$!{name}"><br />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
+  <br/><br/>
 
-<br />
-</div>
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - Pool - <b>Search</b></td>
+        <td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
+          <option value="">Select one
+            #parse("/Core/Pool/menu/search.vm")
+        </select></td>
+      </tr>
+    </table>
+    <br/>
+    #if ($name && $type != "")
+    <div class="messagebox" width="75%" align="center">
+      <br/>
 
-#parse("/layout/footer.vm")
+      <form name="Form1" method="post" action='$appRoot/Core/Pool/search.vm'>
+
+        Component <select name=type>
+        <option value="">Select one</option>
+        <option value="HostingPool">Hosting Pool</option>
+        <option value="ApachePool">Apache Pool</option>
+        <option value="TomcatPool">Tomcat Pool</option>
+      </select>
+        <input type="text" id="name" name="name" value="$!{name}"><br/>
+
+        <input type="submit" value="Search">
+      </form>
+      <br/>
+    </div>
+    <br/>
+    #if ($type == "HostingPool")
+    #set($collection = $view.searchHostingPools($name))
+    #set($path = "Core/Pool")
+    #elseif ($type == "ApachePool")
+    #set($collection = $view.searchApachePools($name))
+    #set($path = "Apache/Pool")
+    #elseif ($type == "TomcatPool")
+    #set($collection = $view.searchTomcatPools($name))
+    #set($path = "Tomcat/Pool")
+    #elseif ($type == "ApacheWorker")
+    #set($collection = $view.searchApacheWorkers($name))
+    #set($path = "Apache/Worker")
+    #elseif ($type == "TomcatWorker")
+    #set($collection = $view.searchTomcatWorkers($name))
+    #set($path = "Tomcat/Worker")
+    #elseif ($type == "Hardware")
+    #set($path = "Core/Server")
+    #set($collection = $view.searchHardwares($name))
+    #elseif ($type == "Apache")
+    #set($path = "Apache/Server")
+    #set($collection = $view.searchApaches($name))
+    #elseif ($type == "Tomcat")
+    #set($collection = $view.searchTomcats($name))
+    #set($path = "Tomcat/Server")
+    #elseif ($type == "Virtualhost")
+    #set($path = "Apache/Entity")
+    #set($collection = $view.searchVirtualHosts($name))
+    #elseif ($type == "Context")
+    #set($path = "Tomcat/Entity")
+    #set($collection = $view.searchContexts($name))
+    #end
+    #parse("$path/list.vm")
+    #end
+    <div class="messagebox" width="75%" align="center">
+      <br/>
+      #if ($name && $type != "")
+      <form name="Form2" method="post" action='$appRoot/Core/Pool/search.vm'>
+        #else
+        <form name="Form1" method="post" action='$appRoot/Core/Pool/search.vm'>
+          #end
+          Component <select name=type>
+          <option value="">Select one</option>
+          <option value="HostingPool">Hosting Pool</option>
+          <option value="ApachePool">Apache Pool</option>
+          <option value="TomcatPool">Tomcat Pool</option>
+        </select> <input type="text" id="name" name="name" value="$!{name}"><br/>
+
+          <input type="submit" value="Search">
+        </form>
+        <br/>
+    </div>
+
+    <br/>
+  </div>
+
+  #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm Wed Jul  5 14:11:29 2006
@@ -19,92 +19,94 @@
 #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>Hosting Pool</b>
-  </td>
-  <td align="right">
-  #parse("/Core/Pool/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br /><div class="messagebox">
-
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateHostingPool")
-
-
-#if ($User.isAllowed("UpdateHostingPool") && $methodToCall == "UpdateHostingPool")
-#if ($id)
-#set ($hp = $view.getHostingPool($id))
-<form name="Form" method="post" action='$link.setAction("administration/HostingPoolAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-Name: <input type="text" id="poolName" name="poolName" value="$!{hp.getName()}"><br />
-TomcatPool:
-#set ($tps = $view.getTomcatPools())
-#if ($hp.getTomcatPool())
-#if ($tps.remove($hp.getTomcatPool()))
-
-#end
-#end
-<select name=tomcatPoolId>
-           <option value="$!{hp.getTomcatPool().getPk()}">$!{hp.getTomcatPool().getName()}
-			      #foreach ($tp in $tps)
-			      <option value="$tp.getPk()">$tp.getName()
-			      #end
-			      </select><BR>
-
-Apache Pool:
-#set ($aps = $view.getApachePools())
-#if ($hp.getApachePool())
-#if ($aps.remove($hp.getApachePool()))
-
-#end
-#end
-<select name=apachePoolId>
-            <option value="$!{hp.getApachePool().getPk()}">$!{hp.getApachePool().getName()}
-			      #foreach ($ap in $aps)
-			      <option value="$ap.getPk()">$ap.getName()
-			      #end
-			      </select><BR>
-
-#set ($envs = $view.getEnvironments())
-#if($hp.getEnv())
-#if($envs.remove($hp.getEnv()))
-
-#end
-#end
-Environment: <select name=envId>
-			      <option value="$!{hp.getEnv().getPk()}">$!{hp.getEnv().getName()}
-			      #foreach ($env in $envs)
-			      <option value="$env.getPk()">$env.getName()
-			      #end
-			      </select><br>
-
-<input type="submit" value="Update">
-
-</form>
-#else
-Hosting Pool:
-#set ($hps = $view.getHostingPools())
-               <select name=hostingPoolId onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($hp in $hps)
-              			      <option value="$appRoot/Core/Pool/update.vm?id=$hp.getPk()">$hp.getName()
-              			      #end
-              			      </select><BR>
-#end
-#end
-</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>Hosting Pool</b>
+        </td>
+        <td align="right">
+          #parse("/Core/Pool/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateHostingPool")
+
+
+      #if ($User.isAllowed("UpdateHostingPool") && $methodToCall == "UpdateHostingPool")
+      #if ($id)
+      #set ($hp = $view.getHostingPool($id))
+      <form name="Form" method="post" action='$link.setAction("administration/HostingPoolAction")'>
+        <input type="hidden" id="id" name="id" value="$!{id}">
+        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+
+        Name: <input type="text" id="poolName" name="poolName" value="$!{hp.getName()}"><br/>
+        TomcatPool:
+        #set ($tps = $view.getTomcatPools())
+        #if ($hp.getTomcatPool())
+        #if ($tps.remove($hp.getTomcatPool()))
+
+        #end
+        #end
+        <select name=tomcatPoolId>
+          <option value="$!{hp.getTomcatPool().getPk()}">$!{hp.getTomcatPool().getName()}
+            #foreach ($tp in $tps)
+          <option value="$tp.getPk()">$tp.getName()
+            #end
+        </select><BR>
+
+        Apache Pool:
+        #set ($aps = $view.getApachePools())
+        #if ($hp.getApachePool())
+        #if ($aps.remove($hp.getApachePool()))
+
+        #end
+        #end
+        <select name=apachePoolId>
+          <option value="$!{hp.getApachePool().getPk()}">$!{hp.getApachePool().getName()}
+            #foreach ($ap in $aps)
+          <option value="$ap.getPk()">$ap.getName()
+            #end
+        </select><BR>
+
+        #set ($envs = $view.getEnvironments())
+        #if($hp.getEnv())
+        #if($envs.remove($hp.getEnv()))
+
+        #end
+        #end
+        Environment: <select name=envId>
+        <option value="$!{hp.getEnv().getPk()}">$!{hp.getEnv().getName()}
+          #foreach ($env in $envs)
+        <option value="$env.getPk()">$env.getName()
+          #end
+      </select><br>
+
+        <input type="submit" value="Update">
+
+      </form>
+      #else
+      Hosting Pool:
+      #set ($hps = $view.getHostingPools())
+      <select name=hostingPoolId onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($hp in $hps)
+        <option value="$appRoot/Core/Pool/update.vm?id=$hp.getPk()">$hp.getName()
+          #end
+      </select><BR>
+      #end
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm Wed Jul  5 14:11:29 2006
@@ -20,43 +20,43 @@
 #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>Hosting Pool</b>
-  </td>
-</tr>
-</table>
-<br />
-
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#end
-
-<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/Core/Pool/viewapacheconf.vm?id=$aw.getPk()">$aw.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=3>Infrastructure - <b>Hosting Pool</b>
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    #if ($request.getParameter("id"))
+    #set ($id = $request.getParameter("id"))
+    #end
+
+    <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/Core/Pool/viewapacheconf.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/Core/Pool/viewapacheprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm Wed Jul  5 14:11:29 2006
@@ -20,43 +20,43 @@
 #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>Hosting Pool</b>
-  </td>
-</tr>
-</table>
-<br />
-
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#end
-
-<div class="messagebox">
-
-#if ($id)
-#set ($apacheWorker = $view.getApacheWorker($id))
-
-<TextArea cols="90" readonly rows="30">$!{apacheWorker.buildWorkersPropertiesForWeb()}</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/Core/Pool/viewapacheprop.vm?id=$aw.getPk()">$aw.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=3>Infrastructure - <b>Hosting Pool</b>
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    #if ($request.getParameter("id"))
+    #set ($id = $request.getParameter("id"))
+    #end
+
+    <div class="messagebox">
+
+      #if ($id)
+      #set ($apacheWorker = $view.getApacheWorker($id))
+
+      <TextArea cols="90" readonly rows="30">$!{apacheWorker.buildWorkersPropertiesForWeb()}</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/Core/Pool/viewapacheprop.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/Core/Pool/viewserverxml.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm Wed Jul  5 14:11:29 2006
@@ -20,38 +20,38 @@
 #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>Hosting Pool</b>
-  </TD>
-</TR>
-</table>
-<br>
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#end
-<div class="messagebox">
-#if ($id)
-#set ($tomcatWorker = $view.getTomcatWorker($id))
+  <div class="projectbox">
+    <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+      <TR CLASS="info" valign="top">
+        <TD colspan=3>Infrastructure - <b>Hosting Pool</b>
+        </TD>
+      </TR>
+    </table>
+    <br>
+    #if ($request.getParameter("id"))
+    #set ($id = $request.getParameter("id"))
+    #end
+    <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/Core/Pool/viewserverxml.vm?id=$tw.getPk()">$tw.getName()
-              			      #end
-              			      </select><BR>
-#end
-</div>
-<br />
-</div>
-<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/Core/Pool/viewserverxml.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/Core/Project/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm Wed Jul  5 14:11:29 2006
@@ -22,27 +22,26 @@
 #parse("/Core/Project/availtemplates.vm")
 
 
-
 <div id="bigright">
-<div class="messagebox">
+  <div class="messagebox">
 
 
-<form name="Form" method="post" action='$link.setAction("administration/ProjectAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="name" name="name" value="$!{name}">
-</td>
-</tr>
-</table>
-<input type="hidden" id="parentProjectId" name="parentProjectId" value="$!{parentProjectId}">
-<input type="hidden" name="methodToCall" value="AddProject">
-<input type="submit" value="submit">
-</form>
-</div>
+    <form name="Form" method="post" action='$link.setAction("administration/ProjectAction")'>
+      <table>
+        <tr>
+          <td>
+            Name:
+          </td>
+          <td>
+            <input type="text" id="name" name="name" value="$!{name}">
+          </td>
+        </tr>
+      </table>
+      <input type="hidden" id="parentProjectId" name="parentProjectId" value="$!{parentProjectId}">
+      <input type="hidden" name="methodToCall" value="AddProject">
+      <input type="submit" value="submit">
+    </form>
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm Wed Jul  5 14:11:29 2006
@@ -16,12 +16,12 @@
 ## $Id$
 ##
 <div id="left">
-<div class="messagebox" align="left">
-Available Templates:<br />
-<a href="$appRoot/Template/addVhost.vm">Generic VirtualHost</a><br />
-<a href="$appRoot/Template/addInternetProject.vm">DMZ Project</a><br />
-<a href="$appRoot/Template/addsite.vm">Add Intranet Site</a><br />
-<br /><br /><br />
-</div>
+  <div class="messagebox" align="left">
+    Available Templates:<br/>
+    <a href="$appRoot/Template/addVhost.vm">Generic VirtualHost</a><br/>
+    <a href="$appRoot/Template/addInternetProject.vm">DMZ Project</a><br/>
+    <a href="$appRoot/Template/addsite.vm">Add Intranet Site</a><br/>
+    <br/><br/><br/>
+  </div>
 </div>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm Wed Jul  5 14:11:29 2006
@@ -19,48 +19,48 @@
 #set ($pageSelected = "Administration")
 #parse("/layout/header.vm")
 <div id="center">
-<div class="messagebox">
+  <div class="messagebox">
 
-#set ($projectId = $request.getParameter("project"))
-#set($actionLink = "administration/project/Delete")
-#set($methodToCall = "DeleteProject")
-#set($buttonName = "Delete")
-#set ($function = "DeleteProject")
-##parse("Core/project/list.vm")
+    #set ($projectId = $request.getParameter("project"))
+    #set($actionLink = "administration/project/Delete")
+    #set($methodToCall = "DeleteProject")
+    #set($buttonName = "Delete")
+    #set ($function = "DeleteProject")
+    ##parse("Core/project/list.vm")
 
-##set ($id = $request.getParameter("id"))
-#set($project = $User.getProject($projectId))
+    ##set ($id = $request.getParameter("id"))
+    #set($project = $User.getProject($projectId))
 
 
-#if ($User.isAllowed($function) && $methodToCall == "DeleteProject")
+    #if ($User.isAllowed($function) && $methodToCall == "DeleteProject")
 
 
-<table>
-<tr>
+    <table>
+      <tr>
 
 
-Are you sure you want to delete $!{project.getName()}
-<br>
-<br>
-	<td valign="middle">
-		<form action="javascript:history.go(-1)" method="post">
-		#submit_button("submit" "< Back" "button" "")
-		</form>
-	</td>
-	<td valign="middle">
-		<form method="post" action='$link.setAction("administration/Project/Delete")' method="post">
-		<input type="hidden" name="id" value="$!{projectId}">
-		<input type="hidden" name="methodToCall" value="DeleteProject">
-		#submit_button("Submit" "Delete" "button" "")
-		</form>
-	</td>
+        Are you sure you want to delete $!{project.getName()}
+        <br>
+        <br>
+        <td valign="middle">
+          <form action="javascript:history.go(-1)" method="post">
+            #submit_button("submit" "<Back" "button" "")
+          </form>
+        </td>
+        <td valign="middle">
+          <form method="post" action='$link.setAction("administration/Project/Delete")' method="post">
+            <input type="hidden" name="id" value="$!{projectId}">
+            <input type="hidden" name="methodToCall" value="DeleteProject">
+            #submit_button("Submit" "Delete" "button" "")
+          </form>
+        </td>
 
-</tr>
+      </tr>
 
-</table>
-#end
+    </table>
+    #end
 
-</div>
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm Wed Jul  5 14:11:29 2006
@@ -26,7 +26,7 @@
 #end
 #end
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
 <!--
 $project
 -->
@@ -34,265 +34,274 @@
 #set($vhosts = $project.getVirtualHosts())
 #set($projectContexts = $project.getTomcatContexts())
 
-<br />
+<br/>
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Project - <b>$!{project.getName()}</b> &nbsp;
-	 #foreach ($env in $project.getEnvs())
-		<a class="info" href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()&e=$env.getPk()">$env.getName()</a> &nbsp;
-		#end
-		<a class="info" href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()">All</a> &nbsp;
-  </td> 
-	<td colspan="2" align="right">
-#if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId) || $User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId) || $User.isAllowed("DeleteProject", $projectId))
-	    <select name=methodToCall onchange='OnChange(this);'>
-       	      <option value="" selected>Select Action</option>
-#if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId))
-              <option value="$appRoot/Template/addVhost.vm?project=$projectId">Add a VirtualHost</option>
-#end
-#if ($User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId))
-              <option value="$appRoot/Core/User/addToProject.vm?project=$projectId">Add a User</option>
-#end
-#if ($User.isAllowed("DeleteProject", $projectId))
-              <option value="$appRoot/Core/Project/delete.vm?project=$projectId">Delete this Project</option>
-#end
-            </select>
-#end
-             </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan=3>Project - <b>$!{project.getName()}</b> &nbsp;
+      #foreach ($env in $project.getEnvs())
+      <a class="info"
+         href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()&e=$env.getPk()">$env.getName()</a> &nbsp;
+      #end
+      <a class="info" href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()">All</a> &nbsp;
+    </td>
+    <td colspan="2" align="right">
+      #if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId) ||
+      $User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId) ||
+      $User.isAllowed("DeleteProject", $projectId))
+      <select name=methodToCall onchange='OnChange(this);'>
+        <option value="" selected>Select Action</option>
+        #if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId))
+        <option value="$appRoot/Template/addVhost.vm?project=$projectId">Add a VirtualHost</option>
+        #end
+        #if ($User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId))
+        <option value="$appRoot/Core/User/addToProject.vm?project=$projectId">Add a User</option>
+        #end
+        #if ($User.isAllowed("DeleteProject", $projectId))
+        <option value="$appRoot/Core/Project/delete.vm?project=$projectId">Delete this Project</option>
+        #end
+      </select>
+      #end
+    </td>
+  </tr>
 </table>
 <br>
 #set($c = 1)
 #if( $vhosts && ! $vhosts.isEmpty())
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
-	<td align="left" valign="center" colspan=4 >
-	  Apache - Tomcat applications
-	</b>
-	</td>
-  </tr>
-        <tr class="info">
-      <td width=25%> Virtual Host </td>
-      <td width=10%> Context </td>
-      <td width=27%> Pool </td>
-      <td width=26%>  </td>
-      </tr>
-	#foreach ($vhost in $vhosts)
-  	#if (!$envId || $vhost.getEnvId().toString() == $envId)
-			<tr class="headercolor$c">
-			<td><a href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}&p=$projectId">$!{vhost.getName()}</a></td>
-			#set($ap = $vhost.getApachePool())
-			<td> &nbsp; </td>
-			<td><a href="$appRoot/Apache/Pool/view.vm?id=$!{ap.getPk()}">$!{ap.getName()}</a></td>
-			<td align="right">
-      #if ($User.isAllowed("AddContext", $projectId) || $User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId) || $User.isAllowed("DeleteVirtualHost", $projectId, $vhost) || $User.isAllowed("ViewVirtualHost", $projectId, $vhost) || $User.isAllowed("UpdateVirtualHost", $projectId, $vhost))
-	      <select name=methodToCall onchange='OnChange(this);'>
-       	<option value="" selected>Select Action</option>
-        #if ($User.isAllowed("AddContext", $projectId))
-          <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}&projectId=$projectId">Add a context</option>
-          <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}&p=$projectId">Add an existing context</option>
-        #end
-        #if ($User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId))
-          <option value="$appRoot/Core/User/addToProject.vm?project=$projectId">Add a User</option>
-        #end
-        <!-- $User.isAllowed("DeleteVirtualHost", $projectId, $vhost) -->
-        #if ($User.isAllowed("DeleteVirtualHost", $projectId, $vhost))
-          <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost</option>
-        #end
-        #if ($User.isAllowed("UpdateVirtualHost", $projectId, $vhost))
-          <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}&p=$projectId">Modify this Vhost</option>
-        #end
-        #if ($User.isAllowed("ViewVirtualHost", $projectId, $vhost))
-          <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost</option>
-        #end
-        </select>
+    <td align="left" valign="center" colspan=4>
+      Apache - Tomcat applications
+    </b>
+  </td>
+</tr>
+<tr class="info">
+  <td width=25%> Virtual Host </td>
+  <td width=10%> Context </td>
+  <td width=27%> Pool </td>
+  <td width=26%></td>
+</tr>
+#foreach ($vhost in $vhosts)
+#if (!$envId || $vhost.getEnvId().toString() == $envId)
+<tr class="headercolor$c">
+  <td><a href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}&p=$projectId">$!{vhost.getName()}</a></td>
+  #set($ap = $vhost.getApachePool())
+  <td> &nbsp; </td>
+  <td><a href="$appRoot/Apache/Pool/view.vm?id=$!{ap.getPk()}">$!{ap.getName()}</a></td>
+  <td align="right">
+    #if ($User.isAllowed("AddContext", $projectId) || $User.isAllowed("AddUser", $projectId) ||
+    $User.isAllowed("AddUserToProject", $projectId) || $User.isAllowed("DeleteVirtualHost", $projectId, $vhost) ||
+    $User.isAllowed("ViewVirtualHost", $projectId, $vhost) || $User.isAllowed("UpdateVirtualHost", $projectId, $vhost))
+    <select name=methodToCall onchange='OnChange(this);'>
+      <option value="" selected>Select Action</option>
+      #if ($User.isAllowed("AddContext", $projectId))
+      <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}&projectId=$projectId">Add a context</option>
+      <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}&p=$projectId">Add an existing
+        context</option>
       #end
-			</td>
-		  </tr>
-    	#set ($contexts = $vhost.getContexts())
-      #if( $contexts && ! $contexts.isEmpty())
-        #set($cc = 1)
-  	    #foreach ($context in $contexts)
-  	      <!-- $projectContexts.remove($context) -->
-  	      #if($User.isAllowed("ViewContext",$projectId, $context) || $User.isAllowed("ReloadContext",$projectId, $context) || $User.isAllowed("StopContext",$projectId, $context) || $User.isAllowed("StartContext",$projectId, $context) || $User.isAllowed("UpdateContext",$projectId, $context) || $User.isAllowed("DeleteContext",$projectId, $context) || $User.isAllowed("UndeployContext",$projectId, $context) || $User.isAllowed("RedeployContext",$projectId, $context) || $User.isAllowed("InstallContext",$projectId, $context) || $User.isAllowed("ListContext",$projectId, $context) || $User.isAllowed("SessionsOfContext",$projectId, $context) || $User.isAllowed("StatusOfContext",$projectId, $context))
-  			  #set ($tomcatPool = $context.getTomcatPool())
-  			  #if (!$context.hasTomcatPool())
-  			    <tr class="headercolor$c">
-  			    <td> &nbsp; </td>
-  			    <td><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()} </td>
-      			<td colspan=2> Not assigned to a Pool</td><td> </td></tr>
-  			  #else
-  			    <tr class="headercolor$c">
-  			    <td> &nbsp; </td>
-  			    <td class="bodycolor$c$cc"><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId"> $!{context.getName()} </td>
-    	      <td class="bodycolor$c$cc">
-    	      <a href="$appRoot/Tomcat/Pool/view.vm?id=$!{tomcatPool.getPk()}">$!{tomcatPool.getName()} </a><br>
-    	      </td>
-				    <td align="right" class="bodycolor$c$cc">
-				    <!-- before macro -->
-				    <!-- $context -->
-				    <!-- start macro -->
-  			    #contextDropBox($User $project $context $vhost)
-  				  </td>
-  			    #end
-  		 	  </tr>
-  		 	  #end
-  	#if ($cc == 1)
-      #set($cc=2)
-    #else
-      #set($cc=1)
-    #end
-  	    #end ##of all contexts
-  	  #end ##of env if
-    #end 	## of all vhosts
-    #if ($c == 1)
-      #set($c=2)
-    #else
-      #set($c=1)
+      #if ($User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId))
+      <option value="$appRoot/Core/User/addToProject.vm?project=$projectId">Add a User</option>
+      #end
+      <!-- $User.isAllowed("DeleteVirtualHost", $projectId, $vhost) -->
+      #if ($User.isAllowed("DeleteVirtualHost", $projectId, $vhost))
+      <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost</option>
+      #end
+      #if ($User.isAllowed("UpdateVirtualHost", $projectId, $vhost))
+      <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}&p=$projectId">Modify this Vhost</option>
+      #end
+      #if ($User.isAllowed("ViewVirtualHost", $projectId, $vhost))
+      <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost</option>
+      #end
+    </select>
     #end
+  </td>
+</tr>
+#set ($contexts = $vhost.getContexts())
+#if( $contexts && ! $contexts.isEmpty())
+#set($cc = 1)
+#foreach ($context in $contexts)
+<!-- $projectContexts.remove($context) -->
+#if($User.isAllowed("ViewContext",$projectId, $context) || $User.isAllowed("ReloadContext",$projectId, $context) ||
+$User.isAllowed("StopContext",$projectId, $context) || $User.isAllowed("StartContext",$projectId, $context) ||
+$User.isAllowed("UpdateContext",$projectId, $context) || $User.isAllowed("DeleteContext",$projectId, $context) ||
+$User.isAllowed("UndeployContext",$projectId, $context) || $User.isAllowed("RedeployContext",$projectId, $context) ||
+$User.isAllowed("InstallContext",$projectId, $context) || $User.isAllowed("ListContext",$projectId, $context) ||
+$User.isAllowed("SessionsOfContext",$projectId, $context) || $User.isAllowed("StatusOfContext",$projectId, $context))
+#set ($tomcatPool = $context.getTomcatPool())
+#if (!$context.hasTomcatPool())
+<tr class="headercolor$c">
+  <td> &nbsp; </td>
+  <td><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()}</td>
+  <td colspan=2> Not assigned to a Pool</td><td></td></tr>
+#else
+<tr class="headercolor$c">
+  <td> &nbsp; </td>
+  <td class="bodycolor$c$cc"><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId">
+    $!{context.getName()}</td>
+  <td class="bodycolor$c$cc">
+    <a href="$appRoot/Tomcat/Pool/view.vm?id=$!{tomcatPool.getPk()}">$!{tomcatPool.getName()} </a><br>
+  </td>
+  <td align="right" class="bodycolor$c$cc">
+    <!-- before macro -->
+    <!-- $context -->
+    <!-- start macro -->
+    #contextDropBox($User $project $context $vhost)
+  </td>
   #end
-#end 	## end of IF VHOST.
+</tr>
+#end
+#if ($cc == 1)
+#set($cc=2)
+#else
+#set($cc=1)
+#end
+#end ##of all contexts
+#end ##of env if
+#end ## of all vhosts
+#if ($c == 1)
+#set($c=2)
+#else
+#set($c=1)
+#end
+#end
+#end ## end of IF VHOST.
 </TABLE>
 <br>
 #set ($temp = $projectContexts.clone())
 #foreach ($context in $temp)
-  #if($envId && $context.getEnvId().toString() != $envId)
-    <!-- $projectContexts.remove($context) -->
-  #end
+#if($envId && $context.getEnvId().toString() != $envId)
+<!-- $projectContexts.remove($context) -->
+#end
 #end
 #if( $projectContexts && ! $projectContexts.isEmpty())
-  <TABLE WIDTH="95%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+<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%> Worker </th>
-  <th width=30%>  </th>
-  </tr>
-  #set($c = 1)
-	#foreach ($context in $projectContexts)
-		#set ($count = 1)
-		#set ($tomcatPool = $context.getTomcatPool())
-		#if (!$context.hasTomcatPool())
-			<tr class="headercolor$c">
-			<td><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId"> $!{context.getName()} </td>
-    	<td> $!{context.getEnv().getName()} </td>
-			<td> Not assigned to a Pool</td><td> </td></tr>
-		#else
-    	<tr class="headercolor$c">
-		  <td><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId"> $!{context.getName()} </td>
-    	<td> $!{context.getEnv().getName()} </td>
-		#end
-		<td>
-		#foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
-		  <a href="$appRoot/Tomcat/Worker/view.vm?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
-		#end
-		</td>
-		<td align="right">
-		<!-- before macro -->
-		<!-- $context -->
-		<!-- start macro -->
-		#contextDropBoxWOvhost($User $project $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
-#end 	## of all contexts
+  <th width=30%></th>
+</tr>
+#set($c = 1)
+#foreach ($context in $projectContexts)
+#set ($count = 1)
+#set ($tomcatPool = $context.getTomcatPool())
+#if (!$context.hasTomcatPool())
+<tr class="headercolor$c">
+  <td><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId"> $!{context.getName()}</td>
+  <td> $!{context.getEnv().getName()} </td>
+  <td> Not assigned to a Pool</td><td></td></tr>
+#else
+<tr class="headercolor$c">
+  <td><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId"> $!{context.getName()}</td>
+  <td> $!{context.getEnv().getName()} </td>
+  #end
+  <td>
+    #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
+    <a href="$appRoot/Tomcat/Worker/view.vm?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
+    #end
+  </td>
+  <td align="right">
+    <!-- before macro -->
+    <!-- $context -->
+    <!-- start macro -->
+    #contextDropBoxWOvhost($User $project $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
+#end ## of all contexts
 </table>
 <br>
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
-<!-- Jobs -->
-#set ($jobpool = $project.getJobPools())
-<tr height="15" class="info">
-<td align="left" valign="center" colspan=5 >
-Recent Jobs
-</td>
-</tr>
-<tr class="info">
-<td> User </td>
-<td> Action </td>
-<td> Time </td>
-<td> Status </td>
-</tr>
-#if(! $jobpool || $jobpool.isEmpty())
+  <!-- Jobs -->
+  #set ($jobpool = $project.getJobPools())
+  <tr height="15" class="info">
+    <td align="left" valign="center" colspan=5>
+      Recent Jobs
+    </td>
+  </tr>
+  <tr class="info">
+    <td> User </td>
+    <td> Action </td>
+    <td> Time </td>
+    <td> Status </td>
+  </tr>
+  #if(! $jobpool || $jobpool.isEmpty())
   <tr class="headercolor1">
-  <td colspan=4> No jobs for this project</td>
+    <td colspan=4> No jobs for this project</td>
   </tr>
-#else
-#set($c = 1)
-	#foreach($job in $jobpool)
-		<tr class="headercolor$c">
-		<td > $!{job.getUser().getFullName()} </td>
-		<td > $job.getFunction().getName() </td>
-		<td > $job.getStartTime() </td>
-		<td > <a href="$appRoot/Core/JobPool/details.vm?Id=$job.getPk()" color="$job.getState().getColor()" style="text-decoration:underline">Details <!--$job.getState().getName()--></a>
-		</td>
-		</tr>
-        #if ($c == 1)
-          #set($c=2)
-        #else
-          #set($c=1)
-        #end
-	#end
-#end
+  #else
+  #set($c = 1)
+  #foreach($job in $jobpool)
+  <tr class="headercolor$c">
+    <td> $!{job.getUser().getFullName()} </td>
+    <td> $job.getFunction().getName() </td>
+    <td> $job.getStartTime() </td>
+    <td><a href="$appRoot/Core/JobPool/details.vm?Id=$job.getPk()" color="$job.getState().getColor()"
+           style="text-decoration:underline">Details <!--$job.getState().getName()--></a>
+    </td>
+  </tr>
+  #if ($c == 1)
+  #set($c=2)
+  #else
+  #set($c=1)
+  #end
+  #end
+  #end
 </table>
 <br>
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
-<!-- Jobs -->
-	#set ($users = $project.getUsers())
+  <!-- Jobs -->
+  #set ($users = $project.getUsers())
   <tr height="15" class="info">
-  	<td align="left" valign="center" colspan=5 >
-  	Users
-  	</td>
+    <td align="left" valign="center" colspan=5>
+      Users
+    </td>
   </tr>
   <tr class="info">
-          <td> User Name </td>
-          <td> First Name </td>
-          <td> Last Name </td>
+    <td> User Name </td>
+    <td> First Name </td>
+    <td> Last Name </td>
   </tr>
   #if(! $users || $users.isEmpty())
-  	<tr class="headercolor1">
-  		<td colspan=3> No users assigned to this project</td>
-  	</tr>
+  <tr class="headercolor1">
+    <td colspan=3> No users assigned to this project</td>
+  </tr>
   #else
   #set($c = 1)
   #foreach($u in $users)
-		<tr class="headercolor$c">
-		<td > $!{u.getName()} </td>
-		<td > $!{u.getFirstName()} </td>
-		<td > $!{u.getLastName()} </td>
-		</td>
-		</tr>
-        #if ($c == 1)
-          #set($c=2)
-        #else
-          #set($c=1)
-        #end
-  #end
-  #end
+  <tr class="headercolor$c">
+    <td> $!{u.getName()} </td>
+    <td> $!{u.getFirstName()} </td>
+    <td> $!{u.getLastName()} </td>
+  </td>
+</tr>
+#if ($c == 1)
+#set($c=2)
+#else
+#set($c=1)
+#end
+#end
+#end
 </table>
 
 
-
-
-
-
 </form>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm Wed Jul  5 14:11:29 2006
@@ -19,37 +19,38 @@
 #set ($letter = $request.getParameter("Letter"))
 #end
 #if($letter)
-  #if($letter.equals("all"))
-	#set ($recentProjects = $User.getVisibleProjects())
-	#elseif($letter.equals("Last5"))
-	#set ($recentProjects = $User.getRecentProjects())
-	#else
-	#set ($recentProjects = $User.getProjects($letter))
-	#end
+#if($letter.equals("all"))
+#set ($recentProjects = $User.getVisibleProjects())
+#elseif($letter.equals("Last5"))
+#set ($recentProjects = $User.getRecentProjects())
 #else
-	#set ($recentProjects = $User.getRecentProjects())
+#set ($recentProjects = $User.getProjects($letter))
+#end
+#else
+#set ($recentProjects = $User.getRecentProjects())
 #end
 #set ($menu = "/layout/menu/ProjectTop.vm")
 #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">
-#if ($letter && $letter != "Last5")
-<td colspan=3>Projects - <b>$letter</b></td> 
-#else
-<td colspan=3>Projects - <b>Last 10</b></td> 
-#end
-<td colspan="2" align="right"> </td>
-</tr>
-</table>
-<br />
-#set($projectsInCallingVm = $recentProjects)
-#parse("/Core/Project/list.vm")
-<br />
-</div>
-<br />
+  <br/><br/>
+
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        #if ($letter && $letter != "Last5")
+        <td colspan=3>Projects - <b>$letter</b></td>
+        #else
+        <td colspan=3>Projects - <b>Last 10</b></td>
+        #end
+        <td colspan="2" align="right"></td>
+      </tr>
+    </table>
+    <br/>
+    #set($projectsInCallingVm = $recentProjects)
+    #parse("/Core/Project/list.vm")
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/list.vm Wed Jul  5 14:11:29 2006
@@ -16,33 +16,34 @@
 ## $Id$
 ##
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info"><td width="50%" >Project</td><td width="50%" >Environment</td></tr>
-#set($c = 1)
-#if((! $projectsInCallingVm) || $projectsInCallingVm.isEmpty())
-<tr class="headercolor$c"><td colspan=2>
-	#if($letter == "all") No projects
-	#elseif ($letter == "Last5") No Recent Projects
-	#elseif ($letter == "Search") No Projects found
-	#elseif ($letter) No Projects starting with <b> $letter </b>
-	#else No Projects
-	#end
-	</td></tr>
-#else
+  <tr class="info"><td width="50%">Project</td><td width="50%">Environment</td></tr>
+  #set($c = 1)
+  #if((! $projectsInCallingVm) || $projectsInCallingVm.isEmpty())
+  <tr class="headercolor$c"><td colspan=2>
+    #if($letter == "all") No projects
+    #elseif ($letter == "Last5") No Recent Projects
+    #elseif ($letter == "Search") No Projects found
+    #elseif ($letter) No Projects starting with <b> $letter </b>
+    #else No Projects
+    #end
+  </td></tr>
+  #else
   #foreach( $project in $projectsInCallingVm )
-    <tr class="headercolor$c">
+  <tr class="headercolor$c">
     <td><a href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()" class="blue"> $project.getName() </a></td>
-    <td> 
-    #foreach ($env in $project.getEnvs())
-      <a href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()&e=$env.getPk()" class="blue">$env.getName()</a> &nbsp;
-    #end
+    <td>
+      #foreach ($env in $project.getEnvs())
+      <a href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()&e=$env.getPk()"
+         class="blue">$env.getName()</a> &nbsp;
+      #end
     </td>
-    </tr>
-    #if ($c == 1)
-      #set($c=2)
-    #else
-      #set($c=1)
-    #end
+  </tr>
+  #if ($c == 1)
+  #set($c=2)
+  #else
+  #set($c=1)
+  #end
+  #end
   #end
-#end
 </table>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm Wed Jul  5 14:11:29 2006
@@ -22,67 +22,69 @@
 
 
 <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>Projects - <b>Search</b></td> 
-<td colspan="2" align="right"> </td>
-</tr>
-</table>
-<br />
-#if ($name)
-<div class="messagebox" width="75%" align="center">
-<br />
-<form name="Form1" method="post" action='$appRoot/Core/Project/search.vm'>
-
-Project name <select name=type>
-			      <option value="beginsWith">Begins With</option>
-			      <option value="contains">Contains</option>
-			      <option value="endsWith">Ends With</option>
-			      <option value="isExactly">is Exactly</option>
-			      </select> <input type="text" id="name" name="name" value="$!{name}"><br />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
-<br />
-#if ($type == "beginsWith")
-#set($projectsInCallingVm = $view.getProjectBeginsWith($name))
-#elseif ($type == "endsWith")
-#set($projectsInCallingVm = $view.getProjectEndsWith($name))
-#elseif ($type == "contains")
-#set($projectsInCallingVm = $view.getProjectContains($name))
-#else
-#set($projectsInCallingVm = $view.getProjectByName($name))
-#end
-#parse("/Core/Project/list.vm")
-</table>
-<br />
-#end
-
-
-<div class="messagebox" width="75%" align="center">
-<br />
-#if ($name)
-<form name="Form2" method="post" action='$appRoot/Core/Project/search.vm'>
-#else
-<form name="Form1" method="post" action='$appRoot/Core/Project/search.vm'>
-#end
-Project name <select name=type>
-			      <option value="beginsWith">Begins With</option>
-			      <option value="contains">Contains</option>
-			      <option value="endsWith">Ends With</option>
-			      <option value="isExactly">is Exactly</option>
-			      </select> <input type="text" id="name" name="name" value="$!{name}"><br />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
+  <br/><br/>
 
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Projects - <b>Search</b></td>
+        <td colspan="2" align="right"></td>
+      </tr>
+    </table>
+    <br/>
+    #if ($name)
+    <div class="messagebox" width="75%" align="center">
+      <br/>
+
+      <form name="Form1" method="post" action='$appRoot/Core/Project/search.vm'>
+
+        Project name <select name=type>
+        <option value="beginsWith">Begins With</option>
+        <option value="contains">Contains</option>
+        <option value="endsWith">Ends With</option>
+        <option value="isExactly">is Exactly</option>
+      </select> <input type="text" id="name" name="name" value="$!{name}"><br/>
+
+        <input type="submit" value="Search">
+      </form>
+      <br/>
+    </div>
+    <br/>
+    #if ($type == "beginsWith")
+    #set($projectsInCallingVm = $view.getProjectBeginsWith($name))
+    #elseif ($type == "endsWith")
+    #set($projectsInCallingVm = $view.getProjectEndsWith($name))
+    #elseif ($type == "contains")
+    #set($projectsInCallingVm = $view.getProjectContains($name))
+    #else
+    #set($projectsInCallingVm = $view.getProjectByName($name))
+    #end
+    #parse("/Core/Project/list.vm")
+  </table>
+  <br/>
+  #end
+
+
+  <div class="messagebox" width="75%" align="center">
+    <br/>
+    #if ($name)
+    <form name="Form2" method="post" action='$appRoot/Core/Project/search.vm'>
+      #else
+      <form name="Form1" method="post" action='$appRoot/Core/Project/search.vm'>
+        #end
+        Project name <select name=type>
+        <option value="beginsWith">Begins With</option>
+        <option value="contains">Contains</option>
+        <option value="endsWith">Ends With</option>
+        <option value="isExactly">is Exactly</option>
+      </select> <input type="text" id="name" name="name" value="$!{name}"><br/>
+
+        <input type="submit" value="Search">
+      </form>
+      <br/>
+  </div>
+
+  <br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm Wed Jul  5 14:11:29 2006
@@ -21,21 +21,22 @@
 #end
 #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>My Projects</td> 
-<td colspan="2" align="right"> </td>
-</tr>
-</table>
-<br />
-##get the user's projects
-#set ($projectsInCallingVm = $User.getProjects())
-#parse("/Core/Project/list.vm")
-<br />
-</div>
-<br />
+  <br/><br/>
+
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>My Projects</td>
+        <td colspan="2" align="right"></td>
+      </tr>
+    </table>
+    <br/>
+    ##get the user's projects
+    #set ($projectsInCallingVm = $User.getProjects())
+    #parse("/Core/Project/list.vm")
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm Wed Jul  5 14:11:29 2006
@@ -19,112 +19,113 @@
 #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 Pool</b>
-  </TD>
-</TR>
+  <TR CLASS="info" valign="top">
+    <TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
+    </TD>
+  </TR>
 </table>
 <br>
+
 <div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/HardwareAction")'>
-<table>
-<tr>
-<td>
-Hardware Name:
-</td>
-<td>
-<input type="text" id="hardwareName" name="hardwareName" value="$!{hardwareName}">
-</td>
-</tr>
-<tr>
-<td>
-Physical Location:
-</td>
-<td>
-<input type="text" id="physicalLocation" name="physicalLocation" value="$!{physicalLocation}">
-</td>
-</tr>
-<tr>
-<td>
-Comments:
-</td>
-<td>
-<input type="text" id="comments" name="comments" value="$!{comments}">
-</td>
-</tr>
-<tr>
-<td>
-Instance:
-</td>
-<td>
-#set ($insts = $view.getInstances())
-#if($hardware.getInstance())
-#if($insts.remove($hardware.getInstance()))
+  <form name="Form" method="post" action='$link.setAction("administration/HardwareAction")'>
+    <table>
+      <tr>
+        <td>
+          Hardware Name:
+        </td>
+        <td>
+          <input type="text" id="hardwareName" name="hardwareName" value="$!{hardwareName}">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Physical Location:
+        </td>
+        <td>
+          <input type="text" id="physicalLocation" name="physicalLocation" value="$!{physicalLocation}">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Comments:
+        </td>
+        <td>
+          <input type="text" id="comments" name="comments" value="$!{comments}">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Instance:
+        </td>
+        <td>
+          #set ($insts = $view.getInstances())
+          #if($hardware.getInstance())
+          #if($insts.remove($hardware.getInstance()))
 
-#end
-#end
-<select name=instanceId>
-			      #foreach ($inst in $insts)
-			      <option value="$inst.getPk()">$inst.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-<tr>
-<td>
-Environment:
-</td>
-<td>
-#set ($envs = $view.getEnvironments())
-#if($hardware.getEnv())
-#if($envs.remove($hardware.getEnv()))
+          #end
+          #end
+          <select name=instanceId>
+            #foreach ($inst in $insts)
+            <option value="$inst.getPk()">$inst.getName()
+              #end
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Environment:
+        </td>
+        <td>
+          #set ($envs = $view.getEnvironments())
+          #if($hardware.getEnv())
+          #if($envs.remove($hardware.getEnv()))
 
-#end
-#end
+          #end
+          #end
 
-<select name=envId>
-			      #foreach ($env in $envs)
-			      <option value="$env.getPk()">$env.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-<tr>
-<td>
-Status: Active
-</td>
-<td>
-<input type="hidden" id="statusId" name="statusId" value="8">
-</td>
-</tr>
-<tr>
-<td>
-Default IP:
-</td>
-<td>
-<input type="text" name="defaultIp" value="$!{defaultIp}"><br>
-</td>
-</tr>
-<tr>
-<td>
-Additional IPs (comma separated):
-</td>
-<td>
-<input type="text" id="ips" name="ips" value="$!{ips}">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddHardware">
-<input type="submit" value="Add">
-</form>
+          <select name=envId>
+            #foreach ($env in $envs)
+            <option value="$env.getPk()">$env.getName()
+              #end
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Status: Active
+        </td>
+        <td>
+          <input type="hidden" id="statusId" name="statusId" value="8">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Default IP:
+        </td>
+        <td>
+          <input type="text" name="defaultIp" value="$!{defaultIp}"><br>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Additional IPs (comma separated):
+        </td>
+        <td>
+          <input type="text" id="ips" name="ips" value="$!{ips}">
+        </td>
+      </tr>
+    </table>
+    <input type="hidden" name="methodToCall" value="AddHardware">
+    <input type="submit" value="Add">
+  </form>
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm Wed Jul  5 14:11:29 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/Core/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm Wed Jul  5 14:11:29 2006
@@ -23,87 +23,87 @@
 #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>Hardware</b>
-  </td>
-  <td align="right">
-  #parse("/Core/Server/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-
-
-#if ($id)
-  #set ($hardware = $view.getHardware($id))
-  #set ($ent = $hardware)
-<table width="95%" border="0" cellspacing="0" cellpadding="1">
-  <tr height="15" class="info">
-	<td align="left" valign="center" colspan=2 >
-	  Hardware - $!{hardware.getName()}
-	</b>
-	</td>
-	<td align="right">
-#if ($ent)
-#parse("/Core/Server/menu/indiv.vm")
-#end
-</td></tr>
-
-
-
-<tr class="headercolor1"><td>Physical Location:</td><td>$!{hardware.getPhysicalLocation()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Environment:</td><td>$!{hardware.getEnv().getName()}</td><td> </td></tr>
-<tr class="headercolor1"><td>Instance:</td><td>$!{hardware.getInstance().getName()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Status:</td><td>$hardware.getStatus().getName()</td><td> </td></tr>
-<tr class="headercolor1"><td>Default Ip:</td><td>$!{hardware.getDefaultIp().getName()}</td><td> </td></tr>
-<tr class="headercolor2"><td>Additional Ips:</td><td> </td><td> </td></tr>
-#set ($ips = $hardware.getIpAddresses())
-#if($ips.remove($hardware.getDefaultIp()))
-<!-- ips.remove defaultIp succeded -->
-#end 
-#set ($c = 1)
-#foreach($ip in $ips)
-<tr class="headercolor2"><td> </td><td class="bodycolor2$c">$ip.getName()</td><td class="bodycolor2$c"> </td></tr>
-#if ($c == 1)
-  #set($c=2)
-#else
-  #set($c=1)
-#end
-#end
-<tr class="headercolor1"><td>Comments:</td><td>$!{hardware.getComments()}</td><td> </td></tr>
-</table>
-
-
-#set ($collection = $view.getApacheWorkers($hardware))
-#if( $collection && ! $collection.isEmpty())
-<br />
-#parse("/Apache/Worker/list.vm")
-#end 	## of all apaches
-
-#set ($collection = $view.getTomcatWorkers($hardware))
-#if( $collection && ! $collection.isEmpty())
-<br />
-#parse("/Tomcat/Worker/list.vm")
-#end 	## of all apaches
-
-#else
-<div class="messagebox">
-  Hardware:
-  #set ($hws = $view.getHardwares())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($hw in $hws)
-              			      <option value="$appRoot/Core/Server/details.vm?id=$hw.getPk()">$hw.getName()
-              			      #end
-              			      </select><BR>
-</div>
-#end
+  <br/><br/>
 
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Hardware</b>
+        </td>
+        <td align="right">
+          #parse("/Core/Server/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+
+    #if ($id)
+    #set ($hardware = $view.getHardware($id))
+    #set ($ent = $hardware)
+    <table width="95%" border="0" cellspacing="0" cellpadding="1">
+      <tr height="15" class="info">
+        <td align="left" valign="center" colspan=2>
+          Hardware - $!{hardware.getName()}
+        </b>
+      </td>
+      <td align="right">
+        #if ($ent)
+        #parse("/Core/Server/menu/indiv.vm")
+        #end
+      </td></tr>
+
+
+    <tr class="headercolor1"><td>Physical Location:</td><td>$!{hardware.getPhysicalLocation()}</td><td></td></tr>
+    <tr class="headercolor2"><td>Environment:</td><td>$!{hardware.getEnv().getName()}</td><td></td></tr>
+    <tr class="headercolor1"><td>Instance:</td><td>$!{hardware.getInstance().getName()}</td><td></td></tr>
+    <tr class="headercolor2"><td>Status:</td><td>$hardware.getStatus().getName()</td><td></td></tr>
+    <tr class="headercolor1"><td>Default Ip:</td><td>$!{hardware.getDefaultIp().getName()}</td><td></td></tr>
+    <tr class="headercolor2"><td>Additional Ips:</td><td></td><td></td></tr>
+    #set ($ips = $hardware.getIpAddresses())
+    #if($ips.remove($hardware.getDefaultIp()))
+    <!-- ips.remove defaultIp succeded -->
+    #end
+    #set ($c = 1)
+    #foreach($ip in $ips)
+    <tr class="headercolor2"><td></td><td class="bodycolor2$c">$ip.getName()</td><td class="bodycolor2$c"></td></tr>
+    #if ($c == 1)
+    #set($c=2)
+    #else
+    #set($c=1)
+    #end
+    #end
+    <tr class="headercolor1"><td>Comments:</td><td>$!{hardware.getComments()}</td><td></td></tr>
+  </table>
+
+
+  #set ($collection = $view.getApacheWorkers($hardware))
+  #if( $collection && ! $collection.isEmpty())
+  <br/>
+  #parse("/Apache/Worker/list.vm")
+  #end ## of all apaches
+
+  #set ($collection = $view.getTomcatWorkers($hardware))
+  #if( $collection && ! $collection.isEmpty())
+  <br/>
+  #parse("/Tomcat/Worker/list.vm")
+  #end ## of all apaches
+
+  #else
+  <div class="messagebox">
+    Hardware:
+    #set ($hws = $view.getHardwares())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($hw in $hws)
+      <option value="$appRoot/Core/Server/details.vm?id=$hw.getPk()">$hw.getName()
+        #end
+    </select><BR>
+  </div>
+  #end
 
-<br>
+
+  <br>
 
 
 </div>

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

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm Wed Jul  5 14:11:29 2006
@@ -22,39 +22,44 @@
 
 
 <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 - Server - <b>Search</b></td>
-<td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
-<option value="">Select one
-#parse("/Core/Server/menu/search.vm")
-</select></td>
-</tr>
-</table>
-##<td colspan="2" align="right"><a class="info" href="$appRoot/Core/Server/list.vm">View Hardware</a> &nbsp; <a class="info" href="$appRoot/Apache/Server/list.vm">View Apache</a> &nbsp; <a class="info" href="$appRoot/Tomcat/Server/list.vm">View Tomcat</a></td>
-##</tr>
-##</table>
-<br />
+  <br/><br/>
+
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - Server - <b>Search</b></td>
+        <td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
+          <option value="">Select one
+            #parse("/Core/Server/menu/search.vm")
+        </select></td>
+      </tr>
+    </table>
+    ##<td colspan="2" align="right"><a class="info" href="$appRoot/Core/Server/list.vm">View Hardware</a> &nbsp; <a
+      class="info" href="$appRoot/Apache/Server/list.vm">View Apache</a> &nbsp; <a class="info"
+                                                                                   href="$appRoot/Tomcat/Server/list.vm">View
+    Tomcat</a></td>
+    ##</tr>
+  ##</table>
+<br/>
 #if ($name && $type != "")
 <div class="messagebox" width="75%" align="center">
-<br />
-<form name="Form1" method="post" action='$appRoot/Core/Server/search.vm'>
+  <br/>
+
+  <form name="Form1" method="post" action='$appRoot/Core/Server/search.vm'>
+
+    Component <select name=type>
+    <option value="">Select one</option>
+    <option value="Hardware">Hardware</option>
+    <option value="Apache">Apache</option>
+    <option value="Tomcat">Tomcat</option>
+  </select>
+    <input type="text" id="name" name="name" value="$!{name}"><br/>
 
-Component <select name=type>
-<option value="">Select one</option>
-<option value="Hardware">Hardware</option>
-<option value="Apache">Apache</option>
-<option value="Tomcat">Tomcat</option>
-</select>
-<input type="text" id="name" name="name" value="$!{name}"><br />
-
-<input type="submit" value="Search">
-</form>
-<br />
+    <input type="submit" value="Search">
+  </form>
+  <br/>
 </div>
-<br />
+<br/>
 #if ($type == "HostingPool")
 #set($collection = $view.searchHostingPools($name))
 #set($path = "Core/Pool")
@@ -89,25 +94,25 @@
 #parse("$path/list.vm")
 #end
 <div class="messagebox" width="75%" align="center">
-<br />
-#if ($name && $type != "")
-<form name="Form2" method="post" action='$appRoot/Core/Server/search.vm'>
-#else
-<form name="Form1" method="post" action='$appRoot/Core/Server/search.vm'>
-#end
-Component <select name=type>
-<option value="">Select one</option>
-<option value="Hardware">Hardware</option>
-<option value="Apache">Apache</option>
-<option value="Tomcat">Tomcat</option>
-</select> <input type="text" id="name" name="name" value="$!{name}"><br />
-
-<input type="submit" value="Search">
-</form>
-<br />
+  <br/>
+  #if ($name && $type != "")
+  <form name="Form2" method="post" action='$appRoot/Core/Server/search.vm'>
+    #else
+    <form name="Form1" method="post" action='$appRoot/Core/Server/search.vm'>
+      #end
+      Component <select name=type>
+      <option value="">Select one</option>
+      <option value="Hardware">Hardware</option>
+      <option value="Apache">Apache</option>
+      <option value="Tomcat">Tomcat</option>
+    </select> <input type="text" id="name" name="name" value="$!{name}"><br/>
+
+      <input type="submit" value="Search">
+    </form>
+    <br/>
 </div>
 
-<br />
+<br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm Wed Jul  5 14:11:29 2006
@@ -19,32 +19,34 @@
 #set ($pageSelected = "Server")
 #parse("/layout/header.vm")
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Server/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
+  <!--
+  function OnChange(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Core/Server/update.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+  //-->
 </SCRIPT>
 
 <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>Hardware</b>
-  </td>
-  <td align="right">
-  #parse("Core/Server/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan="2">Infrastructure - <b>Hardware</b>
+    </td>
+    <td align="right">
+      #parse("Core/Server/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
+
 <div class="messagebox">
 #if ( $request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
@@ -55,75 +57,75 @@
 
 #if ($User.isAllowed("UpdateHardware") && $methodToCall == "UpdateHardware")
 <form name="Form" method="post" action='$link.setAction("administration/HardwareAction")'>
-<input type="hidden" id="hardwareId" name="hardwareId" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-Name: <input type="text" readonly name="hardwareName" value="$hardware.getServerName()"><br>
-Physical Location: <input type="text" name="physicalLocation" value="$!{hardware.getPhysicalLocation()}"><br>
-
-#set ($envs = $view.getEnvironments())
-#if($hardware.getEnv())
-#if($envs.remove($hardware.getEnv()))
-
-#end
-#end
-Environment: <select name=envId>
-			      <option value="$hardware.getEnv().getPk()">$hardware.getEnv().getName()
-			      #foreach ($env in $envs)
-			      <option value="$env.getPk()">$env.getName()</option>
-			      #end
-			      </select><br>
-
-#set ($insts = $view.getInstances())
-#if($hardware.getInstance())
-#if($insts.remove($hardware.getInstance()))
-
-#end
-#end
-Instance: <select name=instanceId>
-			      <option value="$hardware.getInstance().getPk()">$hardware.getInstance().getName()
-			      #foreach ($inst in $insts)
-			      <option value="$inst.getPk()">$inst.getName()</option>
-			      #end
-			      </select><br />
-
-Status: <select id="statusId" name="statusId">
-#if($hardware.getStatus().getPk() == 8)
-<option value="8" selected>Active</option>
-<option value="9">Inactive</option>
-#elseif($hardware.getStatus().getPk() == 9)
-<option value="8">Active</option>
-<option value="9" selected>Inactive</option>
-#else
-<option value="8">Active</option>
-<option value="9">Inactive</option>
-#end
-</select><br />
+  <input type="hidden" id="hardwareId" name="hardwareId" value="$!{id}">
+  <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
-#set ($ips = $view.getIps())
-#if($hardware.getDefaultIp())
-#if($ips.remove($hardware.getDefaultIp()))
+  Name: <input type="text" readonly name="hardwareName" value="$hardware.getServerName()"><br>
+  Physical Location: <input type="text" name="physicalLocation" value="$!{hardware.getPhysicalLocation()}"><br>
 
-#end
-#end
-Default Ip:<input type="text" id="defaultIp" name="defaultIp" value="$!{hardware.getDefaultIp().getName()}"><BR>
-Additional Ips (comma seperated):
-#set ($ips = $hardware.getIpAddresses())
-#if($ips.remove($hardware.getDefaultIp()))
-<!-- ips.remove defaultIp succeded -->
-#end
-#foreach($ip in $ips)
-#if ($additionalIps)
-#set($additionalIps="$additionalIps,$ip.getName()")
-#else
-#set($additionalIps="$ip.getName()")
-#end
-#end
-<input type="text" name="ips" value="$!{additionalIps}">
-<br>
-Comments: <input type="text" name="comments" value="$!{hardware.getComments()}"><br>
-<BR>
-<input type="submit" value="Update">
+  #set ($envs = $view.getEnvironments())
+  #if($hardware.getEnv())
+  #if($envs.remove($hardware.getEnv()))
+
+  #end
+  #end
+  Environment: <select name=envId>
+  <option value="$hardware.getEnv().getPk()">$hardware.getEnv().getName()
+    #foreach ($env in $envs)
+  <option value="$env.getPk()">$env.getName()</option>
+  #end
+</select><br>
+
+  #set ($insts = $view.getInstances())
+  #if($hardware.getInstance())
+  #if($insts.remove($hardware.getInstance()))
+
+  #end
+  #end
+  Instance: <select name=instanceId>
+  <option value="$hardware.getInstance().getPk()">$hardware.getInstance().getName()
+    #foreach ($inst in $insts)
+  <option value="$inst.getPk()">$inst.getName()</option>
+  #end
+</select><br/>
+
+  Status: <select id="statusId" name="statusId">
+  #if($hardware.getStatus().getPk() == 8)
+  <option value="8" selected>Active</option>
+  <option value="9">Inactive</option>
+  #elseif($hardware.getStatus().getPk() == 9)
+  <option value="8">Active</option>
+  <option value="9" selected>Inactive</option>
+  #else
+  <option value="8">Active</option>
+  <option value="9">Inactive</option>
+  #end
+</select><br/>
+
+  #set ($ips = $view.getIps())
+  #if($hardware.getDefaultIp())
+  #if($ips.remove($hardware.getDefaultIp()))
+
+  #end
+  #end
+  Default Ip:<input type="text" id="defaultIp" name="defaultIp" value="$!{hardware.getDefaultIp().getName()}"><BR>
+  Additional Ips (comma seperated):
+  #set ($ips = $hardware.getIpAddresses())
+  #if($ips.remove($hardware.getDefaultIp()))
+  <!-- ips.remove defaultIp succeded -->
+  #end
+  #foreach($ip in $ips)
+  #if ($additionalIps)
+  #set($additionalIps="$additionalIps,$ip.getName()")
+  #else
+  #set($additionalIps="$ip.getName()")
+  #end
+  #end
+  <input type="text" name="ips" value="$!{additionalIps}">
+  <br>
+  Comments: <input type="text" name="comments" value="$!{hardware.getComments()}"><br>
+  <BR>
+  <input type="submit" value="Update">
 </form>
 #else
 
@@ -143,19 +145,19 @@
 
 <BR><BR>
 #else
-  Hardware:
-  #set ($hws = $view.getHardwares())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($hw in $hws)
-              			      <option value="$hw.getPk()">$hw.getName()</option>
-              			      #end
-              			      </select><BR>
+Hardware:
+#set ($hws = $view.getHardwares())
+<select name=id onchange='OnChange(this);'>
+  <option value="">Select one
+    #foreach ($hw in $hws)
+  <option value="$hw.getPk()">$hw.getName()</option>
+  #end
+</select><BR>
 #end
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/State/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/State/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/State/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/State/add.vm Wed Jul  5 14:11:29 2006
@@ -19,30 +19,30 @@
 #set ($pageSelected = "state")
 #parse("/layout/header.vm")
 <div id="bigright">
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/StateAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="stateName" name="stateName" value="$!{stateName}">
-</td>
-</tr>
-<tr>
-<td>
-Color:
-</td>
-<td>
-<input type="text" id="color" name="color" value="$!{color}">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddState">
-<input type="submit" value="submit">
-</form>
-</div>
+  <div class="messagebox">
+    <form name="Form" method="post" action='$link.setAction("administration/StateAction")'>
+      <table>
+        <tr>
+          <td>
+            Name:
+          </td>
+          <td>
+            <input type="text" id="stateName" name="stateName" value="$!{stateName}">
+          </td>
+        </tr>
+        <tr>
+          <td>
+            Color:
+          </td>
+          <td>
+            <input type="text" id="color" name="color" value="$!{color}">
+          </td>
+        </tr>
+      </table>
+      <input type="hidden" name="methodToCall" value="AddState">
+      <input type="submit" value="submit">
+    </form>
+  </div>
 </div>
 #parse("/layout/footer.vm")
 



Mime
View raw message