incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r417575 - in /incubator/lokahi/lokahi/trunk: docs/ src/www/Apache/Entity/ src/www/Apache/Pool/ src/www/Apache/Server/ src/www/Apache/Worker/ src/www/Core/Pool/ src/www/Core/Server/ src/www/Help/ src/www/Tomcat/Entity/ src/www/Tomcat/Pool/ s...
Date Tue, 27 Jun 2006 20:19:36 GMT
Author: toback
Date: Tue Jun 27 13:19:34 2006
New Revision: 417575

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

Modified:
    incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm

Modified: incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT Tue Jun 27 13:19:34 2006
@@ -3,7 +3,8 @@
                  Getting Started with Lokahi
                  ===========================
 
-After building and installing the software, Lokahi requires some initial objects to be added
to the database before you can use Lokahi to manage web applications.
+After building and installing the software, Lokahi requires some initial objects 
+to be added to the database before you can use Lokahi to manage web applications.
 
 The following items must be performed through the GUI.
 
@@ -26,7 +27,13 @@
 
       Click: Administration >> Manage Lokahi >> Manage Files >> Add
 
-      Paste in the head matter of your httpsd.conf file, excluding VirtualHosts, Listens,
and catchalls.  The ApachePools you'll create later will be based on one of the head matter
files you're creating here. Give the file a name that denotes its use in your environment,
perhaps specifying whether it is your standard, or how its module list deviates from your
usual standard.  For example, if you have an instance of Apache in your environment that does
not include mod_<some_module>, add that head-matter as a separate file.
+      Paste in the head matter of your httpsd.conf file, excluding VirtualHosts, 
+      Listens, and catchalls.  The ApachePools you'll create later will be based 
+      on one of the head matter files you're creating here. Give the file a name 
+      that denotes its use in your environment, perhaps specifying whether it is 
+      your standard, or how its module list deviates from your usual standard.  
+      For example, if you have an instance of Apache in your environment that does 
+      not include mod_<some_module>, add that head-matter as a separate file.
 
 (2.2) Create Apache server template
 
@@ -76,15 +83,19 @@
 
 (2.1) Select a HostingPool from the menu.
 
-(2.2)	If you want to set up a Tomcat context, click "Add Another."  Otherwise, continue.
 (Another method of adding a Tomcat context is detailed in Step 3.)
+(2.2) If you want to set up a Tomcat context, click "Add Another."  Otherwise, 
+      continue.  (Another method of adding a Tomcat context is detailed in Step 3.)
 
 (2.3) In the ServerName field, enter a domain name.
 
 (2.4) In the Entry field, add Apache directives for the web application, one per line.
 
-(2.5) If you are also setting up a Tomcat context, enter the context name and DocBase path
in the appropriate fields.
+(2.5) If you are also setting up a Tomcat context, enter the context name and DocBase 
+      path in the appropriate fields.
 
-(2.6) Click submit.  Lokahi will generate the VirtualHost entry, insert it into the database,
build the apache httpsd.conf file (and the jvm.conf and server.xml files if you added a context),
and deploy it to the hardware you added.
+(2.6) Click submit.  Lokahi will generate the VirtualHost entry, insert it into the 
+      database, build the apache httpsd.conf file (and the jvm.conf and server.xml 
+      files if you added a context), and deploy it to the hardware you added.
 
 
 
@@ -94,7 +105,10 @@
     or
     Click: Projects >> Add   to create a new project to which you will add a context.
 
-(3.1) Click <project_name> >> Select Action >> Add a Context  and enter
the context name and the DocBase path.  You can add a context to a VirtualHost by choosing
"Add a Context" from the VirtualHosts's own menu, or you can just add the context to a project
without connecting it to a VirtualHost.
+(3.1) Click <project_name> >> Select Action >> Add a Context  and enter
the context name 
+      and the DocBase path.  You can add a context to a VirtualHost by choosing "Add a 
+      Context" from the VirtualHosts's own menu, or you can just add the context to a 
+      project without connecting it to a VirtualHost.
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm Tue Jun 27 13:19:34 2006
@@ -20,7 +20,20 @@
 #set ($pageSelected = "Entity")
 #end
 #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">
 
 
@@ -70,6 +83,11 @@
               			      </select><BR>
               			      
 #end
+</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=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm Tue Jun 27 13:19:34 2006
@@ -20,7 +20,17 @@
 #parse("/layout/header.vm")
 <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="2">Infrastructure - <b>Virtualhost</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Entity/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 #if ($request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
@@ -34,7 +44,7 @@
 
 <SCRIPT LANGUAGE=javascript>
 <!--
-function ToChange(dropdown)
+function OnChange(dropdown)
 {
 	var myindex  = dropdown.selectedIndex;
 	var SelValue = dropdown.options[myindex].value;
@@ -43,6 +53,7 @@
 
 	return true;
 }
+
 function switchCheckBoxes() {
 		if (document.Form.nameVirtualHost.checked) {
 			document.Form.catchAll.disabled = false;
@@ -140,7 +151,7 @@
 #else
 VirtualHost:
 #set ($vhosts = $view.getVirtualHosts())
-               <select name=id onchange='ToChange(this);'>
+               <select name=id onchange='OnChange(this);'>
                           <option value="">Select one
               			      #foreach ($vhost in $vhosts)
               			      <option value="$vhost.getPk()">$vhost.getName()
@@ -149,6 +160,7 @@
 
 #end
 </div>
+<br />
 </div>
 <br />
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm Tue Jun 27 13:19:34 2006
@@ -18,7 +18,22 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Pool")
 #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>Apache Pool</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Pool/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+
+##<div id="bigright">
 <div class="messagebox">
 #if ($request.getParameter("workers"))
 #set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
@@ -130,6 +145,9 @@
 <input type="submit" value="submit">
 </form>
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm Tue Jun 27 13:19:34 2006
@@ -28,6 +28,7 @@
 
 <div align="center" class="contentbox">
 <br /><br />
+
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
 <tr class="info" valign="top">
@@ -40,7 +41,6 @@
 </table>
 <br />
 
-
 #if ($id)
   #set ($apachePool = $view.getApachePool($id))
 
@@ -143,6 +143,8 @@
 #end 	## of all contexts
 
 #else
+<div class="messagebox">
+
   Apache Pool:
   #set ($aps = $view.getApachePools())
                <select name=id onchange='OnChange(this);'>
@@ -151,6 +153,7 @@
               			      <option value="$appRoot/Apache/Pool/$page?id=$ap.getPk()">$ap.getName()
               			      #end
               			      </select><BR>
+</div>
 #end
 
 
@@ -158,6 +161,8 @@
 </div>
 <br>
 </div>
+<br>
+
 
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm Tue Jun 27 13:19:34 2006
@@ -18,25 +18,35 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Pool")
 #parse("/layout/header.vm")
-<div id="bigright">
-<div class="messagebox">
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan="2">Infrastructure - <b>Apache Pool</b>
+  </td>
+  <td align="right">
+  #parse("/Apache/Pool/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br /><div class="messagebox">
+
 #set ($id = $request.getParameter("id"))
 #set ($methodToCall = "UpdateApachePool")
 
-<table>
+#if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
 #if($id)
 #set ($apachePool = $view.getApachePool($id))
 #set ($numberOfWorkers = $apachePool.getApaches().size())
-
-#if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
 <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
 <input type="hidden" id="id" name="id" value="$!{id}">
 <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-<tr><td>
-Pool Name:</td><td> <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><BR>
-</td></tr>
-<tr><td>
-Environment:</td><td>
+
+Pool Name: <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><br
/>
+
+Environment:
 #set ($envs = $view.getEnvironments())
 <select name=envId>
 ##if ($apachePool.getEnv())
@@ -48,25 +58,18 @@
 			      #foreach ($env in $envs)
 			      <option value="$env.getPk()">$env.getName()
 			      #end
-			      </select>
-			      </td></tr>
-
-
+			      </select><BR>
 
 ##Steve testing
-<tr><td><b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers,
1)"> Add Worker</a></td></tr>
+<b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers,
1)"> Add Worker</a><BR>
 
 #foreach ($worker in $apachePool.getApaches())
-		<tr><td nowrap>
-		 $worker.getName() -</td>
-		 <td>
+		 $worker.getName() -
 		 <A href="$appRoot/Apache/Worker/delete.vm?id=$worker.getPk()"> Delete</A>
|
 		 <A href="$appRoot/Apache/Worker/update.vm?id=$worker.getPk()"> Modify</A>
 
-		</td></tr>
-#end
-</td></tr>
 #end
+</form>
 #else
   Apache Pool:
   #set ($aps = $view.getApachePools())
@@ -75,12 +78,13 @@
               			      #foreach ($ap in $aps)
               			      <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.getName()
               			      #end
-              			      </select>
-              			      </td></tr>
+              			      </select><BR>
 #end
-</table>
-</form>
+#end
+</div>
+<br />
 </div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm Tue Jun 27 13:19:34 2006
@@ -22,8 +22,20 @@
 #if ($request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
 #end
-
-<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>Apache Pool</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Pool/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+##<div id="bigright">
 <div class="messagebox">
 
 #if ($id)
@@ -43,6 +55,9 @@
 #end
 
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm Tue Jun 27 13:19:34 2006
@@ -25,7 +25,20 @@
 #set ($id = $request.getParameter("id"))
 #end
 
-<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>Apache Pool</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Pool/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+##<div id="bigright">
 <div class="messagebox">
 
 #if ($id)
@@ -45,6 +58,9 @@
 #end
 
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm Tue Jun 27 13:19:34 2006
@@ -18,7 +18,20 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Server")
 #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>Apache</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Server/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
 <table>
@@ -145,7 +158,11 @@
 <input type="hidden" name="methodToCall" value="AddApache">
 <input type="submit" value="Add">
 </form>
+
+</div>
+<br />
 </div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm Tue Jun 27 13:19:34 2006
@@ -75,6 +75,7 @@
 #end 	## of all apaches
 
 #else
+<div class="messagebox">
   Apache:
   #set ($aps = $view.getApaches())
                <select name=id onchange='OnChange(this);'>
@@ -83,6 +84,7 @@
               			      <option value="$appRoot/Apache/Server/details.vm?id=$ap.getPk()">$ap.getName()
               			      #end
               			      </select><BR>
+</div>
 #end
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm Tue Jun 27 13:19:34 2006
@@ -19,8 +19,19 @@
 #set ($pageSelected = "Server")
 #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>Apache</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Server/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 #set ($id = $request.getParameter("id"))
 #set ($methodToCall = "UpdateApache")
@@ -68,6 +79,9 @@
               	</select><BR>
 #end
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm Tue Jun 27 13:19:34 2006
@@ -127,14 +127,16 @@
 #end 	## of all vhosts
 
 #else
-                              Apache Worker:
-                              #set ($aws = $view.getApacheWorkers().orderByName().values())
-                                             <select name=id onchange='OnChange(this);'>
-                                                        <option value="">Select one
-                                            			      #foreach ($aw in $aws)
-                                            			      <option value="$appRoot/Apache/Worker/$page?id=$aw.getPk()">$aw.getName()
-                                            			      #end
-                                            			      </select><BR>
+<div class="messagebox">
+    Apache Worker:
+    #set ($aws = $view.getApacheWorkers().orderByName().values())
+       <select name=id onchange='OnChange(this);'>
+          <option value="">Select one
+          #foreach ($aw in $aws)
+            <option value="$appRoot/Apache/Worker/$page?id=$aw.getPk()">$aw.getName()
+          #end
+        </select><BR>
+</div>
 #end
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm Tue Jun 27 13:19:34 2006
@@ -18,7 +18,21 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "ApacheWorker")
 #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>Apache Worker</b>
+  </td>
+  <td align="right">
+  #parse("/Apache/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+
 <div class="messagebox">
 
 #set ($id = $request.getParameter("id"))
@@ -63,6 +77,9 @@
 #end
 #end
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm Tue Jun 27 13:19:34 2006
@@ -23,7 +23,19 @@
 #set ($id = $request.getParameter("id"))
 #end
 
-<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>Apache Worker</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 
 #if ($id)
@@ -43,6 +55,9 @@
 #end
 
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm Tue Jun 27 13:19:34 2006
@@ -24,7 +24,19 @@
 #set ($id = $request.getParameter("id"))
 #end
 
-<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>Apache Worker</b>
+  </td>
+  <td align="right">
+  #parse("Apache/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 
 #if ($id)
@@ -44,6 +56,9 @@
 #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=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm Tue Jun 27 13:19:34 2006
@@ -74,6 +74,7 @@
 </tr>
 </table>
 #else
+<div class="messagebox">
 <tr class="headercolor1"><td colspan="2">
 Hosting Pool:</td><td align="right">
 #set ($hps = $view.getHostingPools())
@@ -84,6 +85,7 @@
               			      #end
               			      </select></td>
 </table>
+</div>
 #end
 <br />
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm Tue Jun 27 13:19:34 2006
@@ -26,6 +26,9 @@
 <tr class="info" valign="top">
 	<td colspan=3>Infrastructure - <b>Hosting Pool</b>
   </td>
+  <td align="right">
+  #parse("/Core/Pool/menu/global.vm")
+  </td>
 </tr>
 </table>
 <br /><div class="messagebox">

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm Tue Jun 27 13:19:34 2006
@@ -90,6 +90,7 @@
 #end 	## of all apaches
 
 #else
+<div class="messagebox">
   Hardware:
   #set ($hws = $view.getHardwares())
                <select name=id onchange='OnChange(this);'>
@@ -98,6 +99,7 @@
               			      <option value="$appRoot/Core/Server/details.vm?id=$hw.getPk()">$hw.getName()
               			      #end
               			      </select><BR>
+</div>
 #end
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm Tue Jun 27 13:19:34 2006
@@ -32,7 +32,19 @@
 //-->
 </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="2">Infrastructure - <b>Hardware</b>
+  </td>
+  <td align="right">
+  #parse("Core/Server/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 #if ( $request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
@@ -140,6 +152,10 @@
               			      #end
               			      </select><BR>
 #end
-</div></div>
+</div>
+<br />
+</div>
+<br />
+</div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/index.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/index.vm Tue Jun 27 13:19:34 2006
@@ -18,9 +18,12 @@
 #set ($menu = "/layout/menu/HelpTop.vm")
 #set ($pageSelected = "/help.vm")
 #parse("/layout/header.vm")
-<br><br><br><br>
+<br />
+<br />
+<br />
 <div align=center>
-
+<br />
+<br />
 <table width="700" border="0" cellspacing="0" cellpadding="0" >
 <tr valign="top" class="info">
 	<td valign="top" height="25" align="center"> Help Topics </td>

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm Tue Jun 27 13:19:34 2006
@@ -32,6 +32,9 @@
 <TR CLASS="info" valign="top">
 	<TD colspan=3>Infrastructure - <b>Context</b>
   </TD>
+   <td align="right">
+  #parse("Tomcat/Entity/menu/global.vm")
+  </td>
 </TR>
 </table>
 <br>

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm Tue Jun 27 13:19:34 2006
@@ -28,6 +28,9 @@
 <TR CLASS="info" valign="top">
 	<TD colspan=3>Infrastructure - <b>Context</b>
   </TD>
+   <td align="right">
+  #parse("Tomcat/Entity/menu/global.vm")
+  </td>
 </TR>
 </table>
 <br>
@@ -73,6 +76,9 @@
 
 #end
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm Tue Jun 27 13:19:34 2006
@@ -18,7 +18,21 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "context")
 #parse("/layout/header.vm")
-<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="2">Infrastructure - <b>Context</b>
+  </td>
+  <td align="right">
+  #parse("Tomcat/Entity/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+
 <div class="messagebox">
 #set ($id = $request.getParameter("id"))
 #set ($projectId = $request.getParameter("p"))
@@ -86,6 +100,9 @@
 #end
 #end
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm Tue Jun 27 13:19:34 2006
@@ -149,6 +149,7 @@
 
 
 #else
+<div class="messagebox">
   Tomcat Pool:
   #set ($aps = $view.getTomcatPools())
                <select name=id onchange='OnChange(this);'>
@@ -157,6 +158,7 @@
               			      <option value="$appRoot/Tomcat/Pool/details.vm?id=$ap.getPk()">$ap.getName()
               			      #end
               			      </select><BR>
+</div>
 #end
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm Tue Jun 27 13:19:34 2006
@@ -18,14 +18,18 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Server")
 #parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
 <div class="projectbox">
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
 <TR CLASS="info" valign="top">
 	<TD colspan=3>Infrastructure - <b>Tomcat</b>
   </TD>
+  <td align="right">
+  #parse("Tomcat/Server/menu/global.vm")
+  </td>
 </TR>
 </table>
-<div id="bigright">
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/TomcatAction")'>
 <table>
@@ -157,6 +161,7 @@
 <input type="submit" value="submit">
 </form>
 </div>
+<br />
 </div>
 <br />
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm Tue Jun 27 13:19:34 2006
@@ -72,6 +72,7 @@
 
 
 #else
+<div class="messagebox">
   Tomcat:
   #set ($aps = $view.getTomcats())
                <select name=id onchange='OnChange(this);'>
@@ -80,12 +81,11 @@
               			      <option value="$appRoot/Tomcat/Server/details.vm?id=$ap.getPk()">$ap.getName()
               			      #end
               			      </select><BR>
+</div>
 #end
-
-
-<br>
-
-
+<br />
+</div>
+<br />
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm Tue Jun 27 13:19:34 2006
@@ -25,8 +25,12 @@
 <TR CLASS="info" valign="top">
 	<TD colspan=3>Infrastructure - <b>Tomcat</b>
   </TD>
+  <td align="right">
+  #parse("Tomcat/Server/menu/global.vm")
+  </td>
 </TR>
 </table>
+<br>
 <div class="messagebox">
 #set ($id = $request.getParameter("id"))
 #set ($methodToCall = "UpdateTomcat")
@@ -72,6 +76,8 @@
               			      </select><BR>
 
 #end
+</div>
+<br />
 </div>
 <br />
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm Tue Jun 27 13:19:34 2006
@@ -135,6 +135,7 @@
 <br />
 #end 	## of all contexts
 #else
+<div class="messagebox">
 Tomcat Worker:
 #set ($tws = $view.getTomcatWorkers())
                <select name=id onchange='OnChange(this);'>
@@ -143,6 +144,7 @@
               			      <option value="$appRoot/Tomcat/Worker/$page?id=$tw.getPk()">$tw.getName()
               			      #end
               			      </select><BR>
+</div>
 #end
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm Tue Jun 27 13:19:34 2006
@@ -18,10 +18,19 @@
 #set ($menu = "/layout/menu/PoolTop.vm")
 #set ($pageSelected = "Worker")
 #parse("/layout/header.vm")
-
 <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="2">Infrastructure - <b>TomcatWorker</b>
+  </td>
+  <td align="right">
+  #parse("Tomcat/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 
 #set ($id = $request.getParameter("id"))
@@ -76,6 +85,7 @@
 #end
 #end
 </div>
+<br />
 </div>
 <br />
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm?rev=417575&r1=417574&r2=417575&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm Tue Jun 27 13:19:34 2006
@@ -23,7 +23,20 @@
 #if ($request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
 #end
-<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>TomcatWorker</b>
+  </td>
+  <td align="right">
+  #parse("Tomcat/Worker/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
 <div class="messagebox">
 #if ($id)
 #set ($tomcatWorker = $view.getTomcatWorker($id))
@@ -40,6 +53,9 @@
               			      </select><br />
 #end
 </div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 



Mime
View raw message