incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419631 [1/3] - in /incubator/lokahi/lokahi/trunk/src/www: ./ Apache/Entity/ Apache/Pool/ Apache/Server/ Apache/Worker/ Core/ Core/Alerts/ Core/Entity/ Core/Environment/ Core/File/ Core/Function/ Core/Instance/ Core/JobPool/ Core/Pool/ Core...
Date Thu, 06 Jul 2006 18:03:09 GMT
Author: toback
Date: Thu Jul  6 11:03:02 2006
New Revision: 419631

URL: http://svn.apache.org/viewvc?rev=419631&view=rev
Log:
s/\<br\/?\>/<br \/>/gi

to ensure cross-compatible behavior between non-xml
compliant, classic SGML parsers, and modern xml parsers.

Modified:
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.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/confirm.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/Server/viewconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.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/Alerts/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.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/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/State/update.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/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/index.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/Core/infrastructure.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.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/Entity/view.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.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/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.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
    incubator/lokahi/lokahi/trunk/src/www/home.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/footer.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/login.vm

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "Entity")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+<br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       <form name="Form" method="post" action='$link.setAction("administration/VirtualHostAction")'>
@@ -88,9 +88,9 @@
       </form>
 
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #if ($User.isAllowed($function) && $methodToCall && $actionLink)
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
   <input type=hidden name="methodToCall" value="$methodToCall">
-  <input type="submit" value="$buttonName"><BR>
+  <input type="submit" value="$buttonName"><br />
   $methodToCall
   <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
   $individual.getName()

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm Thu Jul  6 11:03:02 2006
@@ -22,7 +22,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -34,7 +34,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -46,9 +46,9 @@
       #set ($vh = $view.getVirtualHost($id))
 
       #if ($User.isAllowed("ViewVirtualHost") && $methodToCall == "UpdateVirtualHost")
-      <br>Name: $!{vh.getName()}
-      <br>Entry: <textarea id="entry" READONLY name="entry" cols="70" rows="7">$!{vh.getEntry()}</textarea><BR>
-      <br>Environment:
+      <br />Name: $!{vh.getName()}
+      <br />Entry: <textarea id="entry" READONLY name="entry" cols="70" rows="7">$!{vh.getEntry()}</textarea><br />
+      <br />Environment:
       #set ($envs = $view.getEnvironments())
 
       <select name=envId>
@@ -56,13 +56,13 @@
           #foreach ($env in $envs)
         <option value="$env.getPk()">$env.getName()
           #end
-      </select><BR>
+      </select><br />
 
       State: Active
       #end
-      <br>
+      <br />
       #if ($User.isAllowed("UpdateVirtualHost") && $methodToCall == "UpdateVirtualHost")
-      <br><A href="$appRoot/Apache/Entity/update.vm?id=$!{id}"> Update this Vhost</a><br>
+      <br /><A href="$appRoot/Apache/Entity/update.vm?id=$!{id}"> Update this Vhost</a><br />
       #end
 
       #if ($User.isAllowed("DeleteVirtualHost"))
@@ -82,13 +82,13 @@
           #foreach ($vhost in $vhosts)
         <option value="$appRoot/Apache/Entity/details.vm?id=$vhost.getPk()">$vhost.getName()
           #end
-      </select><BR>
+      </select><br />
 
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "Entity")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div id="bigright">
 <div class="messagebox">
@@ -45,13 +45,11 @@
   {
     var myindex = dropdown.selectedIndex;
     var SelValue = dropdown.options[myindex].value;
-  #
-    if ($pId)
+  #if ($pId)
       var baseURL = "$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId&hostingPoolId=" + SelValue;
   #else
     var baseURL = "$appRoot/Apache/Entity/modify.vm?id=$id&hostingPoolId=" + SelValue;
-  #
-    end
+  #end
     top.location.href = baseURL;
 
     return true;
@@ -74,10 +72,10 @@
 
 
 <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">
+  <input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost" />
+  <input type="hidden" id="id" name="id" value="$id" />
   #if ($pId)
-  <input type="hidden" id="projectId" name="projectId" value="$!{pId}">
+  <input type="hidden" id="projectId" name="projectId" value="$!{pId}" />
   #end
   Hosting Pool:
   #set ($hps = $view.getHostingPools())
@@ -85,63 +83,63 @@
     #foreach ($hp in $hps)
     #if (($hp == $vhost.getHostingPool() && !$hostingPoolId) || ($hostingPoolId && $hp ==
     $view.getHostingPool($hostingPoolId)))
-    <option value="$hp.getPk()" selected>$hp.getName()
+    <option value="$hp.getPk()" selected>$hp.getName()</option>
       #else
-    <option value="$hp.getPk()">$hp.getName()
+    <option value="$hp.getPk()">$hp.getName()</option>
       #end
       #end
-  </select><BR>
-  Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
+  </select><br />
+  Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhost.getName()}"><br />
   Entry:
-  <textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
+  <textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br />
   NameVirtualHost:
   #if ($vhost.isNameBased())
-  <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
+  <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><br />
   #else
-  <input type=checkbox name=nameVirtualHost value=true onClick="switchCheckBoxes()"><BR>
+  <input type=checkbox name=nameVirtualHost value=true onClick="switchCheckBoxes()"><br />
   #end
   Catch All:
   #if ($vhost.isCatchAll())
-  <input type=checkbox name=catchAll checked value=true><BR>
+  <input type=checkbox name=catchAll checked value=true><br />
   #else
-  <input type=checkbox name=catchAll value=true><BR>
+  <input type=checkbox name=catchAll value=true><br />
   #end
   <!--Aliases (space delimited):
-<textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><BR>-->
-  <BR>
+<textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><br />-->
+  <br />
   <!--Contexts:
   #if($hostingPoolId && $projectId)
-  <A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  <A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br />
   #elseif($hostingPoolId)
-  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br />
   #elseif($projectId)
-  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br />
   #else
-  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br />
   #end
 
   #if ($numberOfContexts > 0)
   #foreach($context in [1..$numberOfContexts])
-  Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
-  DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"> <BR>
+  Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<br />
+  DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"> <br />
   #end
   #end
   -->
   #if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
   #set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
   <!-- $hardware -->
-  Ips for $vhost.getHostingPool().getName():<br>
-  Servername: IP:<BR>
+  Ips for $vhost.getHostingPool().getName():<br />
+  Servername: IP:<br />
   #foreach ($h in $hardware)
   $h.getName() <select name=ipId>
   #foreach ($ip in $h.getIpCollection().orderByName().values())
   #if ($vhost.getIps().contains($ip))
-  <option value="$ip.getPk()" selected>$ip.getName()
+  <option value="$ip.getPk()" selected>$ip.getName()</option>
     #else
-  <option value="$ip.getPk()">$ip.getName()
+  <option value="$ip.getPk()">$ip.getName()</option>
     #end
     #end
-</select><br>
+</select><br />
   #end
 
   #else
@@ -150,34 +148,34 @@
   #set($hardware = $ap.getHardwares())
 
 
-  Ips for $hp.getName():<br>
-  Servername: IP:<BR>
+  Ips for $hp.getName():<br />
+  Servername: IP:<br />
   #foreach ($h in $hardware)
   $h.getName() <select name=ipId>
   #foreach ($ip in $h.getIpCollection().orderByName().values())
-  <option value="$ip.getPk()">$ip.getName()
+  <option value="$ip.getPk()">$ip.getName()</option>
     #end
-</select><br>
+</select><br />
   #end
 
   #end
 
-  <input type="submit" value="submit">
+  <input type="submit" value="submit" />
 </form>
 #else
 VirtualHost:
 #set ($vhosts = $view.getVirtualHosts())
 <select name=id onchange='OnChange(this);'>
-  <option value="">Select one
+  <option value="">Select one</option>
     #foreach ($vhost in $vhosts)
-  <option value="$appRoot/Apache/Entity/modify.vm?id=$vhost.getPk()">$vhost.getName()
+  <option value="$appRoot/Apache/Entity/modify.vm?id=$vhost.getPk()">$vhost.getName()</option>
     #end
-</select><BR>
+</select><br />
 
 #end
 </div>
 </div>
-<br/>
+<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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm Thu Jul  6 11:03:02 2006
@@ -20,7 +20,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -32,7 +32,7 @@
     </td>
   </tr>
 </table>
-<br/>
+<br />
 
 <div class="messagebox">
 
@@ -103,30 +103,30 @@
     <option value="$hp.getPk()">$hp.getName()
       #end
       #end
-  </select><BR>
-  Server Name: <input type="text" readonly id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
+  </select><br />
+  Server Name: <input type="text" readonly id="vhostName" name="vhostName" value="$!{vhost.getName()}"><br />
   Entry:
-  <textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
-  NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
-  Catch All: <input type=checkbox name=catchAll value=true><BR>
+  <textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br />
+  NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><br />
+  Catch All: <input type=checkbox name=catchAll value=true><br />
   <!--Aliases (space delimited):
-<textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><BR>-->
-  <BR>
+<textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><br />-->
+  <br />
   <!--Contexts:
   #if($hostingPoolId && $projectId)
-  <A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  <A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br />
   #elseif($hostingPoolId)
-  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br />
   #elseif($projectId)
-  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br />
   #else
-  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br />
   #end
 
   #if ($numberOfContexts > 0)
   #foreach($context in [1..$numberOfContexts])
-  Context Name: <input type="text" readonly id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
-  DocBase: <input type="text"  readonly id="docBase" name="docBase" value="$!{docBase}"> <BR>
+  Context Name: <input type="text" readonly id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<br />
+  DocBase: <input type="text"  readonly id="docBase" name="docBase" value="$!{docBase}"> <br />
   #end
   #end
   -->
@@ -134,8 +134,8 @@
   #set ($treemap = $vhost.getIps())
   #set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
 
-  Ips for $vhost.getHostingPool().getName():<br>
-  Servername: IP:<BR>
+  Ips for $vhost.getHostingPool().getName():<br />
+  Servername: IP:<br />
   #foreach ($h in $hardware)
   #set ($ipSelected = $treemap.get($h))
   $h.getName() <select name=ipId>
@@ -146,7 +146,7 @@
   <option value="$ip.getPk()">$ip.getName()
     #end
     #end
-</select><br>
+</select><br />
   #end
 
   #else
@@ -154,14 +154,14 @@
   #set ($ap = $hp.getApachePool())
   #set($hardware = $ap.getHardwares())
 
-  Ips for $hp.getName():<br>
-  Servername: IP:<BR>
+  Ips for $hp.getName():<br />
+  Servername: IP:<br />
   #foreach ($h in $hardware)
   $h.getName() <select name=ipId>
   #foreach ($ip in $h.getIps())
   <option value="$ip.getPk()">$ip.getName()
     #end
-</select><br>
+</select><br />
   #end
 
   #end
@@ -176,13 +176,13 @@
     #foreach ($vhost in $vhosts)
   <option value="$vhost.getPk()">$vhost.getName()
     #end
-</select><BR>
+</select><br />
 
 #end
 </div>
-<br/>
+<br />
 </div>
-<br/>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm Thu Jul  6 11:03:02 2006
@@ -30,9 +30,9 @@
     $vhost.buildVhostEntriesForWeb()
     #if ($User.isAllowed("UpdateVirtualHost"))
     #if ($pId)
-    <a href="$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId">Modify this Vhost</a> &nbsp;<BR><BR>
+    <a href="$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId">Modify this Vhost</a> &nbsp;<br /><br />
     #else
-    <a href="$appRoot/Apache/Entity/modify.vm?id=$id">Modify this Vhost</a> &nbsp;<BR><BR>
+    <a href="$appRoot/Apache/Entity/modify.vm?id=$id">Modify this Vhost</a> &nbsp;<br /><br />
     #end
     #end
     #end

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm Thu Jul  6 11:03:02 2006
@@ -20,7 +20,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -32,7 +32,7 @@
     </td>
   </tr>
 </table>
-<br/>
+<br />
 
 ##<div id="bigright">
 <div class="messagebox">
@@ -47,7 +47,7 @@
 #end
 
 
-<!-- Number of workers: $numberOfWorkers --><BR><BR>
+<!-- Number of workers: $numberOfWorkers --><br /><br />
 
 <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
   <table>
@@ -146,9 +146,9 @@
   <input type="submit" value="submit">
 </form>
 </div>
-<br/>
+<br />
 </div>
-<br/>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm Thu Jul  6 11:03:02 2006
@@ -18,7 +18,7 @@
 #if ($User.isAllowed($function) && $methodToCall && $actionLink)
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
   <input type=hidden name="methodToCall" value="$methodToCall">
-  <input type="submit" value="$buttonName"><BR>
+  <input type="submit" value="$buttonName"><br />
   $methodToCall
   <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
   $individual.getName()

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm Thu Jul  6 11:03:02 2006
@@ -27,7 +27,7 @@
 #end
 
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -39,7 +39,7 @@
     </td>
   </tr>
 </table>
-<br/>
+<br />
 
 #if ($id)
 #set ($apachePool = $view.getApachePool($id))
@@ -79,13 +79,13 @@
 
 #set ($collection = $view.getHostingPools($apachePool))
 #if( $collection && ! $collection.isEmpty())
-<br/>
+<br />
 #parse("/Core/Pool/list.vm")
 #end
 
 #set ($vhosts = $view.getVirtualHosts($User, $apachePool))
 #if( $vhosts && ! $vhosts.isEmpty())
-<br>
+<br />
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
     <td align="left" valign="center" colspan=4>
@@ -107,7 +107,7 @@
   <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>
+    <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br />
     #end
   </td>
   <td align="right">
@@ -152,16 +152,16 @@
       #foreach ($ap in $aps)
     <option value="$appRoot/Apache/Pool/$page?id=$ap.getPk()">$ap.getName()
       #end
-  </select><BR>
+  </select><br />
 </div>
 #end
 
 
-<br>
+<br />
 </div>
-<br>
+<br />
 </div>
-<br>
+<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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm Thu Jul  6 11:03:02 2006
@@ -58,10 +58,10 @@
 			      #foreach ($env in $envs)
 			      <option value="$env.getPk()">$env.getName()
 			      #end
-			      </select><BR>
+			      </select><br />
 
 ##Steve testing
-<b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a><BR>
+<b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a><br />
 
 #foreach ($worker in $apachePool.getApaches())
 		 $worker.getName() -
@@ -78,7 +78,7 @@
               			      #foreach ($ap in $aps)
               			      <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.getName()
               			      #end
-              			      </select><BR>
+              			      </select><br />
 #end
 #end
 </div>

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm Thu Jul  6 11:03:02 2006
@@ -23,7 +23,7 @@
 #set ($id = $request.getParameter("id"))
 #end
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -35,7 +35,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
     ##<div id="bigright">
     <div class="messagebox">
 
@@ -52,13 +52,13 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Apache/Pool/viewconf.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-    <br/>
+    <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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm Thu Jul  6 11:03:02 2006
@@ -25,7 +25,7 @@
 #end
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -37,7 +37,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
     ##<div id="bigright">
     <div class="messagebox">
 
@@ -54,13 +54,13 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Apache/Pool/viewprop.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-    <br/>
+    <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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm Thu Jul  6 11:03:02 2006
@@ -20,7 +20,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -32,7 +32,7 @@
     </td>
   </tr>
 </table>
-<br/>
+<br />
 
 <div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
@@ -162,9 +162,9 @@
 </form>
 
 </div>
-<br/>
+<br />
 </div>
-<br/>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm Thu Jul  6 11:03:02 2006
@@ -18,7 +18,7 @@
 #if ($User.isAllowed($function) && $methodToCall && $actionLink)
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
   <input type=hidden name="methodToCall" value="$methodToCall">
-  <input type="submit" value="$buttonName"><BR>
+  <input type="submit" value="$buttonName"><br />
   $methodToCall
   <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
   $individual.getName()

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm Thu Jul  6 11:03:02 2006
@@ -25,7 +25,7 @@
 <!-- $id -->
 #end
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -37,7 +37,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
 
     #if ($id)
@@ -71,7 +71,7 @@
 
     #set ($collection = $view.getApacheWorkers($apache))
     #if( $collection && ! $collection.isEmpty())
-    <br/>
+    <br />
     #parse("/Apache/Worker/list.vm")
     #end ## of all apaches
 
@@ -84,12 +84,12 @@
           #foreach ($ap in $aps)
         <option value="$appRoot/Apache/Server/details.vm?id=$ap.getPk()">$ap.getName()
           #end
-      </select><BR>
+      </select><br />
     </div>
     #end
 
 
-    <br>
+    <br />
 
 
   </div>

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm Thu Jul  6 11:03:02 2006
@@ -42,16 +42,16 @@
 <form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
 <input type="hidden" id="id" name="id" value="$!{id}">
 <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-Name: <input type="text"  id="name" name="name" value="$!{apache.getName()}"><br>
-Server Root: <input type="text" size="45" id="serverRoot" name="serverRoot" value="$!{apache.getServerRoot()}"><br>
-Log Location: <input type="text"size="45" id="logLocation" name="logLocation" value="$!{apache.getLogLocation()}"><br>
-System User: <input type="text" id="sysUser" name="sysUser" value="$!{apache.getSysUser()}"><br>
-System Group: <input type="text" id="sysGroup" name="sysGroup" value="$!{apache.getSysGroup()}"><br>
-Start Command: <input type="text" id="startCommand" name="startCommand" value="$!{apache.getStartCommand()}"><br>
-Stop Command: <input type="text" id="stopCommand" name="stopCommand" value="$!{apache.getStopCommand()}"><br>
-Restart Command: <input type="text" id="restartCommand" name="restartCommand" value="$!{apache.getRestartCommand()}"><br>
-Environment Varibles: <input type="text" id="envVaribles" name="envVaribles" value="$!{apache.getEnvVaribles()}"><br>
-	Pid File Location: <input type="text" id="pidFileLocation" name="pidFileLocation" value="$!{apache.getPidFileLocation()}"><br>
+Name: <input type="text"  id="name" name="name" value="$!{apache.getName()}"><br />
+Server Root: <input type="text" size="45" id="serverRoot" name="serverRoot" value="$!{apache.getServerRoot()}"><br />
+Log Location: <input type="text"size="45" id="logLocation" name="logLocation" value="$!{apache.getLogLocation()}"><br />
+System User: <input type="text" id="sysUser" name="sysUser" value="$!{apache.getSysUser()}"><br />
+System Group: <input type="text" id="sysGroup" name="sysGroup" value="$!{apache.getSysGroup()}"><br />
+Start Command: <input type="text" id="startCommand" name="startCommand" value="$!{apache.getStartCommand()}"><br />
+Stop Command: <input type="text" id="stopCommand" name="stopCommand" value="$!{apache.getStopCommand()}"><br />
+Restart Command: <input type="text" id="restartCommand" name="restartCommand" value="$!{apache.getRestartCommand()}"><br />
+Environment Varibles: <input type="text" id="envVaribles" name="envVaribles" value="$!{apache.getEnvVaribles()}"><br />
+	Pid File Location: <input type="text" id="pidFileLocation" name="pidFileLocation" value="$!{apache.getPidFileLocation()}"><br />
 Apache Main:
 #set ($allFiles = $view.getFiles())
 #if ($apache.getMain())
@@ -65,7 +65,7 @@
 <option value="$file.getPk()">$file.getDescriptor()
 #end
 </select>
-<input type="submit" value="Update"><br>
+<input type="submit" value="Update"><br />
 </form>
 #end
 #else
@@ -76,7 +76,7 @@
               	    #foreach ($ap in $aps)
               	      	<option value="$appRoot/Apache/Server/update.vm?id=$ap.getPk()">$ap.getName()
               	    #end
-              	</select><BR>
+              	</select><br />
 #end
 </div>
 <br />

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm Thu Jul  6 11:03:02 2006
@@ -40,7 +40,7 @@
         #foreach ($aw in $aws)
       <option value="$appRoot/Apache/Server/viewconf.vm?id=$aw.getPk()">$aw.getName()
         #end
-    </select><BR>
+    </select><br />
     #end
 
   </div>

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "ApachePool")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       #if ($request.getParameter("workers"))
@@ -45,7 +45,7 @@
       #end
 
 
-      Debug: Number of workers: $numberOfWorkers<BR><BR>
+      Debug: Number of workers: $numberOfWorkers<br /><br />
 
       <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
         <table>
@@ -114,9 +114,9 @@
         <input type="submit" value="submit">
       </form>
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm Thu Jul  6 11:03:02 2006
@@ -18,7 +18,7 @@
 #if ($User.isAllowed($function) && $methodToCall && $actionLink)
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
   <input type=hidden name="methodToCall" value="$methodToCall">
-  <input type="submit" value="$buttonName"><BR>
+  <input type="submit" value="$buttonName"><br />
   $methodToCall
   <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
   $individual.getName()

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm Thu Jul  6 11:03:02 2006
@@ -26,7 +26,7 @@
 #set ($id = $request.getParameter("id"))
 #end
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div class="projectbox">
   <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -38,7 +38,7 @@
       </td>
     </tr>
   </table>
-  <br/>
+  <br />
 
 
   #if ($id)
@@ -83,13 +83,13 @@
 
 #set ($collection = $view.getApachePools($apacheWorker))
 #if( $collection && ! $collection.isEmpty())
-<br/>
+<br />
 #parse("/Apache/Pool/list.vm")
 #end ## of all apachepools
 
 #set ($vhosts = $view.getVirtualHosts($User, $apacheWorker))
 #if( $vhosts && ! $vhosts.isEmpty())
-<br/>
+<br />
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
     <td align="left" valign="center" colspan="3">
@@ -113,7 +113,7 @@
     <td align="center"> $!{vhost.getEnv().getName()} </td>
     <td align="center">
       <a href="$appRoot/Apache/Pool/details.vm?id=$!{vhost.getApachePool().getPk()}">$!{vhost.getApachePool().getName()} </a>
-      <br>
+      <br />
     </td>
     <td align="right">
       #set($ent = $vhost)
@@ -139,12 +139,12 @@
       #foreach ($aw in $aws)
     <option value="$appRoot/Apache/Worker/$page?id=$aw.getPk()">$aw.getName()
       #end
-  </select><BR>
+  </select><br />
 </div>
 #end
 
 
-<br>
+<br />
 
 
 </div>

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm Thu Jul  6 11:03:02 2006
@@ -20,7 +20,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -32,7 +32,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -45,7 +45,7 @@
       <form name="Form" method="post" action='$link.setAction("administration/ApacheWorkerAction")'>
         <input type="hidden" id="id" name="id" value="$!{id}">
         <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-        Name: <input type="text" size="45" readonly id="name" name="name" value="$!{aw.getName()}"><BR>
+        Name: <input type="text" size="45" readonly id="name" name="name" value="$!{aw.getName()}"><br />
 
         Apache:
         #set($Apaches = $view.getApaches())
@@ -54,8 +54,8 @@
           <option value="$apache.getPk()">$apache.getName()
             #end
         </select>
-        <BR>
-        State: <input type="text" readonly id="state" name="state" value="Active"><BR>
+        <br />
+        State: <input type="text" readonly id="state" name="state" value="Active"><br />
         Hardware:
         #set($hardware = $view.getHardwares())
         <select name=hardwareId>
@@ -63,7 +63,7 @@
           <option value="$h.getPk()">$h.getName()
             #end
         </select>
-        <BR>
+        <br />
         <input type="submit" value="update">
       </form>
       #else
@@ -74,13 +74,13 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Apache/Worker/update.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm Thu Jul  6 11:03:02 2006
@@ -24,7 +24,7 @@
 #end
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -36,7 +36,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -53,13 +53,13 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Apache/Worker/viewconf.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm Thu Jul  6 11:03:02 2006
@@ -25,7 +25,7 @@
 #end
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -37,7 +37,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -54,13 +54,13 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Apache/Worker/viewprop.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "alerts")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       <form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
@@ -65,7 +65,7 @@
               Is Context HTML Formatted?:
             </td>
             <td>
-              Yes<input type="radio" id="format" name="format" value="Yes" checked> <br>
+              Yes<input type="radio" id="format" name="format" value="Yes" checked> <br />
               No<input type="radio" id="format" name="format" value="No">
             </td>
           </tr>
@@ -74,9 +74,9 @@
         <input type="submit" value="submit">
       </form>
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm Thu Jul  6 11:03:02 2006
@@ -17,12 +17,12 @@
 ##
 <div class="messagebox">
   #if ($User.isAllowed($function) && $methodToCall && $actionLink)
-  <br/>
+  <br />
 
   <form name="Form" method="post" action='$link.setAction($actionLink)'>
     <input type=hidden name="methodToCall" value="$methodToCall">
-    <input type="submit" value="$buttonName"><BR>
-    <br/>
+    <input type="submit" value="$buttonName"><br />
+    <br />
     $methodToCall
     <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
     $individual.getName()

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "alert")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       <SCRIPT LANGUAGE=javascript>
@@ -55,16 +55,16 @@
       #set ($a = $alertSet.getAlertById($idNum.valueOf($id)))
 
       #if ($User.isAllowed("ViewAlert"))
-      <br/>
-      Alert Title: $!{a.getName()}<br>
-      Alert Link: $!{a.getLink()}<br>
-      Alert Content: $!{a.getContent()}<br>
+      <br />
+      Alert Title: $!{a.getName()}<br />
+      Alert Link: $!{a.getLink()}<br />
+      Alert Content: $!{a.getContent()}<br />
       #end
 
       #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
-      <BR>
-      <a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<BR><BR>
-      <BR>
+      <br />
+      <a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<br /><br />
+      <br />
       #end
 
       #if ($User.isAllowed("DeleteAlert"))
@@ -75,7 +75,7 @@
       </form>
       #end
       #else
-      <br/>
+      <br />
       Alert:
       #set ($als = $alertSet.getRecentAlerts())
       <select name=id onchange='OnChangeIn(this);'>
@@ -83,14 +83,14 @@
           #foreach ($al in $als)
         <option value="$al.getPk()">$al.getName()</option>
         #end
-      </select><BR>
-      <br/>
+      </select><br />
+      <br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm Thu Jul  6 11:03:02 2006
@@ -32,7 +32,7 @@
   //-->
 </SCRIPT>
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -44,7 +44,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -58,7 +58,7 @@
 
       ##remove below comment at appropriate time
       #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
-      <br/>
+      <br />
 
       <form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
         <table>
@@ -93,7 +93,7 @@
       </form>
       #end
       #else
-      <br/>
+      <br />
       Alerts:
       #set ($als = $alertSet.getRecentAlerts())
       <select name=id onchange='OnChangeIn(this);'>
@@ -101,13 +101,13 @@
           #foreach ($al in $als)
         <option value="$al.getPk()">$al.getName()
           #end
-      </select><BR>
-      <br/>
+      </select><br />
+      <br />
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm Thu Jul  6 11:03:02 2006
@@ -22,7 +22,7 @@
 
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -38,10 +38,10 @@
     ##<td colspan="2" align="right"></td>
     ##</tr>
   ##</table>
-<br/>
+<br />
 #if ($name && $type != "")
 <div class="messagebox" width="75%" align="center">
-  <br/>
+  <br />
 
   <form name="Form1" method="post" action='$appRoot/Core/Entity/search.vm'>
 
@@ -50,13 +50,13 @@
     <option value="Virtualhost">Virtualhost</option>
     <option value="Context">Context</option>
   </select>
-    <input type="text" id="name" name="name" value="$!{name}"><br/>
+    <input type="text" id="name" name="name" value="$!{name}"><br />
 
     <input type="submit" value="Search">
   </form>
-  <br/>
+  <br />
 </div>
-<br/>
+<br />
 #if ($type == "HostingPool")
 #set($collection = $view.searchHostingPools($name))
 #set($path = "Core/Pool")
@@ -91,7 +91,7 @@
 #parse("$path/list.vm")
 #end
 <div class="messagebox" width="75%" align="center">
-  <br/>
+  <br />
   #if ($name && $type != "")
   <form name="Form2" method="post" action='$appRoot/Core/Entity/search.vm'>
     #else
@@ -101,14 +101,14 @@
       <option value="">Select one</option>
       <option value="Virtualhost">Virtualhost</option>
       <option value="Context">Context</option>
-    </select> <input type="text" id="name" name="name" value="$!{name}"><br/>
+    </select> <input type="text" id="name" name="name" value="$!{name}"><br />
 
       <input type="submit" value="Search">
     </form>
-    <br/>
+    <br />
 </div>
 
-<br/>
+<br />
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm Thu Jul  6 11:03:02 2006
@@ -41,13 +41,13 @@
     #if($id)
     #if ($User.isAllowed("ViewEnvironment") && $methodToCall == "ViewEnvironment")
     #set ($Environment = $view.getEnvironment($id))
-    Name: $!{Environment.getName()}<BR>
+    Name: $!{Environment.getName()}<br />
     Comments: <textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{Environment.getComments()} </textarea>
-    <BR>
+    <br />
     #end
 
     #if ($User.isAllowed("UpdateEnvironment"))
-    <a href="$appRoot/Core/Environment/update.vm?id=$id">Update this Environment</a> &nbsp;<BR><BR>
+    <a href="$appRoot/Core/Environment/update.vm?id=$id">Update this Environment</a> &nbsp;<br /><br />
     #end
 
     #if ($User.isAllowed("DeleteEnvironment"))
@@ -66,7 +66,7 @@
         #foreach ($env in $envs)
       <option value="$env.getPk()">$env.getName()
         #end
-    </select><BR>
+    </select><br />
 
 
     #end

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm Thu Jul  6 11:03:02 2006
@@ -43,9 +43,9 @@
     <form name="Form" method="post" action='$link.setAction("administration/EnvironmentAction")'>
       <input type="hidden" id="id" name="id" value="$!{id}">
       <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-      Name: <input type="text" readonly id="envName" name="envName" value="$!{Environment.getName()}"><BR>
+      Name: <input type="text" readonly id="envName" name="envName" value="$!{Environment.getName()}"><br />
       Comments: <textarea id="comments" name="comments" cols="40" rows="5"> $!{Environment.getComments()} </textarea>
-      <BR>
+      <br />
       <input type="submit" value="Update">
 
     </form>
@@ -57,7 +57,7 @@
         #foreach ($env in $envs)
       <option value="$env.getPk()">$env.getName()
         #end
-    </select><BR>
+    </select><br />
 
     #end
     #end

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "file")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm Thu Jul  6 11:03:02 2006
@@ -21,7 +21,7 @@
 <br />
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
 <input type=hidden name="methodToCall" value="$methodToCall" >
-<input type="submit" value="$buttonName"><BR>
+<input type="submit" value="$buttonName"><br />
 <br />
 $methodToCall
 <input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "file")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       <SCRIPT LANGUAGE=javascript>
@@ -53,15 +53,15 @@
       #if($id)
       #set ($file = $view.getFile($id))
 
-      #if ($User.isAllowed("ViewFile")) <BR>
-      Name: "$!{file.getName()}" <BR>
-      Path: "$!{file.getPath()}" <BR>
-      Descriptor: "$!{file.getDescriptor()}" <BR>
-      Content: <textarea id="content" name="content" READONLY cols="90" rows="30">$!{file.getContent()}</textarea><BR>
+      #if ($User.isAllowed("ViewFile")) <br />
+      Name: "$!{file.getName()}" <br />
+      Path: "$!{file.getPath()}" <br />
+      Descriptor: "$!{file.getDescriptor()}" <br />
+      Content: <textarea id="content" name="content" READONLY cols="90" rows="30">$!{file.getContent()}</textarea><br />
       #end
 
       #if ($User.isAllowed("UpdateFile"))
-      <BR><BR><a href="$appRoot/Core/File/update.vm?id=$id">Update this File</a> &nbsp;<BR><BR>
+      <br /><br /><a href="$appRoot/Core/File/update.vm?id=$id">Update this File</a> &nbsp;<br /><br />
       #end
 
       #if ($User.isAllowed("DeleteFile"))
@@ -80,13 +80,13 @@
           #foreach ($file in $files)
         <option value="$file.getPk()">$file.getName()
           #end
-      </select><BR>
+      </select><br />
 
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm Thu Jul  6 11:03:02 2006
@@ -44,7 +44,7 @@
 
 
 ##<div align="center" class="contentbox">
-  ##<br/><br/>
+  ##<br /><br />
 
   ##<div class="projectbox">
   ##
@@ -57,7 +57,7 @@
     ## </td>
     ##</tr>
     ##</table>
-  ##<br/>
+  ##<br />
   ##<div class="messagebox">
   ##
   ##
@@ -87,9 +87,9 @@
     ## </form>
   ###end
   ##</div>
-  ##<br/>
+  ##<br />
   ##</div>
-  ##<br/>
+  ##<br />
   ##</div>
 ###parse("/layout/footer.vm")
 ##

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "file")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       <SCRIPT LANGUAGE=javascript>
@@ -57,10 +57,10 @@
         <input type="hidden" id="id" name="id" value="$!{id}">
         <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
-        Name: <input type="text" id="name" name="name" value="$!{file.getName()}"><BR>
-        Path: <input type="text" id="path" name="path" value="$!{file.getPath()}"><BR>
-        Descriptor: <input type="text" id="descriptor" name="descriptor" value="$!{file.getDescriptor()}"><BR>
-        Content: <textarea id="content" name="content" cols="90" rows="30">$!{file.getContent()}</textarea><BR>
+        Name: <input type="text" id="name" name="name" value="$!{file.getName()}"><br />
+        Path: <input type="text" id="path" name="path" value="$!{file.getPath()}"><br />
+        Descriptor: <input type="text" id="descriptor" name="descriptor" value="$!{file.getDescriptor()}"><br />
+        Content: <textarea id="content" name="content" cols="90" rows="30">$!{file.getContent()}</textarea><br />
         <input type="submit" value="update">
       </form>
       #end
@@ -73,13 +73,13 @@
           #foreach ($file in $files)
         <option value="$file.getPk()">$file.getName()
           #end
-      </select><BR>
+      </select><br />
 
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm Thu Jul  6 11:03:02 2006
@@ -40,8 +40,8 @@
 
 
     #set ($Function = $view.getFunction($id))
-    Name: $!{Function.getName()}<BR>
-    Function Command: $!{Function.getCommand()}<BR>
+    Name: $!{Function.getName()}<br />
+    Function Command: $!{Function.getCommand()}<br />
 
 
     #else
@@ -52,7 +52,7 @@
         #foreach ($function in $functions)
       <option value="$function.getPk()">$function.getName()
         #end
-    </select><BR>
+    </select><br />
 
 
     #end

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm Thu Jul  6 11:03:02 2006
@@ -44,9 +44,9 @@
       <input type="hidden" id="id" name="id" value="$!{id}">
       <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
-      Name: <input type="text" id="functionName" name="functionName" value="$!{Function.getName()}"><BR>
+      Name: <input type="text" id="functionName" name="functionName" value="$!{Function.getName()}"><br />
       Function Command: <input type="text" id="functionCommand" name="functionCommand"
-                               value="$!{Function.getCommand()}"><BR>
+                               value="$!{Function.getCommand()}"><br />
 
       <input type="submit" value="Update">
 
@@ -59,7 +59,7 @@
         #foreach ($function in $functions)
       <option value="$function.getPk()">$function.getName()
         #end
-    </select><BR>
+    </select><br />
 
     #end
     #end

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "instance")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
       <form name="Form" method="post" action='$link.setAction("administration/InstanceAction")'>
@@ -57,9 +57,9 @@
         <input type="submit" value="submit">
       </form>
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm Thu Jul  6 11:03:02 2006
@@ -21,7 +21,7 @@
 <br />
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
 <input type=hidden name="methodToCall" value="$methodToCall" >
-<input type="submit" value="$buttonName"><BR>
+<input type="submit" value="$buttonName"><br />
 <br />
 $methodToCall
 <input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "instance")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -57,13 +57,13 @@
 
       #if ($User.isAllowed("ViewInstance") && $methodToCall == "UpdateInstance")
       #set ($instance = $view.getInstance($id))
-      Name: $!{instance.getName()}<br>
+      Name: $!{instance.getName()}<br />
       Comments: <textarea readonly id="entry" name="entry" cols="40" rows="5"> $!{instance.getComments()} </textarea>
-      <BR>
+      <br />
       #end
 
       #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateInstance")
-      <a href="$appRoot/Core/Instance/update.vm?id=$id">Update this Instance</a> &nbsp;<BR><BR>
+      <a href="$appRoot/Core/Instance/update.vm?id=$id">Update this Instance</a> &nbsp;<br /><br />
       #end
 
       #if ($User.isAllowed("DeleteInstance"))
@@ -83,13 +83,13 @@
           #foreach ($inst in $insts)
         <option value="$inst.getPk()">$inst.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "instance")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -60,8 +60,8 @@
         <input type="hidden" id="id" name="id" value="$!{id}">
         <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
-        Name: <input type="text" readonly id="instanceName" name="instanceName" value="$!{instance.getName()}"><br>
-        Comments: <textarea id="comments" name="comments" cols="40" rows="5"> $!{instance.getComments()} </textarea><BR>
+        Name: <input type="text" readonly id="instanceName" name="instanceName" value="$!{instance.getName()}"><br />
+        Comments: <textarea id="comments" name="comments" cols="40" rows="5"> $!{instance.getComments()} </textarea><br />
         <input type="submit" value="Update">
       </form>
       #end
@@ -73,12 +73,12 @@
           #foreach ($inst in $insts)
         <option value="$inst.getPk()">$inst.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm Thu Jul  6 11:03:02 2006
@@ -21,7 +21,7 @@
 
 #set ($jobPoolId = $request.getParameter("Id"))
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td valign="middle">
@@ -38,7 +38,7 @@
     </tr>
   </table>
 
-  <br>
+  <br />
 
   ##get recent jobs.
 
@@ -93,13 +93,13 @@
       <td>
         <font color="$Job.getState().getColor()">$Job.getState().getName() </font>
       </td>
-      <td> #if($Job.getState().getPk() > 3) $Job.getResult().replaceAll("\n","<br/>") #end </td>
+      <td> #if($Job.getState().getPk() > 3) $Job.getResult().replaceAll("\n","<br />") #end </td>
     </tr>
     #end
     #end
 
   </table>
-  <br/>
+  <br />
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm Thu Jul  6 11:03:02 2006
@@ -24,7 +24,7 @@
 #set ($numToShow = 10)
 #end
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -53,7 +53,7 @@
     <font color=red>$!ErrorMessage</font>
     #end
     $!ResultMessage
-    <br/>
+    <br />
 
     ##get recent jobs.
     #set ($recentJobs = $User.getRecentJobPools($numToShow))
@@ -98,10 +98,10 @@
       #end
       #end
     </table>
-    <br/>
+    <br />
   </div>
 
-  <br/>
+  <br />
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm Thu Jul  6 11:03:02 2006
@@ -21,7 +21,7 @@
 
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <table width="90%" border="0" cellspacing="1" cellpadding="1">
 
@@ -48,6 +48,6 @@
 
   </table>
 
-  <br/>
+  <br />
 </div>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm Thu Jul  6 11:03:02 2006
@@ -20,7 +20,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 #if($filter || $StartDate || $EndDate || $userId || $functions)
 #set($results = $view.getJobPools($userId, $filter, $StartDate, $EndDate, $functions))
 #end
@@ -53,7 +53,7 @@
   </tr>
 </table>
 
-<br>
+<br />
 
 #if ($results)
 <table width="90%" border="0" cellspacing="1" cellpadding="1">
@@ -97,12 +97,12 @@
   #end
   #end
 </table>
-<br>
+<br />
 #end
 
 <table width="90%" class="messagebox" align="center">
   <tr><td align=center>
-    <br/>
+    <br />
 
     <form action="$appRoot/Core/JobPool/search.vm">
       <table width="50%">
@@ -129,16 +129,16 @@
 
 
     </form>
-    <br>
+    <br />
   </td></tr></table>
 
-<br>
-<br>
+<br />
+<br />
 
 
-<br/>
+<br />
 </div>
-<br/></div>
+<br /></div>
 
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "Pool")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -28,7 +28,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -89,9 +89,9 @@
         <input type="submit" value="submit">
       </form>
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm Thu Jul  6 11:03:02 2006
@@ -18,12 +18,12 @@
 <div class="messagebox">
   <!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
   #if ($User.isAllowed($function) && $methodToCall && $actionLink)
-  <br/>
+  <br />
 
   <form name="Form" method="post" action='$link.setAction($actionLink)'>
     <input type=hidden name="methodToCall" value="$methodToCall">
-    <input type="submit" value="$buttonName"><BR>
-    <br/>
+    <input type="submit" value="$buttonName"><br />
+    <br />
     $methodToCall
     <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
     $individual.getName()

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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm Thu Jul  6 11:03:02 2006
@@ -21,7 +21,7 @@
 #set ($id = $request.getParameter("id"))
 #set ($methodToCall = "UpdateHostingPool")
 <div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -33,7 +33,7 @@
     </td>
   </tr>
 </table>
-<br/>
+<br />
 #if ($id)
 #set ($ent = $view.getHostingPool($id))
 #set ($hp = $ent)
@@ -82,7 +82,7 @@
 #set ($apachePool = $hp.getApachePool())
 #set ($vhosts = $view.getVirtualHosts($User, $apachePool))
 #if( $vhosts && ! $vhosts.isEmpty())
-<br>
+<br />
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
     <td align="left" valign="center" colspan=4>
@@ -104,7 +104,7 @@
   <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>
+    <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br />
     #end
   </td>
   <td align="right">
@@ -143,7 +143,7 @@
 #set ($tomcatPool = $hp.getTomcatPool())
 #set ($projectContexts = $view.getTomcatContexts($User, $tomcatPool))
 #if( $projectContexts && ! $projectContexts.isEmpty())
-<br>
+<br />
 <TABLE WIDTH="95%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
   <tr height="15" class="info">
     <td align="left" valign="center" colspan=4>
@@ -173,7 +173,7 @@
   #end
   <td>
     #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
-    <A href="$appRoot/Tomcat/Worker/$page?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
+    <A href="$appRoot/Tomcat/Worker/$page?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br />
     #end
   </td>
   <td align="right">
@@ -207,9 +207,9 @@
   </table>
 </div>
 #end
-<br/>
+<br />
 </div>
-<br/>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm Thu Jul  6 11:03:02 2006
@@ -22,7 +22,7 @@
 
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -34,10 +34,10 @@
         </select></td>
       </tr>
     </table>
-    <br/>
+    <br />
     #if ($name && $type != "")
     <div class="messagebox" width="75%" align="center">
-      <br/>
+      <br />
 
       <form name="Form1" method="post" action='$appRoot/Core/Pool/search.vm'>
 
@@ -47,13 +47,13 @@
         <option value="ApachePool">Apache Pool</option>
         <option value="TomcatPool">Tomcat Pool</option>
       </select>
-        <input type="text" id="name" name="name" value="$!{name}"><br/>
+        <input type="text" id="name" name="name" value="$!{name}"><br />
 
         <input type="submit" value="Search">
       </form>
-      <br/>
+      <br />
     </div>
-    <br/>
+    <br />
     #if ($type == "HostingPool")
     #set($collection = $view.searchHostingPools($name))
     #set($path = "Core/Pool")
@@ -88,7 +88,7 @@
     #parse("$path/list.vm")
     #end
     <div class="messagebox" width="75%" align="center">
-      <br/>
+      <br />
       #if ($name && $type != "")
       <form name="Form2" method="post" action='$appRoot/Core/Pool/search.vm'>
         #else
@@ -99,14 +99,14 @@
           <option value="HostingPool">Hosting Pool</option>
           <option value="ApachePool">Apache Pool</option>
           <option value="TomcatPool">Tomcat Pool</option>
-        </select> <input type="text" id="name" name="name" value="$!{name}"><br/>
+        </select> <input type="text" id="name" name="name" value="$!{name}"><br />
 
           <input type="submit" value="Search">
         </form>
-        <br/>
+        <br />
     </div>
 
-    <br/>
+    <br />
   </div>
 
   #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm Thu Jul  6 11:03:02 2006
@@ -19,7 +19,7 @@
 #set ($pageSelected = "Pool")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -31,7 +31,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     <div class="messagebox">
 
@@ -47,7 +47,7 @@
         <input type="hidden" id="id" name="id" value="$!{id}">
         <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
-        Name: <input type="text" id="poolName" name="poolName" value="$!{hp.getName()}"><br/>
+        Name: <input type="text" id="poolName" name="poolName" value="$!{hp.getName()}"><br />
         TomcatPool:
         #set ($tps = $view.getTomcatPools())
         #if ($hp.getTomcatPool())
@@ -60,7 +60,7 @@
             #foreach ($tp in $tps)
           <option value="$tp.getPk()">$tp.getName()
             #end
-        </select><BR>
+        </select><br />
 
         Apache Pool:
         #set ($aps = $view.getApachePools())
@@ -74,7 +74,7 @@
             #foreach ($ap in $aps)
           <option value="$ap.getPk()">$ap.getName()
             #end
-        </select><BR>
+        </select><br />
 
         #set ($envs = $view.getEnvironments())
         #if($hp.getEnv())
@@ -87,7 +87,7 @@
           #foreach ($env in $envs)
         <option value="$env.getPk()">$env.getName()
           #end
-      </select><br>
+      </select><br />
 
         <input type="submit" value="Update">
 
@@ -100,13 +100,13 @@
           #foreach ($hp in $hps)
         <option value="$appRoot/Core/Pool/update.vm?id=$hp.getPk()">$hp.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
       #end
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm Thu Jul  6 11:03:02 2006
@@ -20,7 +20,7 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-  <br/><br/>
+  <br /><br />
 
   <div class="projectbox">
     <table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -29,7 +29,7 @@
         </td>
       </tr>
     </table>
-    <br/>
+    <br />
 
     #if ($request.getParameter("id"))
     #set ($id = $request.getParameter("id"))
@@ -50,13 +50,13 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Core/Pool/viewapacheconf.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><BR>
+      </select><br />
       #end
 
     </div>
-    <br/>
+    <br />
   </div>
-  <br/>
+  <br />
 </div>
 #parse("/layout/footer.vm")
 



Mime
View raw message