incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r417830 - in /incubator/lokahi/lokahi/trunk: conf/ src/www/Apache/Entity/ src/www/Apache/Worker/ src/www/Core/Entity/ src/www/Core/Entity/menu/ src/www/Core/File/ src/www/Core/File/menu/ src/www/Core/Instance/ src/www/Core/Instance/menu/ sr...
Date Wed, 28 Jun 2006 17:55:19 GMT
Author: toback
Date: Wed Jun 28 10:55:17 2006
New Revision: 417830

URL: http://svn.apache.org/viewvc?rev=417830&view=rev
Log:
Updates to ensure a consistant look and feel.

Added:
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/search.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/
    incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm   (with props)
Modified:
    incubator/lokahi/lokahi/trunk/conf/struts-config.xml
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm

Modified: incubator/lokahi/lokahi/trunk/conf/struts-config.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/struts-config.xml?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/struts-config.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/struts-config.xml Wed Jun 28 10:55:17 2006
@@ -79,7 +79,7 @@
     <form-bean name="InstanceForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
       <form-property name="instanceName" type="java.lang.String"/>
       <form-property name="instanceId" type="java.lang.String"/>
-      <form-property name="comments" type="java.lang.String"/>
+      <form-property name="comments" type="java.lang.String" initial=""/>
       <form-property name="wap" type="java.lang.String" initial="false"/>
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>

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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,19 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Entity")
 #parse("/layout/header.vm")
-<div id="bigright">
+<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>
@@ -72,7 +84,11 @@
 <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/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm Wed Jun 28 10:55:17 2006
@@ -18,6 +18,7 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Virtualhost")
 #parse("/layout/header.vm")
+
 <div align="center" class="contentbox">
 <br /><br />
 <div class="projectbox">
@@ -32,23 +33,30 @@
 </table>
 <br />
 <div class="messagebox">
+
 #if ($request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
 #end
 
-#if ($id)
-<h4> Modify a VirtualHost</h4>
-#set ($vhost = $view.getVirtualHost($id))
-#set ($hp = $vhost.getHostingPool())
-#set ($hostingPoolId = $request.getParameter("hostingPoolId"))
-
 <SCRIPT LANGUAGE=javascript>
 <!--
 function OnChange(dropdown)
 {
 	var myindex  = dropdown.selectedIndex;
 	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Apache/Entity/update.vm?tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
+	//var baseURL  = "$appRoot/Apache/Entity/update.vm?tcontexts=$numberOfContexts&hostingPoolId=$hostingPoolId&id=" + SelValue;
+	var baseURL  = "$appRoot/Apache/Entity/update.vm?id=" + SelValue;
+	top.location.href = baseURL;
+
+	return true;
+}
+
+function HostPoolOnChange(dropdown)
+{
+	var myindex  = dropdown.selectedIndex;
+	var SelValue = dropdown.options[myindex].value;
+	var baseURL  = "$appRoot/Apache/Entity/update.vm?id=$id&tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
+	//var baseURL  = "$appRoot/Apache/Entity/update.vm?id=" + SelValue;
 	top.location.href = baseURL;
 
 	return true;
@@ -67,22 +75,31 @@
 //-->
 </SCRIPT>
 
-
-
+#if ($id)
+<h4> Modify a VirtualHost</h4>
+#set ($vhost = $view.getVirtualHost($id))
+#set ($hp = $vhost.getHostingPool())
+#set ($hostingPoolId = $request.getParameter("hostingPoolId"))
 
 <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">
 Hosting Pool:
 #set ($hps = $view.getHostingPools())
-               <select name=hostingPoolId onchange='OnChange(this);'>
+               <select name=hostingPoolId onchange='HostPoolOnChange(this);'>
               			      #foreach ($hp in $hps)
-              			      #if ($hp == $vhost.getHostingPool())
-              			      <option value="$hp.getPk()" selected>$hp.getName()
-              			      #else
-              			      <option value="$hp.getPk()">$hp.getName()
-              			      #end
-              			      #end
+              			        #if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
+              			       		#set ($hpcomp = $vhost.getHostingPool())
+              			        #else 
+              			            #set ($hpcomp = $view.getHostingPool($hostingPoolId))
+              			        #end
+              			        
+	              			   	#if ($hp == $hpcomp)
+	              			    <option value="$hp.getPk()" selected>$hp.getName()
+              			        #else
+	               			    <option value="$hp.getPk()">$hp.getName()
+              			        #end
+              			     #end 
               			      </select><BR>
 Server Name: <input type="text"  readonly id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
 Entry:

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "ApachePool")
 #parse("/layout/header.vm")
-<div id="bigright">
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Infrastructure - <b>ApacheWorker</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 #if ($request.getParameter("workers"))
 #set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
@@ -100,6 +113,9 @@
 <input type="submit" value="submit">
 </form>
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/search.vm?rev=417830&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/search.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/search.vm Wed Jun 28 10:55:17 2006
@@ -0,0 +1,21 @@
+##
+## 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$
+##
+<option value="$appRoot/Apache/Entity/list.vm">&nbsp;View Virtual Host&nbsp;</option>
+<option value="$appRoot/Tomcat/Entity/list.vm">&nbsp;View Context&nbsp;</option>
+<option value="$appRoot/Apache/Entity/add.vm">&nbsp;Add Virtual Host&nbsp;</option>
+<option value="$appRoot/Tomcat/Entity/add.vm">&nbsp;Add Context&nbsp;</option>

Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/Entity/menu/search.vm
------------------------------------------------------------------------------
    svn:keywords = Id

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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm Wed Jun 28 10:55:17 2006
@@ -27,9 +27,16 @@
 <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"> </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">

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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm Wed Jun 28 10:55:17 2006
@@ -18,8 +18,22 @@
 #set ($menu = "/layout/menu/EntityTop.vm")
 #set ($pageSelected = "file")
 #parse("/layout/header.vm")
-<div id="bigright">
+<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">
+
 <form name="Form" method="post" action='$link.setAction("administration/FileAction")'>
 <table>
 <tr>

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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/EntityTop.vm")
 #set ($pageSelected = "file")
 #parse("/layout/header.vm")
-<div id="bigright">
+<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">
 <SCRIPT LANGUAGE=javascript>
 <!--
@@ -70,6 +83,9 @@
 
 #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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm Wed Jun 28 10:55:17 2006
@@ -15,40 +15,93 @@
 ##
 ## $Id$
 ##
-#set ($menu = "/layout/menu/EntityTop.vm")
-#set ($pageSelected = "file")
-#parse("/layout/header.vm")
+#if (!$collection)
+	#set ($menu = "/layout/menu/EntityTop.vm")
+	#set ($pageSelected = "file")
+	#parse("/layout/header.vm")
 
-#set ($collection = $view.getFiles())
+	#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")
+#set ($path = "Core/File")
 #set ($addFunction = "Add$entity")
 #set ($deleteFunction = "Delete$entity")
-<div id="center">
-<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>
+#if (! $currentPage)
+	#set ($currentPage = "$appRoot/Core/File/list.vm")
 #end
-</ul>
-#if ($User.isAllowed($deleteFunction))
-<input type="submit" value="Delete">
-</form>
+
+#parse("/layout/list2.vm")
+#if ($plf)
+	#parse("/layout/footer.vm")
 #end
-</div></div>
-#parse("/layout/footer.vm")
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+##<div align="center" class="contentbox">
+##<br /><br />
+
+##<div class="projectbox">
+##<table width="100%" border="0" cellspacing="0" cellpadding="1">
+##<tr class="info" valign="top">
+##	<td colspan=3>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=417830&r1=417829&r2=417830&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 Jun 28 10:55:17 2006
@@ -18,48 +18,18 @@
 <select name=methodToCall onchange='OnChange(this);'>
 <option value="" selected>Select Action
 #if($page)
-<option value="$appRoot/Core/Pool/$page">&nbsp;Details&nbsp;</option>
+	<option value="$appRoot/Core/File/$page">&nbsp;Details&nbsp;</option>
 #else
-<option value="$appRoot/Core/Pool/details.vm">&nbsp;Details&nbsp;</option>
+	<option value="$appRoot/Core/File/details.vm">&nbsp;Details&nbsp;</option>
 #end
-#if($User.isAllowed("AddHostingPool"))
-<option value="$appRoot/Core/Pool/add.vm">&nbsp;Add&nbsp;</option>
+#if ($User.isAllowed("AddFile"))
+	<option value="$appRoot/Core/File/add.vm">&nbsp;Add&nbsp;</option>
 #end
-#if($User.isAllowed("UpdateHostingPool"))
-<option value="$appRoot/Core/Pool/update.vm">&nbsp;Update&nbsp;</option>
+#if($User.isAllowed("UpdateFile"))
+<option value="$appRoot/Core/File/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>
+#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=417830&r1=417829&r2=417830&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 Jun 28 10:55:17 2006
@@ -18,45 +18,15 @@
 <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>
+	<option value="$appRoot/Core/File/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
 #else
-<option value="$appRoot/Core/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+	<option value="$appRoot/Core/File/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>
+#if($User.isAllowed("UpdateFile"))
+	<option value="$appRoot/Core/File/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>
+#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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/EntityTop.vm")
 #set ($pageSelected = "file")
 #parse("/layout/header.vm")
-<div id="bigright">
+<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">
 <SCRIPT LANGUAGE=javascript>
 <!--
@@ -63,6 +76,9 @@
 
 #end
 </div>
+<br />
+</div>
+<br />
 </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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/EntityTop.vm")
 #set ($pageSelected = "instance")
 #parse("/layout/header.vm")
-<div id="bigright">
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Infrastructure - <b>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>
@@ -43,6 +56,9 @@
 <input type="submit" value="submit">
 </form>
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/EntityTop.vm")
 #set ($pageSelected = "instance")
 #parse("/layout/header.vm")
-<div id="bigright">
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Infrastructure - <b>Instance</b>
+  </td>
+  <td align="right">
+  #parse("Core/Instance/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 
 <SCRIPT LANGUAGE=javascript>
@@ -72,6 +85,9 @@
 #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=417830&r1=417829&r2=417830&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 Jun 28 10:55:17 2006
@@ -18,48 +18,18 @@
 <select name=methodToCall onchange='OnChange(this);'>
 <option value="" selected>Select Action
 #if($page)
-<option value="$appRoot/Core/Pool/$page">&nbsp;Details&nbsp;</option>
+<option value="$appRoot/Core/Instance/$page">&nbsp;Details&nbsp;</option>
 #else
-<option value="$appRoot/Core/Pool/details.vm">&nbsp;Details&nbsp;</option>
+<option value="$appRoot/Core/Instance/details.vm">&nbsp;Details&nbsp;</option>
 #end
 #if($User.isAllowed("AddHostingPool"))
-<option value="$appRoot/Core/Pool/add.vm">&nbsp;Add&nbsp;</option>
+<option value="$appRoot/Core/Instance/add.vm">&nbsp;Add&nbsp;</option>
 #end
 #if($User.isAllowed("UpdateHostingPool"))
-<option value="$appRoot/Core/Pool/update.vm">&nbsp;Update&nbsp;</option>
+<option value="$appRoot/Core/Instance/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>
+<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=417830&r1=417829&r2=417830&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 Jun 28 10:55:17 2006
@@ -18,45 +18,18 @@
 <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>
+<option value="$appRoot/Core/Instance/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
 #else
-<option value="$appRoot/Core/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+<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/Pool/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+<option value="$appRoot/Core/Instance/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>
+<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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/EntityTop.vm")
 #set ($pageSelected = "instance")
 #parse("/layout/header.vm")
-<div id="bigright">
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Infrastructure - <b>Instance</b>
+  </td>
+  <td align="right">
+  #parse("Core/Instance/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 
 <SCRIPT LANGUAGE=javascript>
@@ -62,6 +75,9 @@
               			      </select><BR>
 #end
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

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=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm Wed Jun 28 10:55:17 2006
@@ -38,46 +38,161 @@
 #set ($hp = $ent)
 #end
 #if ($hp)
-<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
+  <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>
-</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>
-<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>
-<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>
-</tr>
+  <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>
+  <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>
+  <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>
+  </tr>
+  </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">
+  <tr height="15" 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
+        #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
+        #end
+        <!-- $User.isAllowed("DeleteVirtualHost", $vhost) -->
+        #if ($User.isAllowed("DeleteVirtualHost", $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
+        #end
+        #if ($User.isAllowed("ViewVirtualHost", $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
+</TABLE>
+#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">
+  <tr height="15" 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
 </table>
+#end 	## of all contexts
+  
 #else
-<div class="messagebox">
-<tr class="headercolor1"><td colspan="2">
-Hosting Pool:</td><td align="right">
-#set ($hps = $view.getHostingPools())
+  <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)

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm?rev=417830&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm Wed Jun 28 10:55:17 2006
@@ -0,0 +1,23 @@
+##
+## 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$
+##
+<option value="$appRoot/Core/Server/list.vm">&nbsp;View Hardware&nbsp;</option>
+<option value="$appRoot/Apache/Server/list.vm">&nbsp;View Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Server/list.vm">&nbsp;View Tomcat&nbsp;</option>
+<option value="$appRoot/Core/Server/add.vm">&nbsp;Add Hardware&nbsp;</option>
+<option value="$appRoot/Apache/Server/add.vm">&nbsp;Add Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Worker/add.vm">&nbsp;Add Tomcat&nbsp;</option>
\ No newline at end of file

Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm Wed Jun 28 10:55:17 2006
@@ -27,9 +27,15 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
 <tr class="info" valign="top">
 <td colspan=3>Infrastructure - Server - <b>Search</b></td>
-<td colspan="2" align="right"><a class="info" href="$appRoot/Core/Server/list.vm">View Hardware</a> &nbsp; <a class="info" href="$appRoot/Apache/Server/list.vm">View Apache</a> &nbsp; <a class="info" href="$appRoot/Tomcat/Server/list.vm">View Tomcat</a></td>
+<td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
+<option value="">Select one
+#parse("/Core/Server/menu/search.vm")
+</select></td>
 </tr>
 </table>
+##<td colspan="2" align="right"><a class="info" href="$appRoot/Core/Server/list.vm">View Hardware</a> &nbsp; <a class="info" href="$appRoot/Apache/Server/list.vm">View Apache</a> &nbsp; <a class="info" href="$appRoot/Tomcat/Server/list.vm">View Tomcat</a></td>
+##</tr>
+##</table>
 <br />
 #if ($name && $type != "")
 <div class="messagebox" width="75%" align="center">

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm Wed Jun 28 10:55:17 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/UserTop.vm")
 #set ($pageSelected = "User")
 #parse("/layout/header.vm")
-<div id="bigright">
+<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>User</b>
+  </td>
+  <td align="right">
+  #parse("Core/User/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/UserAction")'>
 <table>
@@ -86,6 +99,9 @@
 <input type="submit" value="submit">
 </form>
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm Wed Jun 28 10:55:17 2006
@@ -65,7 +65,20 @@
 //-->
 </SCRIPT>
 
-<div id="bigright">
+<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>User</b>
+  </td>
+  <td align="right">
+  #parse("Core/User/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("User/AddAdminUserAction")'>
 <input type="hidden" name="methodToCall" value="AddUserToProject">
@@ -102,6 +115,9 @@
 
 </form>
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm Wed Jun 28 10:55:17 2006
@@ -38,6 +38,21 @@
 
 #end
 
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Administration - <b>User</b>
+  </td>
+  <td align="right">
+  #parse("Core/User/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+<div class="messagebox">
 
 <SCRIPT LANGUAGE=javascript>
 <!--
@@ -94,8 +109,6 @@
 //-->
 </SCRIPT>
 
-<div id="bigright">
-<div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("User/AddUserToProjectAction")'>
 <input type="hidden" name="methodToCall" value="AddUserToProject">
 #if ($projectId)
@@ -260,6 +273,9 @@
 
 </form>
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm Wed Jun 28 10:55:17 2006
@@ -31,8 +31,20 @@
 }
 //-->
 </SCRIPT>
+<div align="center" class="contentbox">
+<br /><br />
 
-<div id="center">
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Administration - <b>User</b>
+  </td>
+  <td align="right">
+  #parse("Core/User/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 #set ($id = $request.getParameter("id"))
 
@@ -76,6 +88,9 @@
 #end
 
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm Wed Jun 28 10:55:17 2006
@@ -31,7 +31,20 @@
 }
 //-->
 </SCRIPT>
-<div id="center">
+<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>User</b>
+  </td>
+  <td align="right">
+  #parse("Core/User/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 
 #set ($id = $request.getParameter("id"))
@@ -68,6 +81,9 @@
 #end
 
 </div>
+<br />
+</div>
+<br />
 </div>
 
 #parse("/layout/footer.vm")

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm?rev=417830&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm Wed Jun 28 10:55:17 2006
@@ -0,0 +1,21 @@
+##
+## 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$
+##
+<option value="$appRoot/Apache/Worker/list.vm">&nbsp;View Apache&nbsp;</option> 
+<option value="$appRoot/Tomcat/Worker/list.vm">&nbsp;View Tomcat&nbsp;</option>
+<option value="$appRoot/Apache/Worker/add.vm">&nbsp;Add Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Worker/add.vm">&nbsp;Add Tomcat&nbsp;</option>

Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm Wed Jun 28 10:55:17 2006
@@ -27,9 +27,13 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
 <tr class="info" valign="top">
 <td colspan=3>Infrastructure - Worker - <b>Search</b></td>
-<td colspan="2" align="right"><a class="info" href="$appRoot/Apache/Worker/list.vm">View Apache</a> &nbsp; <a class="info" href="$appRoot/Tomcat/Worker/list.vm">View Tomcat</a></td>
+<td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
+<option value="">Select one
+#parse("/Core/Worker/menu/search.vm")
+</select></td>
 </tr>
 </table>
+
 <br />
 #if ($name && $type != "")
 <div class="messagebox" width="75%" align="center">

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm Wed Jun 28 10:55:17 2006
@@ -26,6 +26,9 @@
 <TR CLASS="info" valign="top">
 	<TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
   </TD>
+  <td align="right">
+  #parse("Tomcat/Pool/menu/global.vm")
+  </td>
 </TR>
 </table>
 <br><div class="messagebox">

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm?rev=417830&r1=417829&r2=417830&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm Wed Jun 28 10:55:17 2006
@@ -18,17 +18,20 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Worker")
 #parse("/layout/header.vm")
-<div class="projectbox">
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
-<TR CLASS="info" valign="top">
-	<TD colspan=3>Infrastructure - <b>TomcatWorker</b>
-  </TD>
-</TR>
-</table>
-<br>
 <div align="center" class="contentbox">
 <br /><br />
-<div id="bigright">
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Infrastructure - <b>TomcatWorker</b>
+  </td>
+  <td align="right">
+  #parse("Tomcat/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/TomcatWorkerAction")'>
 <table>
@@ -69,7 +72,6 @@
 <input type="hidden" name="methodToCall" value="AddTomcatWorker">
 <input type="submit" value="submit">
 </form>
-</div>
 </div>
 <br />
 </div>



Mime
View raw message