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 [2/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/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java Wed Jul  5 14:11:29 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.core.common.message;
 
-import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
 import org.apache.axis.encoding.XMLType;
 import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
 
 import javax.xml.namespace.QName;
 import javax.xml.rpc.ParameterMode;
@@ -44,7 +44,7 @@
 
   //endpoint, String namespace, String method
 
-  public String send(String[] params, boolean hasAttachment, String... objs) throws UnsupportedParameterException {
+  public String send(String[] params, boolean hasAttachment, Object... objs) throws UnsupportedParameterException {
     if (logger.isDebugEnabled()) {
       logger.debug("SENDING JOB!!!!!!");
     }
@@ -76,7 +76,7 @@
 
   // Params: endpoint, namespace, method
   // Params: endpoint, namespace, method, fileContent
-  public String sendMessage(String[] params, boolean hasAttachment, String... objs) throws ServiceException, MalformedURLException, UnsupportedOperationException, RemoteException, UnsupportedParameterException {
+  public String sendMessage(String[] params, boolean hasAttachment, Object... objs) throws ServiceException, MalformedURLException, UnsupportedOperationException, RemoteException, UnsupportedParameterException {
     if (logger.isDebugEnabled()) {
       logger.debug("SENDING JOB!!!!!!");
     }
@@ -110,11 +110,11 @@
     return retVal;
   }
 
-  private Call buildCallArgs(Call call, String namespace, String method, String... obj) {
+  private Call buildCallArgs(Call call, String namespace, String method, Object... obj) {
     return this.buildCallArgs(call, false, namespace, method, obj);
   }
 
-  private Call buildCallArgs(Call call, boolean withAttach, String namespace, String method, String... obj) {
+  private Call buildCallArgs(Call call, boolean withAttach, String namespace, String method, Object... obj) {
     int modifier = 1;
     if (withAttach) modifier++;
     call.setOperationName(new QName(namespace, method));
@@ -124,7 +124,7 @@
     return call;
   }
 
-  private String buildNoAttach(Call call, String[] objs, String namespace, String method) throws UnsupportedOperationException, RemoteException {
+  private String buildNoAttach(Call call, Object[] objs, String namespace, String method) throws UnsupportedOperationException, RemoteException {
     String retVal = "";
     call = buildCallArgs(call, namespace, method, objs);
     if (logger.isDebugEnabled()) {
@@ -145,7 +145,7 @@
     return retVal;
   }
 
-  private String buildWithAttach(Call call, String[] objs, String namespace, String method, String fileContent) {
+  private String buildWithAttach(Call call, Object[] objs, String namespace, String method, String fileContent) {
     String retVal = "";
     byte fcontent[];
     ByteArrayInputStream bais = null;
@@ -170,7 +170,7 @@
     return retVal;
   }
 
-  private Object[] addFirstToArray(Object o, String... objs) {
+  private Object[] addFirstToArray(Object o, Object... objs) {
     Object[] objArray = new Object[objs.length + 1];
     objArray[0] = o;
     int cnt = 1;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java Wed Jul  5 14:11:29 2006
@@ -15,15 +15,14 @@
 */
 package org.apache.lokahi.core.gui.help;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.user.User;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Collectable;
 import org.apache.lokahi.core.common.interfaces.Dao;
-import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.core.common.interfaces.Restable;
-import org.apache.log4j.Logger;
-import org.jdom.Element;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
 
 import java.sql.Blob;
 import java.sql.ResultSet;
@@ -303,7 +302,7 @@
   }
 
   private void updateKeyword(String keyword) throws SQLException {
-    int kId = this.storeItem("util.help.rel.keyword.add", keyword);
+    int kId = this.storeItem("util.help.keyword.add", keyword);
     this.updateRelKeyword(kId);
   }
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java Wed Jul  5 14:11:29 2006
@@ -59,7 +59,7 @@
   public void updateApache(User u, Apache a, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
     this.jpInit(f, u, a.getName());
     if (u.isAllowed(f) && "UpdateApache".equals(f.getCommand())) {
-      if (a.getPk() > 1 && a.getName() != null && !"".equals(a.getName())) {
+      if (a.getPk() >= 1 && a.getName() != null && !"".equals(a.getName())) {
         Apache.update(a);
       } else {
         throw new TMCIllegalArgumentException("Apache can not be null");

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatWorkerAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatWorkerAction.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatWorkerAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatWorkerAction.java Wed Jul  5 14:11:29 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.gui.www;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.user.User;
 import org.apache.lokahi.core.common.collection.TMCSet;
@@ -24,7 +25,6 @@
 import org.apache.lokahi.core.gui.www.TMCAction;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorkerModel;
-import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.validator.DynaValidatorForm;
@@ -103,7 +103,7 @@
 
   private Collection<TomcatWorker> getMultiTemplate(DynaValidatorForm dynaForm) throws SQLException {
     Collection<TomcatWorker> c = new TMCSet<TomcatWorker>();
-    String[] ids = (String[]) dynaForm.get("id");
+    String[] ids = (String[]) dynaForm.get("workerId");
     if (ids != null && ids.length > 0) {
       StringBuffer names = new StringBuffer();
       for (int i = 0; i < ids.length; i++) {

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm Wed Jul  5 14:11:29 2006
@@ -19,76 +19,78 @@
 #set ($pageSelected = "Entity")
 #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>Virtualhost</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Entity/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/VirtualHostAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="name" name="name" value="$!{name}">
-</td>
-</tr>
-<tr>
-<td>
-Entry:
-</td>
-<td>
-<textarea id="entry" name="entry" cols="70" rows="7" value="$!{entry}"></textarea>
-</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>
-State:
-</td>
-<td>
-Active
-<input type="hidden" id="stateId" name="stateId" value="8">
-</td>
-</tr>
-<tr>
-<td>
-Aliases (space delimited):
-</td>
-<td>
-<input type="text" id="aliases" name="aliases" value="$!{aliases}">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddVirtualHost">
-<input type="submit" value="submit">
-</form>
+  <br/><br/>
 
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Virtualhost</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Entity/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <form name="Form" method="post" action='$link.setAction("administration/VirtualHostAction")'>
+        <table>
+          <tr>
+            <td>
+              Name:
+            </td>
+            <td>
+              <input type="text" id="name" name="name" value="$!{name}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Entry:
+            </td>
+            <td>
+              <textarea id="entry" name="entry" cols="70" rows="7" value="$!{entry}"></textarea>
+            </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>
+              State:
+            </td>
+            <td>
+              Active
+              <input type="hidden" id="stateId" name="stateId" value="8">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Aliases (space delimited):
+            </td>
+            <td>
+              <input type="text" id="aliases" name="aliases" value="$!{aliases}">
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="methodToCall" value="AddVirtualHost">
+        <input type="submit" value="submit">
+      </form>
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm Wed Jul  5 14:11:29 2006
@@ -18,11 +18,11 @@
 <!-- $User.isAllowed($function)  $methodToCall  $actionLink -->
 #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/Entity/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm Wed Jul  5 14:11:29 2006
@@ -36,7 +36,6 @@
 #end
 
 
-
 #parse("/layout/list2.vm")
 #if ($plf)
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm Wed Jul  5 14:11:29 2006
@@ -19,7 +19,8 @@
 #set ($pageSelected = "Entity")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
+
 <div id="bigright">
 <div class="messagebox">
 #if ($request.getParameter("id"))
@@ -31,7 +32,6 @@
 #end
 
 
-
 #if ($id)
 <H4> Modify a VirtualHost</h4>
 #set ($vhost = $view.getVirtualHost($id))
@@ -39,143 +39,145 @@
 #set ($hostingPoolId = $request.getParameter("hostingPoolId"))
 
 <SCRIPT LANGUAGE=javascript>
-<!--
+  <!--
 
-function ToChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	#if($pId)
-	var baseURL  = "$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId&hostingPoolId=" + SelValue;
-	#else
-	var baseURL  = "$appRoot/Apache/Entity/modify.vm?id=$id&hostingPoolId=" + SelValue;
-	#end
-	top.location.href = baseURL;
-
-	return true;
-}
-
-
-function switchCheckBoxes() {
-		if (document.Form.nameVirtualHost.checked) {
-			document.Form.catchAll.disabled = false;
-			document.Form.catchAll.checked = false;
-		} else {
-			document.Form.catchAll.checked = true;
-			document.Form.catchAll.disabled = true; }
+  function ToChange(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+  #
+    if ($pId)
+      var baseURL = "$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId&hostingPoolId=" + SelValue;
+  #else
+    var baseURL = "$appRoot/Apache/Entity/modify.vm?id=$id&hostingPoolId=" + SelValue;
+  #
+    end
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+
+  function switchCheckBoxes() {
+    if (document.Form.nameVirtualHost.checked) {
+      document.Form.catchAll.disabled = false;
+      document.Form.catchAll.checked = false;
+    } else {
+      document.Form.catchAll.checked = true;
+      document.Form.catchAll.disabled = true;
+    }
 
-	} // end of unShade function
+  } // end of unShade function
 
-//-->
+  //-->
 </SCRIPT>
 
 
-
-
 <form name="Form" method="post" action='$link.setAction("templating/AddVirtualHostAction")'>
-<input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost">
-<input type="hidden" id="id" name="id" value="$id">
-#if ($pId)
-<input type="hidden" id="projectId" name="projectId" value="$!{pId}">
-#end
-Hosting Pool:
-#set ($hps = $view.getHostingPools())
-               <select name=hostingPoolId onchange='ToChange(this);'>
-              			      #foreach ($hp in $hps)
-              			      #if (($hp == $vhost.getHostingPool() && !$hostingPoolId) || ($hostingPoolId && $hp == $view.getHostingPool($hostingPoolId)))
-              			      <option value="$hp.getPk()" selected>$hp.getName()
-              			      #else
-              			      <option value="$hp.getPk()">$hp.getName()              			      
-              			      #end
-              			      #end
-              			      </select><BR>
-Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
-Entry:
-<textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
-NameVirtualHost:
-#if ($vhost.isNameBased())
-<input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
-#else
-<input type=checkbox name=nameVirtualHost value=true onClick="switchCheckBoxes()"><BR>
-#end
-Catch All:
-#if ($vhost.isCatchAll())
-<input type=checkbox name=catchAll checked value=true><BR>
-#else
-<input type=checkbox name=catchAll value=true><BR>
-#end
-<!--Aliases (space delimited):
+  <input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost">
+  <input type="hidden" id="id" name="id" value="$id">
+  #if ($pId)
+  <input type="hidden" id="projectId" name="projectId" value="$!{pId}">
+  #end
+  Hosting Pool:
+  #set ($hps = $view.getHostingPools())
+  <select name=hostingPoolId onchange='ToChange(this);'>
+    #foreach ($hp in $hps)
+    #if (($hp == $vhost.getHostingPool() && !$hostingPoolId) || ($hostingPoolId && $hp ==
+    $view.getHostingPool($hostingPoolId)))
+    <option value="$hp.getPk()" selected>$hp.getName()
+      #else
+    <option value="$hp.getPk()">$hp.getName()
+      #end
+      #end
+  </select><BR>
+  Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
+  Entry:
+  <textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
+  NameVirtualHost:
+  #if ($vhost.isNameBased())
+  <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
+  #else
+  <input type=checkbox name=nameVirtualHost value=true onClick="switchCheckBoxes()"><BR>
+  #end
+  Catch All:
+  #if ($vhost.isCatchAll())
+  <input type=checkbox name=catchAll checked value=true><BR>
+  #else
+  <input type=checkbox name=catchAll value=true><BR>
+  #end
+  <!--Aliases (space delimited):
 <textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><BR>-->
-<BR>
-<!--Contexts:
-#if($hostingPoolId && $projectId)
-<A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
-#elseif($hostingPoolId)
-<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
-#elseif($projectId)
-<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
-#else
-<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
-#end
+  <BR>
+  <!--Contexts:
+  #if($hostingPoolId && $projectId)
+  <A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  #elseif($hostingPoolId)
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  #elseif($projectId)
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
+  #else
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
+  #end
 
-#if ($numberOfContexts > 0)
-#foreach($context in [1..$numberOfContexts])
-Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
-DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"> <BR>
-#end
-#end
--->
-#if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
-#set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
-<!-- $hardware -->
-Ips for $vhost.getHostingPool().getName():<br>
-Servername:  IP:<BR>
+  #if ($numberOfContexts > 0)
+  #foreach($context in [1..$numberOfContexts])
+  Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
+  DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"> <BR>
+  #end
+  #end
+  -->
+  #if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
+  #set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
+  <!-- $hardware -->
+  Ips for $vhost.getHostingPool().getName():<br>
+  Servername: IP:<BR>
   #foreach ($h in $hardware)
-$h.getName() <select name=ipId>
-    #foreach ($ip in $h.getIpCollection().orderByName().values())
-      #if ($vhost.getIps().contains($ip))
-        <option value="$ip.getPk()" selected>$ip.getName()
-      #else
-        <option value="$ip.getPk()">$ip.getName()
-      #end
+  $h.getName() <select name=ipId>
+  #foreach ($ip in $h.getIpCollection().orderByName().values())
+  #if ($vhost.getIps().contains($ip))
+  <option value="$ip.getPk()" selected>$ip.getName()
+    #else
+  <option value="$ip.getPk()">$ip.getName()
+    #end
     #end
-  </select><br>
+</select><br>
   #end
 
-#else
+  #else
   #set ($hp = $view.getHostingPool($hostingPoolId))
   #set ($ap = $hp.getApachePool())
   #set($hardware = $ap.getHardwares())
 
 
-Ips for $hp.getName():<br>
-Servername:  IP:<BR>
+  Ips for $hp.getName():<br>
+  Servername: IP:<BR>
   #foreach ($h in $hardware)
-$h.getName() <select name=ipId>
-    #foreach ($ip in $h.getIpCollection().orderByName().values())
-    <option value="$ip.getPk()">$ip.getName()
+  $h.getName() <select name=ipId>
+  #foreach ($ip in $h.getIpCollection().orderByName().values())
+  <option value="$ip.getPk()">$ip.getName()
     #end
-  </select><br>
+</select><br>
   #end
 
-#end
+  #end
 
-<input type="submit" value="submit">
+  <input type="submit" value="submit">
 </form>
 #else
 VirtualHost:
 #set ($vhosts = $view.getVirtualHosts())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($vhost in $vhosts)
-              			      <option value="$appRoot/Apache/Entity/modify.vm?id=$vhost.getPk()">$vhost.getName()
-              			      #end
-              			      </select><BR>
-              			      
+<select name=id onchange='OnChange(this);'>
+  <option value="">Select one
+    #foreach ($vhost in $vhosts)
+  <option value="$appRoot/Apache/Entity/modify.vm?id=$vhost.getPk()">$vhost.getName()
+    #end
+</select><BR>
+
 #end
 </div>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm Wed Jul  5 14:11:29 2006
@@ -19,25 +19,25 @@
 #parse("/layout/header.vm")
 
 <div id="bigright">
-<div class="messagebox" align="left">
+  <div class="messagebox" align="left">
 
-#if($request.getParameter("p"))
-#set($pId = $request.getParameter("p"))
-#end
-#set ($id = $request.getParameter("id"))
-#if($id)
-#set ($vhost = $view.getVirtualHost($id))
- $vhost.buildVhostEntriesForWeb()
-#if ($User.isAllowed("UpdateVirtualHost"))
-#if ($pId)
-<a href="$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId">Modify this Vhost</a> &nbsp;<BR><BR>
-#else
-<a href="$appRoot/Apache/Entity/modify.vm?id=$id">Modify this Vhost</a> &nbsp;<BR><BR>
-#end
-#end
-#end
+    #if($request.getParameter("p"))
+    #set($pId = $request.getParameter("p"))
+    #end
+    #set ($id = $request.getParameter("id"))
+    #if($id)
+    #set ($vhost = $view.getVirtualHost($id))
+    $vhost.buildVhostEntriesForWeb()
+    #if ($User.isAllowed("UpdateVirtualHost"))
+    #if ($pId)
+    <a href="$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId">Modify this Vhost</a> &nbsp;<BR><BR>
+    #else
+    <a href="$appRoot/Apache/Entity/modify.vm?id=$id">Modify this Vhost</a> &nbsp;<BR><BR>
+    #end
+    #end
+    #end
 
-</div>
+  </div>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm Wed Jul  5 14:11:29 2006
@@ -19,72 +19,78 @@
 #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="2">Infrastructure - <b>Apache Pool</b>
-  </td>
-  <td align="right">
-  #parse("/Apache/Pool/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br /><div class="messagebox">
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateApachePool")
-
-#if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
-#if($id)
-#set ($apachePool = $view.getApachePool($id))
-#set ($numberOfWorkers = $apachePool.getApaches().size())
-<form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-Pool Name: <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><br />
-
-Environment:
-#set ($envs = $view.getEnvironments())
-<select name=envId>
-##if ($apachePool.getEnv())
-##if ($envs.remove($apachePool.getEnv()))
-
-##end
-##end
-            <option value="$apachePool.getEnv().getPk()">$apachePool.getEnv().getName()
-			      #foreach ($env in $envs)
-			      <option value="$env.getPk()">$env.getName()
-			      #end
-			      </select><BR>
-
-##Steve testing
-<b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a><BR>
-
-#foreach ($worker in $apachePool.getApaches())
-		 $worker.getName() -
-		 <A href="$appRoot/Apache/Worker/delete.vm?id=$worker.getPk()"> Delete</A> |
-		 <A href="$appRoot/Apache/Worker/update.vm?id=$worker.getPk()"> Modify</A>
-
-#end
-</form>
-#else
-  Apache Pool:
-  #set ($aps = $view.getApachePools())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($ap in $aps)
-              			      <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.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="2">Infrastructure - <b>Apache Pool</b>
+        </td>
+        <td align="right">
+          #parse("/Apache/Pool/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateApachePool")
+
+      #if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
+      #if($id)
+      <br/>
+      #set ($apachePool = $view.getApachePool($id))
+      #set ($numberOfWorkers = $apachePool.getApaches().size())
+      <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
+        <input type="hidden" id="poolId" name="poolId" value="$!{id}">
+        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+
+        Pool Name: <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><br/>
+
+        Environment:
+        #set ($envs = $view.getEnvironments())
+        <select name=envId>
+          ##if ($apachePool.getEnv())
+          ##if ($envs.remove($apachePool.getEnv()))
+
+          ##end
+          ##end
+          <option value="$apachePool.getEnv().getPk()">$apachePool.getEnv().getName()
+            #foreach ($env in $envs)
+          <option value="$env.getPk()">$env.getName()
+            #end
+        </select><BR>
+
+        ##Steve testing
+        <b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a><BR>
+
+        #foreach ($worker in $apachePool.getApaches())
+        $worker.getName() -
+        <A href="$appRoot/Apache/Worker/delete.vm?id=$worker.getPk()"> Delete</A> |
+        <A href="$appRoot/Apache/Worker/update.vm?id=$worker.getPk()"> Modify</A>
+
+        #end
+        <br/>
+        <br/>
+        <input type="submit" value="submit">
+      </form>
+      #else
+      Apache Pool:
+      #set ($aps = $view.getApachePools())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($ap in $aps)
+        <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.getName()
+          #end
+      </select><BR>
+      #end
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm Wed Jul  5 14:11:29 2006
@@ -20,68 +20,78 @@
 #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</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))
+  <br/><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="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/>
 
-#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 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/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm Wed Jul  5 14:11:29 2006
@@ -19,63 +19,64 @@
 #set ($pageSelected = "alerts")
 #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>Administration - <b>Alert</b>
-  </td>
-  <td align="right">
-  #parse("Core/Alerts/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
-<table>
-<tr>
-<td>
-Alert Title:
-</td>
-<td>
-<input type="text" id="alertTitle" name="alertTitle" value="$!{alertTitle}">
-</td>
-</tr>
-<tr>
-<td>
-Alert Link:
-</td>
-<td>
-<input type="text" id="alertLink" name="alertLink" value="$!{alertLink}">
-</td>
-</tr>
-<tr>
-<td>
-Alert Content:
-</td>
-<td>
-<textarea id="content" name="content" cols="40" rows="5">$!{content}</textarea>
-</td>
-</tr>
-<tr>
-<td>
-Is Context HTML Formatted?:
-</td>
-<td>
-Yes<input type="radio" id="format" name="format" value="Yes" checked> <br>
-No<input type="radio" id="format" name="format" value="No">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddAlert">
-<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>Administration - <b>Alert</b>
+        </td>
+        <td align="right">
+          #parse("Core/Alerts/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
+        <table>
+          <tr>
+            <td>
+              Alert Title:
+            </td>
+            <td>
+              <input type="text" id="alertTitle" name="alertTitle" value="$!{alertTitle}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Alert Link:
+            </td>
+            <td>
+              <input type="text" id="alertLink" name="alertLink" value="$!{alertLink}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Alert Content:
+            </td>
+            <td>
+              <textarea id="content" name="content" cols="40" rows="5">$!{content}</textarea>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Is Context HTML Formatted?:
+            </td>
+            <td>
+              Yes<input type="radio" id="format" name="format" value="Yes" checked> <br>
+              No<input type="radio" id="format" name="format" value="No">
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="methodToCall" value="AddAlert">
+        <input type="submit" value="submit">
+      </form>
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm Wed Jul  5 14:11:29 2006
@@ -15,12 +15,17 @@
 ##
 ## $Id$
 ##
-#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()
-</form>
-#end
+<div class="messagebox">
+  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
+  <br/>
+
+  <form name="Form" method="post" action='$link.setAction($actionLink)'>
+    <input type=hidden name="methodToCall" value="$methodToCall">
+    <input type="submit" value="$buttonName"><BR>
+    <br/>
+    $methodToCall
+    <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+    $individual.getName()
+  </form>
+  #end
+</div>
\ No newline at end of file

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm Wed Jul  5 14:11:29 2006
@@ -15,96 +15,9 @@
 ##
 ## $Id$
 ##
-#set ($menu = "/layout/menu/EntityTop.vm")
-#set ($pageSelected = "alerts")
-#parse("/layout/header.vm")
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Alerts/delete.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-<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>Administration - <b>Alert</b>
-  </td>
-  <td align="right">
-  #parse("Core/Alerts/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#set ($alertId = $request.getParameter("id"))
-#set ($alertIdNum = 1)
 #set($actionLink = "administration/AlertAction")
 #set($methodToCall = "DeleteAlert")
 #set($buttonName = "Delete")
 #set ($function = "DeleteAlert")
-
-#if($alertId)
-#set ($a = $alertSet.getAlertById($alertIdNum.valueOf($alertId)))
-##parse("Core/project/list.vm")
-
-##set ($id = $request.getParameter("id"))
-##set($project = $User.getProject($projectId))
-
-
-#if ($User.isAllowed($function) && $methodToCall == "DeleteAlert")
-
-
-<table>
-<tr>
-
-
-Are you sure you want to delete $!{a.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/AlertAction")' method="post">
-		<input type="hidden" name="id" value="$!{alertId}">
-		<input type="hidden" name="methodToCall" value="DeleteAlert">
-		#submit_button("Submit" "Delete" "button" "")
-		</form>
-	</td>
-
-</tr>
-
-</table>
-#end
-#else
-  <br />
-  Alert to Delete:
-   #set ($als = $alertSet.getRecentAlerts())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-                                      #foreach ($al in $als)
-                                      <option value="$al.getPk()">$al.getName()
-                                      #end
-                                      </select><BR>
-  <br />
-#end
-</div>
-<br />
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
-
+#set ($currentPage = "delete.vm")
+#parse("Core/Alerts/list.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm Wed Jul  5 14:11:29 2006
@@ -19,77 +19,78 @@
 #set ($pageSelected = "alert")
 #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>Administration - <b>Alert</b>
-  </td>
-  <td align="right">
-  #parse("Core/Alerts/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Alerts/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-#set ($id = $request.getParameter("id"))
-#set ($idNum = 1)
-
-#if($id)
-#set ($methodToCall = "UpdateAlert")
-#set ($a = $alertSet.getAlertById($idNum.valueOf($id)))
-
-##if ($User.isAllowed("ViewAlert"))
-<br />
-Alert Title: $!{a.getName()}<br>
-Alert Link: $!{a.getLink()}<br>
-Alert Content: $!{a.getContent()}<br>
-##end
-
-#if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
-<BR>
-<a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<BR><BR>
-<BR>
-#end
-
-#if ($User.isAllowed("DeleteAlert"))
-	<form method="post" action='$link.setAction("administration/AlertAction")' method="post">
-	<input type="hidden" name="id" value="$!{id}">
-	<input type="hidden" name="methodToCall" value="DeleteAlert">
-	#submit_button("Submit" "Delete" "button" "")
-	</form>
-#end
-#else
-  <br />
-  Alert:
-  #set ($als = $alertSet.getRecentAlerts())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-              			      #foreach ($al in $als)
-              			      <option value="$al.getPk()">$al.getName()</option>
-              			      #end
-              			      </select><BR>
-<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>Administration - <b>Alert</b>
+        </td>
+        <td align="right">
+          #parse("Core/Alerts/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <SCRIPT LANGUAGE=javascript>
+        <!--
+        function OnChangeIn(dropdown)
+        {
+          var myindex = dropdown.selectedIndex;
+          var SelValue = dropdown.options[myindex].value;
+          var baseURL = "$appRoot/Core/Alerts/details.vm?id=" + SelValue;
+          top.location.href = baseURL;
+
+          return true;
+        }
+        //-->
+      </SCRIPT>
+      #set ($id = $request.getParameter("id"))
+      #set ($idNum = 1)
+
+      #if($id)
+      #set ($methodToCall = "UpdateAlert")
+      #set ($a = $alertSet.getAlertById($idNum.valueOf($id)))
+
+      #if ($User.isAllowed("ViewAlert"))
+      <br/>
+      Alert Title: $!{a.getName()}<br>
+      Alert Link: $!{a.getLink()}<br>
+      Alert Content: $!{a.getContent()}<br>
+      #end
+
+      #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
+      <BR>
+      <a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<BR><BR>
+      <BR>
+      #end
+
+      #if ($User.isAllowed("DeleteAlert"))
+      <form method="post" action='$link.setAction("administration/AlertAction")' method="post">
+        <input type="hidden" name="id" value="$!{id}">
+        <input type="hidden" name="methodToCall" value="DeleteAlert">
+        #submit_button("Submit" "Delete" "button" "")
+      </form>
+      #end
+      #else
+      <br/>
+      Alert:
+      #set ($als = $alertSet.getRecentAlerts())
+      <select name=id onchange='OnChangeIn(this);'>
+        <option value="">Select one
+          #foreach ($al in $als)
+        <option value="$al.getPk()">$al.getName()</option>
+        #end
+      </select><BR>
+      <br/>
+      #end
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm Wed Jul  5 14:11:29 2006
@@ -16,29 +16,29 @@
 ## $Id$
 ##
 #if (!$collection)
-	#set ($menu = "/layout/menu/EntityTop.vm")
-	#set ($pageSelected = "alerts")
-	#parse("/layout/header.vm")
+#set ($menu = "/layout/menu/EntityTop.vm")
+#set ($pageSelected = "alerts")
+#parse("/layout/header.vm")
 
-	#set ($plf = "true")
-	#if ($request.getParameter("id"))
-		#set ($id = $request.getParameter("id"))
-		#set ($idNum = 1)
-		#set ($individual = $alertSet.getAlertById($idNum.valueOf($id)))
-		#set ($indivPage = "/Core/Alerts/confirm.vm")
-	#else
-		#set ($collection = $alertSet.getRecentAlerts())
-	#end
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($idNum = 1)
+#set ($individual = $alertSet.getAlertById($idNum.valueOf($id)))
+#set ($indivPage = "/Core/Alerts/confirm.vm")
+#else
+#set ($collection = $alertSet.getRecentAlerts())
+#end
 #end
 #set ($entity = "Alerts")
 #set ($category = "Administration")
 #set ($usesEnv = "false")
 #set ($path = "Core/Alerts")
 #if (!$currentPage)
-	#set ($currentPage = "$appRoot/Core/Alerts/list.vm")
+#set ($currentPage = "$appRoot/Core/Alerts/list.vm")
 #end
 
 #parse("/layout/list2.vm")
 #if ($plf)
-	#parse("/layout/footer.vm")
+#parse("/layout/footer.vm")
 #end

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

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm Wed Jul  5 14:11:29 2006
@@ -19,93 +19,95 @@
 #set ($pageSelected = "alerts")
 #parse("/layout/header.vm")
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Alerts/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
+  <!--
+  function OnChangeIn(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Core/Alerts/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=3>Administration - <b>Alert</b>
+        </td>
+        <td align="right">
+          #parse("Core/Alerts/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      #set ($id = $request.getParameter("id"))
+      #set ($idNum = 1)
+      #set ($methodToCall = "UpdateAlert")
+
+      ##When AlertTool is upgraded uncomment this
+      #if($id)
+      #set($a = $alertSet.getAlertById($idNum.valueOf($id)))
+
+      ##remove below comment at appropriate time
+      #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
+      <br/>
 
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Administration - <b>Alert</b>
-  </td>
-  <td align="right">
-  #parse("Core/Alerts/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#set ($id = $request.getParameter("id"))
-#set ($idNum = 1)
-#set ($methodToCall = "UpdateAlert")
-
-##When AlertTool is upgraded uncomment this
-#if($id)
-#set($a = $alertSet.getAlertById($idNum.valueOf($id)))
-
-##remove below comment at appropriate time
-#if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
-<br />
-<form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
-<table>
-<tr>
-<td>
-Alert Title:
-</td>
-<td>
-<input type="text" size="40" id="alertTitle" name="alertTitle" value="$!{a.getName()}">
-</td>
-</tr>
-<tr>
-<td>
-Alert Link:
-</td>
-<td>
-<input type="text" size="40" id="alertLink" name="alertLink" value="$!{a.getLink()}">
-</td>
-</tr>
-<tr>
-<td>
-Alert Content:
-</td>
-<td>
-<textarea id="content" name="content" cols="40" rows="5">$!{a.getContent()}</textarea>
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="UpdateAlert">
-<input type="hidden" name="id" value="$!{id}">
-<input type="submit" value="Update">
-</form>
-#end
-#else
-  <br />
-  Alerts:
-   #set ($als = $alertSet.getRecentAlerts())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-                                      #foreach ($al in $als)
-                                      <option value="$al.getPk()">$al.getName()
-                                      #end
-                                      </select><BR>
-  <br />
-#end
-</div>
-<br />
-</div>
-<br />
+      <form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
+        <table>
+          <tr>
+            <td>
+              Alert Title:
+            </td>
+            <td>
+              <input type="text" size="40" id="alertTitle" name="alertTitle" value="$!{a.getName()}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Alert Link:
+            </td>
+            <td>
+              <input type="text" size="40" id="alertLink" name="alertLink" value="$!{a.getLink()}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Alert Content:
+            </td>
+            <td>
+              <textarea id="content" name="content" cols="40" rows="5">$!{a.getContent()}</textarea>
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="methodToCall" value="UpdateAlert">
+        <input type="hidden" name="id" value="$!{id}">
+        <input type="submit" value="Update">
+      </form>
+      #end
+      #else
+      <br/>
+      Alerts:
+      #set ($als = $alertSet.getRecentAlerts())
+      <select name=id onchange='OnChangeIn(this);'>
+        <option value="">Select one
+          #foreach ($al in $als)
+        <option value="$al.getPk()">$al.getName()
+          #end
+      </select><BR>
+      <br/>
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm Wed Jul  5 14:11:29 2006
@@ -19,25 +19,26 @@
 #set ( $pageSelected = "Entity" )
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-<br /><br />
+  <br/><br/>
 
-<table width="700" border="0" cellspacing="0" cellpadding="0" >
-	<tr valign="top" class="info">
-		<td valign="top" height="25" align="center"> Manage Assets </td>
-	</tr>
-	<tr valign="top" class="body">
-		<td align="center" valign="top" style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br />
-			<a href="$appRoot/Core/File/list.vm">&nbsp;Manage Files&nbsp;</a><br />
-			<a href="$appRoot/Core/Environment/list.vm">&nbsp;Manage Environments&nbsp;</a><br />
-			<a href="$appRoot/Core/Instance/list.vm">&nbsp;Manage Instances&nbsp;</a><br />
-			<a href="$appRoot/Core/Alerts/list.vm">&nbsp;Manage Alerts&nbsp;</a><br />
-			<BR>
-		</td>
-	</tr>
-</table>
+  <table width="700" border="0" cellspacing="0" cellpadding="0">
+    <tr valign="top" class="info">
+      <td valign="top" height="25" align="center"> Manage Assets </td>
+    </tr>
+    <tr valign="top" class="body">
+      <td align="center" valign="top"
+          style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br/>
+        <a href="$appRoot/Core/File/list.vm">&nbsp;Manage Files&nbsp;</a><br/>
+        <a href="$appRoot/Core/Environment/list.vm">&nbsp;Manage Environments&nbsp;</a><br/>
+        <a href="$appRoot/Core/Instance/list.vm">&nbsp;Manage Instances&nbsp;</a><br/>
+        <a href="$appRoot/Core/Alerts/list.vm">&nbsp;Manage Alerts&nbsp;</a><br/>
+        <BR>
+      </td>
+    </tr>
+  </table>
 </form>
 
-<br />
+<br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm Wed Jul  5 14:11:29 2006
@@ -22,39 +22,41 @@
 
 
 <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 - Entity - <b>Search</b></td>
-<td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
-<option value="">Select one
-#parse("/Core/Entity/menu/search.vm")
-</select></td>
-</tr>
-</table>
-
-##<td colspan="2" align="right"> </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 - Entity - <b>Search</b></td>
+        <td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
+          <option value="">Select one
+            #parse("/Core/Entity/menu/search.vm")
+        </select></td>
+      </tr>
+    </table>
+
+    ##<td colspan="2" align="right"></td>
+    ##</tr>
+  ##</table>
+<br/>
 #if ($name && $type != "")
 <div class="messagebox" width="75%" align="center">
-<br />
-<form name="Form1" method="post" action='$appRoot/Core/Entity/search.vm'>
+  <br/>
+
+  <form name="Form1" method="post" action='$appRoot/Core/Entity/search.vm'>
+
+    Component <select name=type>
+    <option value="">Select one</option>
+    <option value="Virtualhost">Virtualhost</option>
+    <option value="Context">Context</option>
+  </select>
+    <input type="text" id="name" name="name" value="$!{name}"><br/>
 
-Component <select name=type>
-<option value="">Select one</option>
-<option value="Virtualhost">Virtualhost</option>
-<option value="Context">Context</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,24 +91,24 @@
 #parse("$path/list.vm")
 #end
 <div class="messagebox" width="75%" align="center">
-<br />
-#if ($name && $type != "")
-<form name="Form2" method="post" action='$appRoot/Core/Entity/search.vm'>
-#else
-<form name="Form1" method="post" action='$appRoot/Core/Entity/search.vm'>
-#end
-Component <select name=type>
-<option value="">Select one</option>
-<option value="Virtualhost">Virtualhost</option>
-<option value="Context">Context</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/Entity/search.vm'>
+    #else
+    <form name="Form1" method="post" action='$appRoot/Core/Entity/search.vm'>
+      #end
+      Component <select name=type>
+      <option value="">Select one</option>
+      <option value="Virtualhost">Virtualhost</option>
+      <option value="Context">Context</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/Environment/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/add.vm Wed Jul  5 14:11:29 2006
@@ -19,30 +19,30 @@
 #set ($pageSelected = "enviroment")
 #parse("/layout/header.vm")
 <div id="bigright">
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/EnvironmentAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="envName" name="envName" value="$!{envName}">
-</td>
-</tr>
-<tr>
-<td>
-Comments:
-</td>
-<td>
-<input type="text" id="comments" name="comments" value="$!{comments}">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddEnvironment">
-<input type="submit" value="submit">
-</form>
-</div>
+  <div class="messagebox">
+    <form name="Form" method="post" action='$link.setAction("administration/EnvironmentAction")'>
+      <table>
+        <tr>
+          <td>
+            Name:
+          </td>
+          <td>
+            <input type="text" id="envName" name="envName" value="$!{envName}">
+          </td>
+        </tr>
+        <tr>
+          <td>
+            Comments:
+          </td>
+          <td>
+            <input type="text" id="comments" name="comments" value="$!{comments}">
+          </td>
+        </tr>
+      </table>
+      <input type="hidden" name="methodToCall" value="AddEnvironment">
+      <input type="submit" value="submit">
+    </form>
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm Wed Jul  5 14:11:29 2006
@@ -19,57 +19,58 @@
 #set ($pageSelected = "enviroment")
 #parse("/layout/header.vm")
 <div id="bigright">
-<div class="messagebox">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Environment/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "ViewEnvironment")
-
-
-#if($id)
-#if ($User.isAllowed("ViewEnvironment") && $methodToCall == "ViewEnvironment")
-#set ($Environment = $view.getEnvironment($id))
-Name: $!{Environment.getName()}<BR>
-Comments: <textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{Environment.getComments()} </textarea><BR>
-#end
-
-#if ($User.isAllowed("UpdateEnvironment"))
-<a href="$appRoot/Core/Environment/update.vm?id=$id">Update this Environment</a> &nbsp;<BR><BR>
-#end
-
-#if ($User.isAllowed("DeleteEnvironment"))
-  <form name="Form" method="post" action='$appRoot/administration/Environment/Delete.do'>
- <input type=hidden name="methodToCall" value="delete" >
- <input type=hidden name=id value="$id" >
- <input type="submit" value="Delete">
- </form>
-#end
-
-#else
-Environment:
-#set ($envs = $view.getEnvironments())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($env in $envs)
-              			      <option value="$env.getPk()">$env.getName()
-              			      #end
-              			      </select><BR>
+  <div class="messagebox">
+    <SCRIPT LANGUAGE=javascript>
+      <!--
+      function OnChange(dropdown)
+      {
+        var myindex = dropdown.selectedIndex;
+        var SelValue = dropdown.options[myindex].value;
+        var baseURL = "$appRoot/Core/Environment/details.vm?id=" + SelValue;
+        top.location.href = baseURL;
+
+        return true;
+      }
+      //-->
+    </SCRIPT>
+
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "ViewEnvironment")
+
+
+    #if($id)
+    #if ($User.isAllowed("ViewEnvironment") && $methodToCall == "ViewEnvironment")
+    #set ($Environment = $view.getEnvironment($id))
+    Name: $!{Environment.getName()}<BR>
+    Comments: <textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{Environment.getComments()} </textarea>
+    <BR>
+    #end
+
+    #if ($User.isAllowed("UpdateEnvironment"))
+    <a href="$appRoot/Core/Environment/update.vm?id=$id">Update this Environment</a> &nbsp;<BR><BR>
+    #end
+
+    #if ($User.isAllowed("DeleteEnvironment"))
+    <form name="Form" method="post" action='$appRoot/administration/Environment/Delete.do'>
+      <input type=hidden name="methodToCall" value="delete">
+      <input type=hidden name=id value="$id">
+      <input type="submit" value="Delete">
+    </form>
+    #end
+
+    #else
+    Environment:
+    #set ($envs = $view.getEnvironments())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($env in $envs)
+      <option value="$env.getPk()">$env.getName()
+        #end
+    </select><BR>
 
 
-#end
-</div>
+    #end
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Environment/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/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/Environment/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm Wed Jul  5 14:11:29 2006
@@ -19,48 +19,49 @@
 #set ($pageSelected = "enviroment")
 #parse("/layout/header.vm")
 <div id="bigright">
-<div class="messagebox">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Environment/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
+  <div class="messagebox">
+    <SCRIPT LANGUAGE=javascript>
+      <!--
+      function OnChange(dropdown)
+      {
+        var myindex = dropdown.selectedIndex;
+        var SelValue = dropdown.options[myindex].value;
+        var baseURL = "$appRoot/Core/Environment/update.vm?id=" + SelValue;
+        top.location.href = baseURL;
 
-	return true;
-}
-//-->
-</SCRIPT>
+        return true;
+      }
+      //-->
+    </SCRIPT>
 
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateEnvironment")
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "UpdateEnvironment")
 
-#if ($User.isAllowed("UpdateEnvironment") && $methodToCall == "UpdateEnvironment")
-#if($id)
-#set ($Environment = $view.getEnvironment($id))
-<form name="Form" method="post" action='$link.setAction("administration/EnvironmentAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-Name: <input type="text" readonly id="envName" name="envName" value="$!{Environment.getName()}"><BR>
-Comments:  <textarea id="comments" name="comments" cols="40" rows="5"> $!{Environment.getComments()} </textarea><BR>
-<input type="submit" value="Update">
+    #if ($User.isAllowed("UpdateEnvironment") && $methodToCall == "UpdateEnvironment")
+    #if($id)
+    #set ($Environment = $view.getEnvironment($id))
+    <form name="Form" method="post" action='$link.setAction("administration/EnvironmentAction")'>
+      <input type="hidden" id="id" name="id" value="$!{id}">
+      <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+      Name: <input type="text" readonly id="envName" name="envName" value="$!{Environment.getName()}"><BR>
+      Comments: <textarea id="comments" name="comments" cols="40" rows="5"> $!{Environment.getComments()} </textarea>
+      <BR>
+      <input type="submit" value="Update">
 
-</form>
-#else
-Environment:
-#set ($envs = $view.getEnvironments())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($env in $envs)
-              			      <option value="$env.getPk()">$env.getName()
-              			      #end
-              			      </select><BR>
+    </form>
+    #else
+    Environment:
+    #set ($envs = $view.getEnvironments())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($env in $envs)
+      <option value="$env.getPk()">$env.getName()
+        #end
+    </select><BR>
 
-#end
-#end
-</div>
+    #end
+    #end
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm Wed Jul  5 14:11:29 2006
@@ -19,61 +19,62 @@
 #set ($pageSelected = "file")
 #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>Administration - <b>File</b>
-  </td>
-  <td align="right">
-  #parse("Core/File/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=3>Administration - <b>File</b>
+        </td>
+        <td align="right">
+          #parse("Core/File/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
 
-<form name="Form" method="post" action='$link.setAction("administration/FileAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="name" name="name" value="$!{name}">
-</td>
-</tr>
-<tr>
-<td>
-Content:
-</td>
-<td>
-<textarea id="content" name="content" cols="80" rows="30">$!{content}</textarea>
-</td>
-</tr>
-<tr>
-<td>
-Path:
-</td>
-<td>
-<input type="text" id="path" name="path" value="$!{path}">
-</td>
-</tr>
-<tr>
-<td>
-Descriptor:
-</td>
-<td>
-<input type="text" id="descriptor" name="descriptor" value="$!{descriptor}">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddFile">
-<input type="submit" value="submit">
-</form>
-</div>
-</div>
-#parse("/layout/footer.vm")
+    <div class="messagebox">
+
+      <form name="Form" method="post" action='$link.setAction("administration/FileAction")'>
+        <table>
+          <tr>
+            <td>
+              Name:
+            </td>
+            <td>
+              <input type="text" id="name" name="name" value="$!{name}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Content:
+            </td>
+            <td>
+              <textarea id="content" name="content" cols="80" rows="30">$!{content}</textarea>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Path:
+            </td>
+            <td>
+              <input type="text" id="path" name="path" value="$!{path}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Descriptor:
+            </td>
+            <td>
+              <input type="text" id="descriptor" name="descriptor" value="$!{descriptor}">
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="methodToCall" value="AddFile">
+        <input type="submit" value="submit">
+      </form>
+    </div>
+  </div>
+  #parse("/layout/footer.vm")
 
 

Added: incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm?rev=419344&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm Wed Jul  5 14:11:29 2006
@@ -0,0 +1,31 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+## $Id$
+##
+<div class="messagebox">
+<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<br />
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><BR>
+<br />
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+</div>

Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm Wed Jul  5 14:11:29 2006
@@ -1,4 +1,4 @@
-##
+####
 ## Copyright 2006  The Apache Software Foundation
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,103 +15,9 @@
 ##
 ## $Id$
 ##
-#set ($menu = "/layout/menu/EntityTop.vm")
-#set ($pageSelected = "file")
-#parse("/layout/header.vm")
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/File/delete.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-<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>Administration - <b>File</b>
-  </td>
-  <td align="right">
-  #parse("Core/File/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#set ($fileId = $request.getParameter("id"))
-#set($actionLink = "administration/FileAction")
-#set($methodToCall = "DeleteFile")
-#set($buttonName = "Delete")
-#set ($function = "DeleteFile")
-
-#if($fileId)
-#set ($file = $view.getFile($id))
-
-#if ($User.isAllowed($function) && $methodToCall == "DeleteFile")
-<table>
-<tr>
-Are you sure you want to delete $!{file.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/FileAction")' method="post">
-		<input type="hidden" name="id" value="$!{fileId}">
-		<input type="hidden" name="methodToCall" value="DeleteFile">
-		#submit_button("Submit" "Delete" "button" "")
-		</form>
-	</td>
-
-</tr>
-
-</table>
-#end
-#else
-  <br />
-  File to Delete:
-   #set ($fs = $view.getFiles())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-                                      #foreach ($f in $fs)
-                                      <option value="$f.getPk()">$f.getName()
-                                      #end
-                                      </select><BR>
-  <br />
-#end
-</div>
-<br />
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
-
-
-
-
-
-
-
-
-
-
-
-
-
 #set($actionLink = "administration/File/Delete")
 #set($methodToCall = "DeleteFile")
 #set($buttonName = "Delete")
 #set ($function = "DeleteFile")
-#parse("Core/File/list.vm")
+#set ($currentPage = "delete.vm")
+#parse("Core/File/list.vm")
\ No newline at end of file



Mime
View raw message