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 [3/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/File/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm Wed Jul  5 14:11:29 2006
@@ -19,73 +19,74 @@
 #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">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIt(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/File/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateFile")
-
-#if($id)
-#set ($file = $view.getFile($id))
-
-#if ($User.isAllowed("ViewFile")) <BR>
-Name: "$!{file.getName()}" <BR>
-Path: "$!{file.getPath()}" <BR>
-Descriptor: "$!{file.getDescriptor()}" <BR>
-Content: <textarea id="content" name="content" READONLY cols="90" rows="30">$!{file.getContent()}</textarea><BR>
-#end
-
-#if ($User.isAllowed("UpdateFile"))
-<BR><BR><a href="$appRoot/Core/File/update.vm?id=$id">Update this File</a> &nbsp;<BR><BR>
-#end
-
-#if ($User.isAllowed("DeleteFile"))
-	<form method="post" action='$link.setAction("administration/FileAction")' method="post">
-	<input type="hidden" name="id" value="$!{id}">
-	<input type="hidden" name="methodToCall" value="DeleteFile">
-	#submit_button("Submit" "Delete" "button" "")
-	</form>
-#end
-
-#else
-File:
-#set ($files = $view.getFiles())
-               <select name=id onchange='OnChangeIt(this);'>
-                          <option value="">Select one
-              			      #foreach ($file in $files)
-              			      <option value="$file.getPk()">$file.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>Administration - <b>File</b>
+        </td>
+        <td align="right">
+          #parse("Core/File/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <SCRIPT LANGUAGE=javascript>
+        <!--
+        function OnChangeIt(dropdown)
+        {
+          var myindex = dropdown.selectedIndex;
+          var SelValue = dropdown.options[myindex].value;
+          var baseURL = "$appRoot/Core/File/details.vm?id=" + SelValue;
+          top.location.href = baseURL;
+
+          return true;
+        }
+        //-->
+      </SCRIPT>
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateFile")
+
+      #if($id)
+      #set ($file = $view.getFile($id))
+
+      #if ($User.isAllowed("ViewFile")) <BR>
+      Name: "$!{file.getName()}" <BR>
+      Path: "$!{file.getPath()}" <BR>
+      Descriptor: "$!{file.getDescriptor()}" <BR>
+      Content: <textarea id="content" name="content" READONLY cols="90" rows="30">$!{file.getContent()}</textarea><BR>
+      #end
+
+      #if ($User.isAllowed("UpdateFile"))
+      <BR><BR><a href="$appRoot/Core/File/update.vm?id=$id">Update this File</a> &nbsp;<BR><BR>
+      #end
+
+      #if ($User.isAllowed("DeleteFile"))
+      <form method="post" action='$link.setAction("administration/File/Delete")' method="post">
+        <input type="hidden" name="id" value="$!{id}">
+        <input type="hidden" name="methodToCall" value="DeleteFile">
+        #submit_button("Submit" "Delete" "button" "")
+      </form>
+      #end
+
+      #else
+      File:
+      #set ($files = $view.getFiles())
+      <select name=id onchange='OnChangeIt(this);'>
+        <option value="">Select one
+          #foreach ($file in $files)
+        <option value="$file.getPk()">$file.getName()
+          #end
+      </select><BR>
+
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm Wed Jul  5 14:11:29 2006
@@ -16,18 +16,17 @@
 ## $Id$
 ##
 #if (!$collection)
-	#set ($menu = "/layout/menu/EntityTop.vm")
-	#set ($pageSelected = "file")
-	#parse("/layout/header.vm")
-
-	#set ($plf = "true")
-	#if ($request.getParameter("id"))
-		#set ($id = $request.getParameter("id"))
-		#set ($individual = $view.getFile($id))
-		#set ($indivPage = "/Core/File/confirm.vm")
-	#else
-		#set ($collection = $view.getFiles())
-	#end
+#set ($menu = "/layout/menu/EntityTop.vm")
+#set ($pageSelected = "file")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $view.getFile($id))
+#set ($indivPage = "/Core/File/confirm.vm")
+#else
+#set ($collection = $view.getFiles())
+#end
 #end
 #set ($entity = "File")
 #set ($usesEnv = "false")
@@ -35,73 +34,63 @@
 #set ($addFunction = "Add$entity")
 #set ($deleteFunction = "Delete$entity")
 #if (! $currentPage)
-	#set ($currentPage = "$appRoot/Core/File/list.vm")
+#set ($currentPage = "$appRoot/Core/File/list.vm")
 #end
 
 #parse("/layout/list2.vm")
 #if ($plf)
-	#parse("/layout/footer.vm")
+#parse("/layout/footer.vm")
 #end
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 ##<div align="center" class="contentbox">
-##<br /><br />
+  ##<br/><br/>
 
-##<div class="projectbox">
-##<table width="100%" border="0" cellspacing="0" cellpadding="1">
-##<tr class="info" valign="top">
-##	<td colspan=3>Administration - <b>File</b>
-##  </td>
-##  <td align="right">
-##  #parse("Core/File/menu/global.vm")
-##  </td>
-##</tr>
-##</table>
-##<br />
-##<div class="messagebox">
-##
-##
-##
-###if ($User.isAllowed($addFunction))
-##	<A href="$appRoot/Core/$entity/add.vm">Add</a>
-###end
-###if ($User.isAllowed($deleteFunction))
-##	<form name="Form" method="post" action='$link.setAction("administration/$entity/Delete")'>
-##	<input type=hidden name="methodToCall" value="DeleteFile" >
-###end
-##<UL>
-###if ($collection.isEmpty())
-##	No $entity to list.
-###end
-###foreach($item in $collection)
-##	<li>
-##	#if ($User.isAllowed($deleteFunction))
-##		<input type=checkbox name=id value="$item.getPk()" >&nbsp;&nbsp;
-##	#end
-##	<A href="$appRoot/Core/$entity/details.vm?id=$item.getPk()">$item.getName() - $!{item.getDescriptor()}</a></li>
-###end
-##</ul>
-###if ($User.isAllowed($deleteFunction))
-##	<input type="submit" value="Delete">
-##	</form>
-###end
-##</div>
-##<br />
-##</div>
-##<br />
-##</div>
+  ##<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">
+  ##
+  ##
+  ##
+  ###if ($User.isAllowed($addFunction))
+  ## <A href="$appRoot/Core/$entity/add.vm">Add</a>
+  ###end
+  ###if ($User.isAllowed($deleteFunction))
+  ##
+  <form name="Form" method="post" action='$link.setAction("administration/$entity/Delete")'>
+    ## <input type=hidden name="methodToCall" value="DeleteFile">
+    ###end
+    ##<UL>
+    ###if ($collection.isEmpty())
+    ## No $entity to list.
+    ###end
+    ###foreach($item in $collection)
+    ## <li>
+    ## #if ($User.isAllowed($deleteFunction))
+    ## <input type=checkbox name=id value="$item.getPk()">&nbsp;&nbsp;
+    ## #end
+    ## <A href="$appRoot/Core/$entity/details.vm?id=$item.getPk()">$item.getName() - $!{item.getDescriptor()}</a></li>
+    ###end
+    ##</ul>
+    ###if ($User.isAllowed($deleteFunction))
+    ## <input type="submit" value="Delete">
+    ## </form>
+  ###end
+  ##</div>
+  ##<br/>
+  ##</div>
+  ##<br/>
+  ##</div>
 ###parse("/layout/footer.vm")
 ##
 ##

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/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/File/$page">&nbsp;Details&nbsp;</option>
-#else
-	<option value="$appRoot/Core/File/details.vm">&nbsp;Details&nbsp;</option>
-#end
-#if ($User.isAllowed("AddFile"))
-	<option value="$appRoot/Core/File/add.vm">&nbsp;Add&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateFile"))
-<option value="$appRoot/Core/File/update.vm">&nbsp;Update&nbsp;</option>
-#end
-#if ($User.isAllowed("DeleteFile"))
-<option value="$appRoot/Core/File/delete.vm">&nbsp;Delete&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Core/File/$page">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Core/File/details.vm">&nbsp;Details&nbsp;</option>
+  #end
+  #if ($User.isAllowed("AddFile"))
+  <option value="$appRoot/Core/File/add.vm">&nbsp;Add&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateFile"))
+  <option value="$appRoot/Core/File/update.vm">&nbsp;Update&nbsp;</option>
+  #end
+  #if ($User.isAllowed("DeleteFile"))
+  <option value="$appRoot/Core/File/delete.vm">&nbsp;Delete&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/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/File/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#else
-	<option value="$appRoot/Core/File/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateFile"))
-	<option value="$appRoot/Core/File/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteFile"))
-	<option value="$appRoot/Core/File/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Core/File/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Core/File/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateFile"))
+  <option value="$appRoot/Core/File/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteFile"))
+  <option value="$appRoot/Core/File/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm Wed Jul  5 14:11:29 2006
@@ -19,66 +19,67 @@
 #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">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIt(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/File/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateFile")
-
-#if($id)
-#set ($file = $view.getFile($id))
-#if ($User.isAllowed("UpdateFile") && $methodToCall == "UpdateFile")
-<form name="Form" method="post" action='$link.setAction("administration/FileAction")'>
-<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="$!{file.getName()}"><BR>
-Path: <input type="text" id="path" name="path" value="$!{file.getPath()}"><BR>
-Descriptor: <input type="text" id="descriptor" name="descriptor" value="$!{file.getDescriptor()}"><BR>
-Content: <textarea id="content" name="content" cols="90" rows="30">$!{file.getContent()}</textarea><BR>
-<input type="submit" value="update">
-</form>
-#end
-
-#else
-File:
-#set ($files = $view.getFiles())
-               <select name=id onchange='OnChangeIt(this);'>
-                          <option value="">Select one
-              			      #foreach ($file in $files)
-              			      <option value="$file.getPk()">$file.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>Administration - <b>File</b>
+        </td>
+        <td align="right">
+          #parse("Core/File/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <SCRIPT LANGUAGE=javascript>
+        <!--
+        function OnChangeIt(dropdown)
+        {
+          var myindex = dropdown.selectedIndex;
+          var SelValue = dropdown.options[myindex].value;
+          var baseURL = "$appRoot/Core/File/update.vm?id=" + SelValue;
+          top.location.href = baseURL;
+
+          return true;
+        }
+        //-->
+      </SCRIPT>
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateFile")
+
+      #if($id)
+      #set ($file = $view.getFile($id))
+      #if ($User.isAllowed("UpdateFile") && $methodToCall == "UpdateFile")
+      <form name="Form" method="post" action='$link.setAction("administration/FileAction")'>
+        <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="$!{file.getName()}"><BR>
+        Path: <input type="text" id="path" name="path" value="$!{file.getPath()}"><BR>
+        Descriptor: <input type="text" id="descriptor" name="descriptor" value="$!{file.getDescriptor()}"><BR>
+        Content: <textarea id="content" name="content" cols="90" rows="30">$!{file.getContent()}</textarea><BR>
+        <input type="submit" value="update">
+      </form>
+      #end
+
+      #else
+      File:
+      #set ($files = $view.getFiles())
+      <select name=id onchange='OnChangeIt(this);'>
+        <option value="">Select one
+          #foreach ($file in $files)
+        <option value="$file.getPk()">$file.getName()
+          #end
+      </select><BR>
+
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm Wed Jul  5 14:11:29 2006
@@ -19,44 +19,44 @@
 #set ($pageSelected = "function")
 #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/Function/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-	return true;
-}
-//-->
-
-</SCRIPT>
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateFunction")
-
-#if($id)
-
-
-#set ($Function = $view.getFunction($id))
-Name: $!{Function.getName()}<BR>
-Function Command: $!{Function.getCommand()}<BR>
-
-
-#else
-Function:
-#set ($functions = $User.getFunctions())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($function in $functions)
-              			      <option value="$function.getPk()">$function.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/Function/details.vm?id=" + SelValue;
+        top.location.href = baseURL;
+        return true;
+      }
+      //-->
+
+    </SCRIPT>
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "UpdateFunction")
+
+    #if($id)
+
+
+    #set ($Function = $view.getFunction($id))
+    Name: $!{Function.getName()}<BR>
+    Function Command: $!{Function.getCommand()}<BR>
+
+
+    #else
+    Function:
+    #set ($functions = $User.getFunctions())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($function in $functions)
+      <option value="$function.getPk()">$function.getName()
+        #end
+    </select><BR>
 
 
-#end
-</div>
+    #end
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm Wed Jul  5 14:11:29 2006
@@ -19,50 +19,51 @@
 #set ($pageSelected = "function")
 #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/Function/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateFunction")
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateFunction")
-#if($id)
-#set ($Function = $view.getFunction($id))
-<form name="Form" method="post" action='$link.setAction("administration/FunctionAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-Name: <input type="text" id="functionName" name="functionName" value="$!{Function.getName()}"><BR>
-Function Command: <input type="text" id="functionCommand" name="functionCommand" value="$!{Function.getCommand()}"><BR>
-
-<input type="submit" value="Update">
-
-</form>
-#else
-Function:
-#set ($functions = $User.getFunctions())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($function in $functions)
-              			      <option value="$function.getPk()">$function.getName()
-              			      #end
-              			      </select><BR>
-
-#end
-#end
-</div>
+  <div class="messagebox">
+    <SCRIPT LANGUAGE=javascript>
+      <!--
+      function OnChange(dropdown)
+      {
+        var myindex = dropdown.selectedIndex;
+        var SelValue = dropdown.options[myindex].value;
+        var baseURL = "$appRoot/Core/Function/update.vm?id=" + SelValue;
+        top.location.href = baseURL;
+
+        return true;
+      }
+      //-->
+    </SCRIPT>
+
+
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "UpdateFunction")
+    #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateFunction")
+    #if($id)
+    #set ($Function = $view.getFunction($id))
+    <form name="Form" method="post" action='$link.setAction("administration/FunctionAction")'>
+      <input type="hidden" id="id" name="id" value="$!{id}">
+      <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+
+      Name: <input type="text" id="functionName" name="functionName" value="$!{Function.getName()}"><BR>
+      Function Command: <input type="text" id="functionCommand" name="functionCommand"
+                               value="$!{Function.getCommand()}"><BR>
+
+      <input type="submit" value="Update">
+
+    </form>
+    #else
+    Function:
+    #set ($functions = $User.getFunctions())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($function in $functions)
+      <option value="$function.getPk()">$function.getName()
+        #end
+    </select><BR>
+
+    #end
+    #end
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm Wed Jul  5 14:11:29 2006
@@ -19,46 +19,47 @@
 #set ($pageSelected = "instance")
 #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>Instance</b>
-  </td>
-  <td align="right">
-  #parse("Core/Instance/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/InstanceAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="instanceName" name="instanceName" value="$!{instanceName}">
-</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="AddInstance">
-<input type="submit" value="submit">
-</form>
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - <b>Instance</b>
+        </td>
+        <td align="right">
+          #parse("Core/Instance/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <form name="Form" method="post" action='$link.setAction("administration/InstanceAction")'>
+        <table>
+          <tr>
+            <td>
+              Name:
+            </td>
+            <td>
+              <input type="text" id="instanceName" name="instanceName" value="$!{instanceName}">
+            </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="AddInstance">
+        <input type="submit" value="submit">
+      </form>
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm?rev=419344&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/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/Instance/confirm.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm Wed Jul  5 14:11:29 2006
@@ -19,75 +19,77 @@
 #set ($pageSelected = "instance")
 #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>Instance</b>
-  </td>
-  <td align="right">
-  #parse("Core/Instance/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Instance/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateInstance")
-
-
-#if($id)
-
-#if ($User.isAllowed("ViewInstance") && $methodToCall == "UpdateInstance")
-#set ($instance = $view.getInstance($id))
-Name: $!{instance.getName()}<br>
-Comments:  <textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{instance.getComments()} </textarea><BR>
-#end
-
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateInstance")
-<a href="$appRoot/Core/Instance/update.vm?id=$id">Update this Instance</a> &nbsp;<BR><BR>
-#end
-
-#if ($User.isAllowed("DeleteInstance"))
-  <form name="Form" method="post" action='$appRoot/administration/Instance/Delete.do'>
-  <input type=hidden name="methodToCall" value="delete" >
-  <input type=hidden name=id value="$id" >
-  <input type="submit" value="Delete">
-  </form>
-#end
-
-
-#else
-Instance:
-#set ($insts = $view.getInstances())
-               <select name=Id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($inst in $insts)
-              			      <option value="$inst.getPk()">$inst.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>Instance</b>
+        </td>
+        <td align="right">
+          #parse("Core/Instance/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      <SCRIPT LANGUAGE=javascript>
+        <!--
+        function OnChange(dropdown)
+        {
+          var myindex = dropdown.selectedIndex;
+          var SelValue = dropdown.options[myindex].value;
+          var baseURL = "$appRoot/Core/Instance/details.vm?id=" + SelValue;
+          top.location.href = baseURL;
+
+          return true;
+        }
+        //-->
+      </SCRIPT>
+
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateInstance")
+
+
+      #if($id)
+
+      #if ($User.isAllowed("ViewInstance") && $methodToCall == "UpdateInstance")
+      #set ($instance = $view.getInstance($id))
+      Name: $!{instance.getName()}<br>
+      Comments: <textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{instance.getComments()} </textarea>
+      <BR>
+      #end
+
+      #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateInstance")
+      <a href="$appRoot/Core/Instance/update.vm?id=$id">Update this Instance</a> &nbsp;<BR><BR>
+      #end
+
+      #if ($User.isAllowed("DeleteInstance"))
+      <form name="Form" method="post" action='$appRoot/administration/Instance/Delete.do'>
+        <input type=hidden name="methodToCall" value="delete">
+        <input type=hidden name=id value="$id">
+        <input type="submit" value="Delete">
+      </form>
+      #end
+
+
+      #else
+      Instance:
+      #set ($insts = $view.getInstances())
+      <select name=Id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($inst in $insts)
+        <option value="$inst.getPk()">$inst.getName()
+          #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/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/Instance/$page">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Core/Instance/details.vm">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("AddHostingPool"))
-<option value="$appRoot/Core/Instance/add.vm">&nbsp;Add&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateHostingPool"))
-<option value="$appRoot/Core/Instance/update.vm">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteHostingPool"))
-<option value="$appRoot/Core/Instance/delete.vm">&nbsp;Delete&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Core/Instance/$page">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Core/Instance/details.vm">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("AddHostingPool"))
+  <option value="$appRoot/Core/Instance/add.vm">&nbsp;Add&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateHostingPool"))
+  <option value="$appRoot/Core/Instance/update.vm">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteHostingPool"))
+  <option value="$appRoot/Core/Instance/delete.vm">&nbsp;Delete&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.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/Instance/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Core/Instance/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("AddHostingPool"))
-<option value="$appRoot/Core/Instance/add.vm">&nbsp;Add&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateHostingPool"))
-<option value="$appRoot/Core/Instance/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteHostingPool"))
-<option value="$appRoot/Core/Instance/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Core/Instance/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Core/Instance/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("AddHostingPool"))
+  <option value="$appRoot/Core/Instance/add.vm">&nbsp;Add&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateHostingPool"))
+  <option value="$appRoot/Core/Instance/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteHostingPool"))
+  <option value="$appRoot/Core/Instance/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm Wed Jul  5 14:11:29 2006
@@ -19,65 +19,66 @@
 #set ($pageSelected = "instance")
 #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>Instance</b>
-  </td>
-  <td align="right">
-  #parse("Core/Instance/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/Instance/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateInstance")
-
-
-#if($id)
-#if ($User.isAllowed("UpdateInstance") && $methodToCall == "UpdateInstance")
-#set ($instance = $view.getInstance($id))
-<form name="Form" method="post" action='$link.setAction("administration/InstanceAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-Name: <input type="text"  readonly id="instanceName" name="instanceName" value="$!{instance.getName()}"><br>
-Comments:  <textarea id="comments" name="comments" cols="40" rows="5"> $!{instance.getComments()} </textarea><BR>
-<input type="submit" value="Update">
-</form>
-#end
-#else
-Instance:
-#set ($insts = $view.getInstances())
-               <select name=Id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($inst in $insts)
-              			      <option value="$inst.getPk()">$inst.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>Instance</b>
+        </td>
+        <td align="right">
+          #parse("Core/Instance/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      <SCRIPT LANGUAGE=javascript>
+        <!--
+        function OnChange(dropdown)
+        {
+          var myindex = dropdown.selectedIndex;
+          var SelValue = dropdown.options[myindex].value;
+          var baseURL = "$appRoot/Core/Instance/update.vm?id=" + SelValue;
+          top.location.href = baseURL;
+
+          return true;
+        }
+        //-->
+      </SCRIPT>
+
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateInstance")
+
+
+      #if($id)
+      #if ($User.isAllowed("UpdateInstance") && $methodToCall == "UpdateInstance")
+      #set ($instance = $view.getInstance($id))
+      <form name="Form" method="post" action='$link.setAction("administration/InstanceAction")'>
+        <input type="hidden" id="id" name="id" value="$!{id}">
+        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+
+        Name: <input type="text" readonly id="instanceName" name="instanceName" value="$!{instance.getName()}"><br>
+        Comments: <textarea id="comments" name="comments" cols="40" rows="5"> $!{instance.getComments()} </textarea><BR>
+        <input type="submit" value="Update">
+      </form>
+      #end
+      #else
+      Instance:
+      #set ($insts = $view.getInstances())
+      <select name=Id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($inst in $insts)
+        <option value="$inst.getPk()">$inst.getName()
+          #end
+      </select><BR>
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm Wed Jul  5 14:11:29 2006
@@ -19,24 +19,24 @@
 #set ($pageSelected = "Administration")
 #parse("/layout/header.vm")
 <div id="center">
-<div class="bigright">
+  <div class="bigright">
 
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateIp")
-#set ($Ip = $view.getIp($id))
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "UpdateIp")
+    #set ($Ip = $view.getIp($id))
 
-#if ($User.isAllowed("UpdateIp") && $methodToCall == "UpdateIp")
-<form name="Form" method="post" action='$link.setAction("administration/IpAction")'>
-<input type="hidden" id="id" name="id" value="$!{id}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+    #if ($User.isAllowed("UpdateIp") && $methodToCall == "UpdateIp")
+    <form name="Form" method="post" action='$link.setAction("administration/IpAction")'>
+      <input type="hidden" id="id" name="id" value="$!{id}">
+      <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
-Ip: <input type="text" id="ip" name="ip" value="$!{Ip.getName()}">
+      Ip: <input type="text" id="ip" name="ip" value="$!{Ip.getName()}">
 
-<input type="submit" value="Update">
+      <input type="submit" value="Update">
 
-</form>
-#end
-</div>
+    </form>
+    #end
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm Wed Jul  5 14:11:29 2006
@@ -21,84 +21,85 @@
 
 #set ($jobPoolId = $request.getParameter("Id"))
 <div align="center" class="contentbox">
-<br /><br />
-<table cellpadding="0" cellspacing="0" border="0">
-<tr>
-	<td valign="middle">
-		<form action="$appRoot/Core/JobPool/recent.vm" method="post">
-		#submit_button("submit" "< Back" "button" "")
-		</form>
-	</td>
-	<td valign="middle">
-		<form action="details.vm" method="post">
-		<input type="hidden" name="jobPoolId" value="$!jobPoolId">
-		#submit_button("Submit" "&nbsp;Refresh&nbsp;" "button" "")
-		</form>
-	</td>
-</tr>
-</table>
-
-<br>
-
-##get recent jobs.
-
-   #set ($jobPool = $view.getJobPool($jobPoolId) )
-
-
-<table width="90%" border="0" cellspacing="1" cellpadding="1">
-	<tr class="info"><td colspan="3">Job details for Job ID - $jobPool.getName()</td></tr>
-
-	<tr class="body">
-		<td width="30%">Project Name </td>
-		#if($jobPool.getProject())
-		<td width="70%" colspan=2><A href="$appRoot/Core/Project/details.vm?projectId=$!{jobPool.getProject().getPk()}">$!{jobPool.getProject().getName()}</a> </td>
-		#else
-		<td width="70%" colspan=2> </td>
-		#end
-	</tr>
-	<tr class="body">
-		<td>Job </td>
-		<td colspan=2>$jobPool.getFunction().getName() </td>
-	</tr>
-	<tr class="body">
-		<td>User </td>
-		<td colspan=2>$jobPool.getUser().getName() </td>
-	</tr>
-	<tr class="body">
-		<td>Start Time </td>
-		<td colspan=2>$jobPool.getStartTime() </td>
-	</tr>
-	<tr class="body">
-		<td>Finish Time </td>
-		<td colspan=2>$!{jobPool.getFinishTime()} </td>
-	</tr>
-	<tr class="body">
-		<td>Options </td>
-		<td colspan=2>$!{jobPool.getOptions()} </td>
-	</tr>
-  #set ($sortedJobs = $jobPool.getSortedJobs())
-	#foreach ($hardwareName in $sortedJobs.keySet())
-
-			<tr valign="top"><td colspan="2">&nbsp;</td></tr>
-			<tr class="info" valign="top"><td colspan="3">Details for Server - $hardwareName </td></tr>
-			<tr class="body">
-				<td width="15%"><b>Job Name</b></td>
-				<td width="10%"><b>Job State</b></td>
-				<td width="75%"><b>Job Result</b></td>
-			</tr>
+  <br/><br/>
+  <table cellpadding="0" cellspacing="0" border="0">
+    <tr>
+      <td valign="middle">
+        <form action="$appRoot/Core/JobPool/recent.vm" method="post">
+          #submit_button("submit" "<Back" "button" "")
+        </form>
+      </td>
+      <td valign="middle">
+        <form action="details.vm" method="post">
+          <input type="hidden" name="jobPoolId" value="$!jobPoolId">
+          #submit_button("Submit" "&nbsp;Refresh&nbsp;" "button" "")
+        </form>
+      </td>
+    </tr>
+  </table>
+
+  <br>
+
+  ##get recent jobs.
+
+  #set ($jobPool = $view.getJobPool($jobPoolId) )
+
+
+  <table width="90%" border="0" cellspacing="1" cellpadding="1">
+    <tr class="info"><td colspan="3">Job details for Job ID - $jobPool.getName()</td></tr>
+
+    <tr class="body">
+      <td width="30%">Project Name </td>
+      #if($jobPool.getProject())
+      <td width="70%" colspan=2><A href="$appRoot/Core/Project/details.vm?projectId=$!{jobPool.getProject().getPk()}">$!{jobPool.getProject().getName()}</a>
+      </td>
+      #else
+      <td width="70%" colspan=2></td>
+      #end
+    </tr>
+    <tr class="body">
+      <td>Job </td>
+      <td colspan=2>$jobPool.getFunction().getName() </td>
+    </tr>
+    <tr class="body">
+      <td>User </td>
+      <td colspan=2>$jobPool.getUser().getName() </td>
+    </tr>
+    <tr class="body">
+      <td>Start Time </td>
+      <td colspan=2>$jobPool.getStartTime() </td>
+    </tr>
+    <tr class="body">
+      <td>Finish Time </td>
+      <td colspan=2>$!{jobPool.getFinishTime()} </td>
+    </tr>
+    <tr class="body">
+      <td>Options </td>
+      <td colspan=2>$!{jobPool.getOptions()} </td>
+    </tr>
+    #set ($sortedJobs = $jobPool.getSortedJobs())
+    #foreach ($hardwareName in $sortedJobs.keySet())
+
+    <tr valign="top"><td colspan="2">&nbsp;</td></tr>
+    <tr class="info" valign="top"><td colspan="3">Details for Server - $hardwareName </td></tr>
+    <tr class="body">
+      <td width="15%"><b>Job Name</b></td>
+      <td width="10%"><b>Job State</b></td>
+      <td width="75%"><b>Job Result</b></td>
+    </tr>
     #foreach ($Job in $sortedJobs.get($hardwareName).values())
-				<tr class="body">
-					<td>$Job.getName() - $Job.getFunction().getCommand() </td>
-					<td>
-					<font color="$Job.getState().getColor()">$Job.getState().getName() </font>
-					</td>
-					<td> #if($Job.getState().getPk() > 3) $Job.getResult().replaceAll("\n","<br />") #end </td>
-				</tr>
-		#end
-	#end
+    <tr class="body">
+      <td>$Job.getName() - $Job.getFunction().getCommand() </td>
+      <td>
+        <font color="$Job.getState().getColor()">$Job.getState().getName() </font>
+      </td>
+      <td> #if($Job.getState().getPk() > 3) $Job.getResult().replaceAll("\n","<br/>") #end </td>
+    </tr>
+    #end
+    #end
 
-</table>
-<br />
+  </table>
+  <br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm Wed Jul  5 14:11:29 2006
@@ -24,82 +24,84 @@
 #set ($numToShow = 10)
 #end
 <div align="center" class="contentbox">
-<br /><br />
+  <br/><br/>
 
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td width="33%">My Recent Jobs
-	 #foreach ($num in [10,20,30])
-		&nbsp;<a class="info" href="$appRoot/Core/JobPool/recent.vm?nj=$num">$num</a> &nbsp;
-	 #end
-	 &nbsp;
-  </td>
-  <td width="33%" align=center>
-	 	<form action="$appRoot/Core/JobPool/recent.vm?nj=$numToShow" method="post">
-		#submit_button("Submit" "&nbsp;Refresh&nbsp;" "button" "")
-		</form>
-  </td>
-	<td width="33%" align=right>
-      <a class="info" href="$appRoot/Core/JobPool/search.vm">Search Jobs</a> &nbsp;&nbsp;
-             </td>
-</tr>
-</table>
-
-
-#messagesMarkup()
-#errorMarkup()
-#if ($ErrorMessage)
-  <font color=red>$!ErrorMessage</font>
-#end
-$!ResultMessage
-<br />
-
-##get recent jobs.
-#set ($recentJobs = $User.getRecentJobPools($numToShow))
-<table width="95%" border="0" cellspacing="0" cellpadding="1">
-	<tr class="info">
-		<td width="28%">Project</td>
-		<td width="20%">Action</td>
-		<td width="20%">Time</td>
-		<td width="12%">Status</td>
-	</tr>
-#if(!$recentJobs || $recentJobs.isEmpty())
-	<tr class="headercolor1"><td colspan="5">No recent jobs for $User.getName() - $User.getFirstName() $User.getLastName() </td></tr>
-#else
-  #set($c=1)
-	#foreach($job in $recentJobs)
-		<tr class="headercolor$c">
-
-		<td>
-		#if($job.getProject())
-		<a href="$appRoot/Core/Project/details.vm?projectId=$!{job.getProject().getPk()}">$!{job.getProject().getName()}</a>
-		#end
-		</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">
-    #if($job.getState().getName())
-<!--		$job.getState().getName() -->
-    Details
-		#else
-		Details
-		#end
-		</a>
-		</td>
-		</tr>
-		#if ($c == 1)
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td width="33%">My Recent Jobs
+          #foreach ($num in [10,20,30])
+          &nbsp;<a class="info" href="$appRoot/Core/JobPool/recent.vm?nj=$num">$num</a> &nbsp;
+          #end
+          &nbsp;
+        </td>
+        <td width="33%" align=center>
+          <form action="$appRoot/Core/JobPool/recent.vm?nj=$numToShow" method="post">
+            #submit_button("Submit" "&nbsp;Refresh&nbsp;" "button" "")
+          </form>
+        </td>
+        <td width="33%" align=right>
+          <a class="info" href="$appRoot/Core/JobPool/search.vm">Search Jobs</a> &nbsp;&nbsp;
+        </td>
+      </tr>
+    </table>
+
+
+    #messagesMarkup()
+    #errorMarkup()
+    #if ($ErrorMessage)
+    <font color=red>$!ErrorMessage</font>
+    #end
+    $!ResultMessage
+    <br/>
+
+    ##get recent jobs.
+    #set ($recentJobs = $User.getRecentJobPools($numToShow))
+    <table width="95%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info">
+        <td width="28%">Project</td>
+        <td width="20%">Action</td>
+        <td width="20%">Time</td>
+        <td width="12%">Status</td>
+      </tr>
+      #if(!$recentJobs || $recentJobs.isEmpty())
+      <tr class="headercolor1"><td colspan="5">No recent jobs for $User.getName() - $User.getFirstName()
+        $User.getLastName() </td></tr>
+      #else
+      #set($c=1)
+      #foreach($job in $recentJobs)
+      <tr class="headercolor$c">
+
+        <td>
+          #if($job.getProject())
+          <a href="$appRoot/Core/Project/details.vm?projectId=$!{job.getProject().getPk()}">$!{job.getProject().getName()}</a>
+          #end
+        </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">
+          #if($job.getState().getName())
+          <!--		$job.getState().getName() -->
+          Details
+          #else
+          Details
+          #end
+        </a>
+        </td>
+      </tr>
+      #if ($c == 1)
       #set($c=2)
-    #else
+      #else
       #set($c=1)
-    #end
-	#end
-#end
-</table>
-<br />
-</div>
+      #end
+      #end
+      #end
+    </table>
+    <br/>
+  </div>
 
-<br />
+  <br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm Wed Jul  5 14:11:29 2006
@@ -20,36 +20,34 @@
 #parse("/layout/header.vm")
 
 
-
-
 <div align="center" class="contentbox">
-<br /><br />
+  <br/><br/>
 
-<table width="90%" border="0" cellspacing="1" cellpadding="1">
+  <table width="90%" border="0" cellspacing="1" cellpadding="1">
 
-  #set ($sortedJobs = $view.getRunningJobs())
-	#foreach ($hardwareName in $sortedJobs.keySet())
+    #set ($sortedJobs = $view.getRunningJobs())
+    #foreach ($hardwareName in $sortedJobs.keySet())
 
-			<tr valign="top"><td colspan="2">&nbsp;</td></tr>
-			<tr class="info" valign="top"><td colspan="3">Details for Server - $hardwareName </td></tr>
-			<tr class="body">
-				<td width="15%"><b>Job Name</b></td>
-				<td width="10%"><b>Job State</b></td>
-				<td width="75%"><b>Job StartTime</b></td>
-			</TR>
+    <tr valign="top"><td colspan="2">&nbsp;</td></tr>
+    <tr class="info" valign="top"><td colspan="3">Details for Server - $hardwareName </td></tr>
+    <tr class="body">
+      <td width="15%"><b>Job Name</b></td>
+      <td width="10%"><b>Job State</b></td>
+      <td width="75%"><b>Job StartTime</b></td>
+    </TR>
     #foreach ($Job in $sortedJobs.get($hardwareName).values())
-				<tr class="body">
-					<td>$Job.getName() - $Job.getFunction().getCommand() </td>
-					<td>
-					<font color="$Job.getState().getColor()">$Job.getState().getName() </font>
-					</td>
-					<td> $Job.getStartTime() </td>
-				</tr>
-		#end
-	#end
+    <tr class="body">
+      <td>$Job.getName() - $Job.getFunction().getCommand() </td>
+      <td>
+        <font color="$Job.getState().getColor()">$Job.getState().getName() </font>
+      </td>
+      <td> $Job.getStartTime() </td>
+    </tr>
+    #end
+    #end
 
-</table>
+  </table>
 
-<br />
+  <br/>
 </div>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm Wed Jul  5 14:11:29 2006
@@ -20,9 +20,9 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
 #if($filter || $StartDate || $EndDate || $userId || $functions)
-#set($results = $view.getJobPools($userId, $filter, $StartDate, $EndDate,  $functions))
+#set($results = $view.getJobPools($userId, $filter, $StartDate, $EndDate, $functions))
 #end
 
 #tooltippopup("StartDatePopBox" "<ul>Format for the start date:<li>MM/DD/YY</li><li>MM/DD/YY HH:MM</li></ul>")
@@ -32,123 +32,113 @@
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td width="33%">Search Jobs
-  </td>
-  <td width="33%" align=center>
-	 	<form action="$appRoot/Core/JobPool/search.vm" method="post">
-	 	<form type="hidden" name="filter" value="$!filter">
-	 	<form type="hidden" name="StartDate" value="$!StartDate">
-	 	<form type="hidden" name="EndDate" value="$!EndDate">
-	 	<form type="hidden" name="userId" value="$!userId">
-	 	#foreach($f in $functions)
-	 	<form type="hidden" name="functions" value="$!f">
-	 	#end
-		#submit_button("Submit" "&nbsp;Refresh&nbsp;" "button" "")
-		</form>
-  </td>
-	<td  width="33%" align=right>
+  <tr class="info" valign="top">
+    <td width="33%">Search Jobs
+    </td>
+    <td width="33%" align=center>
+      <form action="$appRoot/Core/JobPool/search.vm" method="post">
+        <form type="hidden" name="filter" value="$!filter">
+          <form type="hidden" name="StartDate" value="$!StartDate">
+            <form type="hidden" name="EndDate" value="$!EndDate">
+              <form type="hidden" name="userId" value="$!userId">
+                #foreach($f in $functions)
+                <form type="hidden" name="functions" value="$!f">
+                  #end
+                  #submit_button("Submit" "&nbsp;Refresh&nbsp;" "button" "")
+                </form>
+    </td>
+    <td width="33%" align=right>
       <a class="info" href="$appRoot/Core/JobPool/recent.vm">Back to My Jobs</a>
-             </td>
-</tr>
+    </td>
+  </tr>
 </table>
 
 <br>
 
 #if ($results)
 <table width="90%" border="0" cellspacing="1" cellpadding="1">
-	<tr class="info">
-		<td width="28%">Project</td>
-		<td width="15%">User</td>
-		<td width="15%">Action</td>
-		<td width="15%">Time</td>
-		<td width="7%">Status</TD>
-	</TR>
-#if(!$results || $results.isEmpty())
-	<tr class="headercolor5"><td colspan="4">No jobs fit your search results. </td></tr>
-#else
+  <tr class="info">
+    <td width="28%">Project</td>
+    <td width="15%">User</td>
+    <td width="15%">Action</td>
+    <td width="15%">Time</td>
+    <td width="7%">Status</TD>
+  </TR>
+  #if(!$results || $results.isEmpty())
+  <tr class="headercolor5"><td colspan="4">No jobs fit your search results. </td></tr>
+  #else
   #set($c=1)
-	#foreach($job in $results)
-		<tr class="headercolor$c">
+  #foreach($job in $results)
+  <tr class="headercolor$c">
 
-		<td >
-		#if($job.getProject())
-		<A href="$appRoot/ProjectDetails.vm?projectId=$!{job.getProject().getPk()}">$!{job.getProject().getName()}</a>
-		#end
-		</td>
-		<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">
-    #if($job.getState().getName())
-		$job.getState().getName()
-		#else
-		Details
-		#end
-		</a>
-		</td>
-		</tr>
-		#if ($c == 1)
-      #set($c=2)
-    #else
-      #set($c=1)
-    #end
-	#end
-#end
+    <td>
+      #if($job.getProject())
+      <A href="$appRoot/ProjectDetails.vm?projectId=$!{job.getProject().getPk()}">$!{job.getProject().getName()}</a>
+      #end
+    </td>
+    <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">
+      #if($job.getState().getName())
+      $job.getState().getName()
+      #else
+      Details
+      #end
+    </a>
+    </td>
+  </tr>
+  #if ($c == 1)
+  #set($c=2)
+  #else
+  #set($c=1)
+  #end
+  #end
+  #end
 </table>
 <br>
 #end
 
 <table width="90%" class="messagebox" align="center">
-<tr><td align=center>
-<br />
-<form action="$appRoot/Core/JobPool/search.vm">
-<table width="50%">
-<tr><td>Filter: </td><td colspan=2><input type="text" name="filter" value="$!filter" /></td></tr>
-<tr><td>Date Range: </td><td colspan=2><input type="text" name="StartDate" value="$!StartDate" />&nbsp;#anchortippopup("StartDatePopBox" "$appRoot/Help/index.vm")</td></tr>
-<tr><td> &nbsp;</td><td>to:</td><td> <input type="text" name="EndDate" value="$!EndDate" />&nbsp;#anchortippopup("EndDatePopBox" "$appRoot/Help/index.vm")</td></tr>
-#set ($users = $view.getUsers())
-<tr><td>User: </td><td colspan=2><select name=userid>
-			      <option value=""> </option>
-			      #foreach ($u in $users)
-			      <option value=$u.getPk()>$u.getName()</option>
-			      #end
-			      </select>&nbsp;#anchortippopup("UserPopBox" "$appRoot/Help/index.vm")</td></tr>
-<tr><td>Function:</td><td colspan=2>
-<select name="functions" size=5 multiple>
+  <tr><td align=center>
+    <br/>
+
+    <form action="$appRoot/Core/JobPool/search.vm">
+      <table width="50%">
+        <tr><td>Filter: </td><td colspan=2><input type="text" name="filter" value="$!filter"/></td></tr>
+        <tr><td>Date Range: </td><td colspan=2><input type="text" name="StartDate" value="$!StartDate"/>&nbsp;#anchortippopup("StartDatePopBox"
+          "$appRoot/Help/index.vm")</td></tr>
+        <tr><td> &nbsp;</td><td>to:</td><td><input type="text" name="EndDate" value="$!EndDate"/>&nbsp;#anchortippopup("EndDatePopBox"
+          "$appRoot/Help/index.vm")</td></tr>
+        #set ($users = $view.getUsers())
+        <tr><td>User: </td><td colspan=2><select name=userid>
+          <option value=""></option>
+          #foreach ($u in $users)
+          <option value=$u.getPk()>$u.getName()</option>
+          #end
+        </select>&nbsp;#anchortippopup("UserPopBox" "$appRoot/Help/index.vm")</td></tr>
+        <tr><td>Function:</td><td colspan=2>
+          <select name="functions" size=5 multiple>
             #foreach ($f in $view.getFunctions())
             <option value=$f.getPk()>$f.getName()</option>
             #end
-         </select>&nbsp;#anchortippopup("FunctionPopBox" "$appRoot/Help/index.vm")</td></tr>
-<tr><td colspan=3 align=center>		#submit_button("Submit" "Search" "button" "")</td></tr>
-</table>
+          </select>&nbsp;#anchortippopup("FunctionPopBox" "$appRoot/Help/index.vm")</td></tr>
+        <tr><td colspan=3 align=center> #submit_button("Submit" "Search" "button" "")</td></tr>
+      </table>
 
 
-</form>
-<br>
-</td></tr></table>
+    </form>
+    <br>
+  </td></tr></table>
 
 <br>
 <br>
 
 
-
-
-
-
-<br />
+<br/>
 </div>
-<br /></div>
-
-
-
-
-
-
-
-
-
-
+<br/></div>
 
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm Wed Jul  5 14:11:29 2006
@@ -19,78 +19,79 @@
 #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>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-<form name="Form" method="post" action='$link.setAction("administration/HostingPoolAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="poolName" name="poolName" value="$!{poolName}">
-</td>
-</tr>
-<tr>
-<td>
-TomcatPool:
-</td>
-<td>
-#set ($tps = $view.getTomcatPools())
-<select name=tomcatPoolId>
-			      #foreach ($tp in $tps)
-			      <option value="$tp.getPk()">$tp.getName()
-			      #end
-			      </select>
-
-</td>
-</tr>
-<tr>
-<td>
-Apache Pool:
-</td>
-<td>
-#set ($aps = $view.getApachePools())
-<select name=apachePoolId>
-			      #foreach ($ap in $aps)
-			      <option value="$ap.getPk()">$ap.getName()
-			      #end
-			      </select>
-
-</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>
-</table>
-<input type="hidden" name="methodToCall" value="AddHostingPool">
-<input type="submit" value="submit">
-</form>
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - <b>Hosting Pool</b>
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      <form name="Form" method="post" action='$link.setAction("administration/HostingPoolAction")'>
+        <table>
+          <tr>
+            <td>
+              Name:
+            </td>
+            <td>
+              <input type="text" id="poolName" name="poolName" value="$!{poolName}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              TomcatPool:
+            </td>
+            <td>
+              #set ($tps = $view.getTomcatPools())
+              <select name=tomcatPoolId>
+                #foreach ($tp in $tps)
+                <option value="$tp.getPk()">$tp.getName()
+                  #end
+              </select>
+
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Apache Pool:
+            </td>
+            <td>
+              #set ($aps = $view.getApachePools())
+              <select name=apachePoolId>
+                #foreach ($ap in $aps)
+                <option value="$ap.getPk()">$ap.getName()
+                  #end
+              </select>
+
+            </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>
+        </table>
+        <input type="hidden" name="methodToCall" value="AddHostingPool">
+        <input type="submit" value="submit">
+      </form>
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm Wed Jul  5 14:11:29 2006
@@ -15,14 +15,18 @@
 ##
 ## $Id$
 ##
-<!-- $function $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()
-</form>
-#end
+<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>
\ No newline at end of file

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm Wed Jul  5 14:11:29 2006
@@ -21,190 +21,195 @@
 #set ($id = $request.getParameter("id"))
 #set ($methodToCall = "UpdateHostingPool")
 <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>Hosting Pool</b>
-  </td>
-  <td align="right">
-  #parse("Core/Pool/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan="2">Infrastructure - <b>Hosting Pool</b>
+    </td>
+    <td align="right">
+      #parse("Core/Pool/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
 #if ($id)
 #set ($ent = $view.getHostingPool($id))
 #set ($hp = $ent)
 #end
 #if ($hp)
-  <table width="95%" border="0" cellspacing="0" cellpadding="1">
+<table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr class="info" valign="top">
-  <td colspan=2>Hosting Pool
-  #if ($hp)
-    - <b>$hp.getName()</b>
-  #end
-  </td>
-  <td align="right">
-  #if($ent)
-    #parse("/Core/Pool/menu/indiv.vm")
-  #else
-    #parse("/Core/Pool/menu/global.vm")
-  #end
-  </td>
+    <td colspan=2>Hosting Pool
+      #if ($hp)
+      - <b>$hp.getName()</b>
+      #end
+    </td>
+    <td align="right">
+      #if($ent)
+      #parse("/Core/Pool/menu/indiv.vm")
+      #else
+      #parse("/Core/Pool/menu/global.vm")
+      #end
+    </td>
   </tr>
   <tr class="headercolor1">
-  <td>Apache Pool:</td><td><a href="$appRoot/Apache/Pool/details.vm?id=$!{hp.getApachePool().getPk()}">$!{hp.getApachePool().getName()}</a></td>
-  <td align="right">
-  #set($ent = $hp.getApachePool())
-  #if ($ent)
-    #parse("/Apache/Pool/menu/indiv.vm")
-  #end
-  </td></tr>
+    <td>Apache Pool:</td><td><a href="$appRoot/Apache/Pool/details.vm?id=$!{hp.getApachePool().getPk()}">$!{hp.getApachePool().getName()}</a>
+  </td>
+    <td align="right">
+      #set($ent = $hp.getApachePool())
+      #if ($ent)
+      #parse("/Apache/Pool/menu/indiv.vm")
+      #end
+    </td></tr>
   <tr class="headercolor2">
-  <td>Tomcat Pool:</td><td><a href="$appRoot/Tomcat/Pool/details.vm?id=$!{hp.getTomcatPool().getPk()}">$!{hp.getTomcatPool().getName()}</a></td> 
-  <td align="right">
-  #set($ent = $hp.getTomcatPool())
-  #if ($ent)
-    #parse("/Tomcat/Pool/menu/indiv.vm")
-  #end
-  </td></tr>
+    <td>Tomcat Pool:</td><td><a href="$appRoot/Tomcat/Pool/details.vm?id=$!{hp.getTomcatPool().getPk()}">$!{hp.getTomcatPool().getName()}</a>
+  </td>
+    <td align="right">
+      #set($ent = $hp.getTomcatPool())
+      #if ($ent)
+      #parse("/Tomcat/Pool/menu/indiv.vm")
+      #end
+    </td></tr>
   <tr class="headercolor1">
-  <td>Environment:</td><td><a href="$appRoot/Core/Environment/details.vm?id=$!{hp.getEnv().getPk()}">$!{hp.getEnv().getName()}</a></td><td> </td>
+    <td>Environment:</td><td><a href="$appRoot/Core/Environment/details.vm?id=$!{hp.getEnv().getPk()}">$!{hp.getEnv().getName()}</a>
+  </td><td></td>
   </tr>
-  </table>
-  
-  
-  #set ($apachePool = $hp.getApachePool())
-  #set ($vhosts = $view.getVirtualHosts($User, $apachePool))
+</table>
+
+
+#set ($apachePool = $hp.getApachePool())
+#set ($vhosts = $view.getVirtualHosts($User, $apachePool))
 #if( $vhosts && ! $vhosts.isEmpty())
 <br>
-  <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 >
-	  Virtualhosts
-	</b>
-	</td>
-  </tr>
-  <tr class="info">
+    <td align="left" valign="center" colspan=4>
+      Virtualhosts
+    </b>
+  </td>
+</tr>
+<tr class="info">
   <th width=25%> Hostname </th>
   <th width=15%> Environment </th>
   <th width=30%> Worker </th>
-  <th width=30%>  </th>
-  </tr>
-  #set($c = 1)
-	#foreach ($vhost in $vhosts)
-		#set ($count = 1)
-    	<tr class="headercolor$c">
-		  <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()} </td>
-    	<td> $!{vhost.getEnv().getName()} </td>
-		<td>
-		#foreach ($apacheWorker in $apachePool.getApaches())
-		  <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br>
-		#end
-		</td>
-		<td align="right">
-      #if ($User.isAllowed("AddContext") || $User.isAllowed("DeleteVirtualHost", $vhost) || $User.isAllowed("ViewVirtualHost",  $vhost) || $User.isAllowed("UpdateVirtualHost", $vhost))
-	      <select name=methodToCall onchange='OnChange(this);'>
-       	<option value="" selected>Select Action
+  <th width=30%></th>
+</tr>
+#set($c = 1)
+#foreach ($vhost in $vhosts)
+#set ($count = 1)
+<tr class="headercolor$c">
+  <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()}</td>
+  <td> $!{vhost.getEnv().getName()} </td>
+  <td>
+    #foreach ($apacheWorker in $apachePool.getApaches())
+    <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br>
+    #end
+  </td>
+  <td align="right">
+    #if ($User.isAllowed("AddContext") || $User.isAllowed("DeleteVirtualHost", $vhost) ||
+    $User.isAllowed("ViewVirtualHost", $vhost) || $User.isAllowed("UpdateVirtualHost", $vhost))
+    <select name=methodToCall onchange='OnChange(this);'>
+      <option value="" selected>Select Action
         #if ($User.isAllowed("AddContext"))
-          <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}">Add a context
-          <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}">Add an existing context
+      <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}">Add a context
+      <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}">Add an existing context
         #end
         <!-- $User.isAllowed("DeleteVirtualHost", $vhost) -->
         #if ($User.isAllowed("DeleteVirtualHost", $vhost))
-          <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost
+      <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost
         #end
         #if ($User.isAllowed("UpdateVirtualHost", $vhost))
-          <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}">Modify this Vhost
+      <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}">Modify this Vhost
         #end
         #if ($User.isAllowed("ViewVirtualHost", $vhost))
-          <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost
+      <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost
         #end
-        </select>
-      #end
-		</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
+    </select>
+    #end
+  </td>
+</tr>
+#set ($count = $math.add($count, 1))
+#if ($c == 1)
+#set($c=2)
+#else
+#set($c=1)
+#end
+#end ##of all servers for this context
 </TABLE>
-#end 	## of all contexts
+#end ## of all contexts
 
 #set ($tomcatPool = $hp.getTomcatPool())
 #set ($projectContexts = $view.getTomcatContexts($User, $tomcatPool))
 #if( $projectContexts && ! $projectContexts.isEmpty())
 <br>
-  <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()}"> $!{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()}"> $!{context.getName()} </td>
-    	<td> $!{context.getEnv().getName()} </td>
-		#end
-		<td>
-		#foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
-		  <A href="$appRoot/Tomcat/Worker/$page?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
-		#end
-		</td>
-		<td align="right">
-		<!-- before macro -->
-		<!-- $context -->
-		<!-- start macro -->
-		#contextDropBoxWOproject($User $context)
-		</td>
- 	  </tr>
-		#set ($count = $math.add($count, 1))
-        #if ($c == 1)
-          #set($c=2)
-        #else
-          #set($c=1)
-        #end
-	#end ##of all servers for this context
+  <th width=30%></th>
+</tr>
+#set($c = 1)
+#foreach ($context in $projectContexts)
+#set ($count = 1)
+#set ($tomcatPool = $context.getTomcatPool())
+#if (!$context.hasTomcatPool())
+<tr class="headercolor$c">
+  <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{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()}"> $!{context.getName()}</td>
+  <td> $!{context.getEnv().getName()} </td>
+  #end
+  <td>
+    #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
+    <A href="$appRoot/Tomcat/Worker/$page?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
+    #end
+  </td>
+  <td align="right">
+    <!-- before macro -->
+    <!-- $context -->
+    <!-- start macro -->
+    #contextDropBoxWOproject($User $context)
+  </td>
+</tr>
+#set ($count = $math.add($count, 1))
+#if ($c == 1)
+#set($c=2)
+#else
+#set($c=1)
+#end
+#end ##of all servers for this context
 </table>
-#end 	## of all contexts
-  
+#end   ## of all contexts
+
 #else
-  <div class="messagebox">
+<div class="messagebox">
   <tr class="headercolor1"><td colspan="2">
-  Hosting Pool:</td><td align="right">
-  #set ($hps = $view.getHostingPools())
-               <select name=hostingPoolId onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($hp in $hps)
-              			      <option value="$appRoot/Core/Pool/details.vm?id=$hp.getPk()">$hp.getName()
-              			      #end
-              			      </select></td>
-</table>
+    Hosting Pool:</td><td align="right">
+    #set ($hps = $view.getHostingPools())
+    <select name=hostingPoolId onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($hp in $hps)
+      <option value="$appRoot/Core/Pool/details.vm?id=$hp.getPk()">$hp.getName()
+        #end
+    </select></td>
+  </table>
 </div>
 #end
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm Wed Jul  5 14:11:29 2006
@@ -36,7 +36,6 @@
 #end
 
 
-
 #parse("/layout/list2.vm")
 <!--$plf-->
 #if ($plf)

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



Mime
View raw message