You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/06 18:03:09 UTC
svn commit: r419631 [2/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...
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.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/viewapacheprop.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/Pool/viewserverxml.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.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"))
#end
@@ -46,12 +46,12 @@
#foreach ($tw in $tws)
<option value="$appRoot/Core/Pool/viewserverxml.vm?id=$tw.getPk()">$tw.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/Project/availtemplates.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm Thu Jul 6 11:03:02 2006
@@ -17,11 +17,11 @@
##
<div id="left">
<div class="messagebox" align="left">
- Available Templates:<br/>
- <a href="$appRoot/Template/addVhost.vm">Generic VirtualHost</a><br/>
- <a href="$appRoot/Template/addInternetProject.vm">DMZ Project</a><br/>
- <a href="$appRoot/Template/addsite.vm">Add Intranet Site</a><br/>
- <br/><br/><br/>
+ Available Templates:<br />
+ <a href="$appRoot/Template/addVhost.vm">Generic VirtualHost</a><br />
+ <a href="$appRoot/Template/addInternetProject.vm">DMZ Project</a><br />
+ <a href="$appRoot/Template/addsite.vm">Add Intranet Site</a><br />
+ <br /><br /><br />
</div>
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm Thu Jul 6 11:03:02 2006
@@ -40,8 +40,8 @@
Are you sure you want to delete $!{project.getName()}
- <br>
- <br>
+ <br />
+ <br />
<td valign="middle">
<form action="javascript:history.go(-1)" method="post">
#submit_button("submit" "<Back" "button" "")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm Thu Jul 6 11:03:02 2006
@@ -63,7 +63,7 @@
</td>
</tr>
</table>
-<br>
+<br />
#set($c = 1)
#if( $vhosts && ! $vhosts.isEmpty())
<table width="95%" border="0" cellspacing="0" cellpadding="1">
@@ -128,7 +128,7 @@
<td> </td>
<td class="bodycolor$c$cc"><a href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}&p=$projectId"> $!{context.getName()} </td>
<td class="bodycolor$c$cc">
- <a href="$appRoot/Tomcat/Pool/view.vm?id=$!{tomcatPool.getPk()}">$!{tomcatPool.getName()} </a><br>
+ <a href="$appRoot/Tomcat/Pool/view.vm?id=$!{tomcatPool.getPk()}">$!{tomcatPool.getName()} </a><br />
</td>
<td align="right" class="bodycolor$c$cc">
<!-- before macro -->
@@ -155,7 +155,7 @@
#end
#end ## end of IF VHOST.
</TABLE>
-<br>
+<br />
#set ($temp = $projectContexts.clone())
#foreach ($context in $temp)
#if($envId && $context.getEnvId().toString() != $envId)
@@ -192,7 +192,7 @@
#end
<td>
#foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
- <a href="$appRoot/Tomcat/Worker/view.vm?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
+ <a href="$appRoot/Tomcat/Worker/view.vm?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br />
#end
</td>
<td align="right">
@@ -211,7 +211,7 @@
#end ##of all servers for this context
#end ## of all contexts
</table>
-<br>
+<br />
<table width="95%" border="0" cellspacing="0" cellpadding="1">
<!-- Jobs -->
#set ($jobpool = $project.getJobPools())
@@ -248,7 +248,7 @@
#end
#end
</table>
-<br>
+<br />
<table width="95%" border="0" cellspacing="0" cellpadding="1">
<!-- Jobs -->
#set ($users = $project.getUsers())
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm Thu Jul 6 11:03:02 2006
@@ -32,7 +32,7 @@
#set ($menu = "/layout/menu/ProjectTop.vm")
#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">
@@ -45,12 +45,12 @@
<td colspan="2" align="right"></td>
</tr>
</table>
- <br/>
+ <br />
#set($projectsInCallingVm = $recentProjects)
#parse("/Core/Project/list.vm")
- <br/>
+ <br />
</div>
- <br/>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/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">
@@ -31,10 +31,10 @@
<td colspan="2" align="right"></td>
</tr>
</table>
- <br/>
+ <br />
#if ($name)
<div class="messagebox" width="75%" align="center">
- <br/>
+ <br />
<form name="Form1" method="post" action='$appRoot/Core/Project/search.vm'>
@@ -43,13 +43,13 @@
<option value="contains">Contains</option>
<option value="endsWith">Ends With</option>
<option value="isExactly">is Exactly</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 />
#if ($type == "beginsWith")
#set($projectsInCallingVm = $view.getProjectBeginsWith($name))
#elseif ($type == "endsWith")
@@ -61,12 +61,12 @@
#end
#parse("/Core/Project/list.vm")
</table>
- <br/>
+ <br />
#end
<div class="messagebox" width="75%" align="center">
- <br/>
+ <br />
#if ($name)
<form name="Form2" method="post" action='$appRoot/Core/Project/search.vm'>
#else
@@ -77,14 +77,14 @@
<option value="contains">Contains</option>
<option value="endsWith">Ends With</option>
<option value="isExactly">is Exactly</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/Project/user.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm Thu Jul 6 11:03:02 2006
@@ -21,7 +21,7 @@
#end
#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">
@@ -30,13 +30,13 @@
<td colspan="2" align="right"></td>
</tr>
</table>
- <br/>
+ <br />
##get the user's projects
#set ($projectsInCallingVm = $User.getProjects())
#parse("/Core/Project/list.vm")
- <br/>
+ <br />
</div>
- <br/>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "Server")
#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">
<form name="Form" method="post" action='$link.setAction("administration/HardwareAction")'>
@@ -107,7 +107,7 @@
Default IP:
</td>
<td>
- <input type="text" name="defaultIp" value="$!{defaultIp}"><br>
+ <input type="text" name="defaultIp" value="$!{defaultIp}"><br />
</td>
</tr>
<tr>
@@ -123,9 +123,9 @@
<input type="submit" value="Add">
</form>
</div>
-<br/>
+<br />
</div>
-<br/>
+<br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/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()">
$individual.getName()
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.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 />
#if ($id)
@@ -79,13 +79,13 @@
#set ($collection = $view.getApacheWorkers($hardware))
#if( $collection && ! $collection.isEmpty())
- <br/>
+ <br />
#parse("/Apache/Worker/list.vm")
#end ## of all apaches
#set ($collection = $view.getTomcatWorkers($hardware))
#if( $collection && ! $collection.isEmpty())
- <br/>
+ <br />
#parse("/Tomcat/Worker/list.vm")
#end ## of all apaches
@@ -98,12 +98,12 @@
#foreach ($hw in $hws)
<option value="$appRoot/Core/Server/details.vm?id=$hw.getPk()">$hw.getName()
#end
- </select><BR>
+ </select><br />
</div>
#end
- <br>
+ <br />
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/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">
@@ -40,10 +40,10 @@
Tomcat</a></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/Server/search.vm'>
@@ -53,13 +53,13 @@
<option value="Apache">Apache</option>
<option value="Tomcat">Tomcat</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")
@@ -94,7 +94,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/Server/search.vm'>
#else
@@ -105,14 +105,14 @@
<option value="Hardware">Hardware</option>
<option value="Apache">Apache</option>
<option value="Tomcat">Tomcat</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/Server/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm Thu Jul 6 11:03:02 2006
@@ -33,7 +33,7 @@
</SCRIPT>
<div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
<div class="projectbox">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -45,7 +45,7 @@
</td>
</tr>
</table>
-<br/>
+<br />
<div class="messagebox">
#if ( $request.getParameter("id"))
@@ -60,8 +60,8 @@
<input type="hidden" id="hardwareId" name="hardwareId" value="$!{id}">
<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
- Name: <input type="text" readonly name="hardwareName" value="$hardware.getServerName()"><br>
- Physical Location: <input type="text" name="physicalLocation" value="$!{hardware.getPhysicalLocation()}"><br>
+ Name: <input type="text" readonly name="hardwareName" value="$hardware.getServerName()"><br />
+ Physical Location: <input type="text" name="physicalLocation" value="$!{hardware.getPhysicalLocation()}"><br />
#set ($envs = $view.getEnvironments())
#if($hardware.getEnv())
@@ -74,7 +74,7 @@
#foreach ($env in $envs)
<option value="$env.getPk()">$env.getName()</option>
#end
-</select><br>
+</select><br />
#set ($insts = $view.getInstances())
#if($hardware.getInstance())
@@ -87,7 +87,7 @@
#foreach ($inst in $insts)
<option value="$inst.getPk()">$inst.getName()</option>
#end
-</select><br/>
+</select><br />
Status: <select id="statusId" name="statusId">
#if($hardware.getStatus().getPk() == 8)
@@ -100,7 +100,7 @@
<option value="8">Active</option>
<option value="9">Inactive</option>
#end
-</select><br/>
+</select><br />
#set ($ips = $view.getIps())
#if($hardware.getDefaultIp())
@@ -108,7 +108,7 @@
#end
#end
- Default Ip:<input type="text" id="defaultIp" name="defaultIp" value="$!{hardware.getDefaultIp().getName()}"><BR>
+ Default Ip:<input type="text" id="defaultIp" name="defaultIp" value="$!{hardware.getDefaultIp().getName()}"><br />
Additional Ips (comma seperated):
#set ($ips = $hardware.getIpAddresses())
#if($ips.remove($hardware.getDefaultIp()))
@@ -122,28 +122,28 @@
#end
#end
<input type="text" name="ips" value="$!{additionalIps}">
- <br>
- Comments: <input type="text" name="comments" value="$!{hardware.getComments()}"><br>
- <BR>
+ <br />
+ Comments: <input type="text" name="comments" value="$!{hardware.getComments()}"><br />
+ <br />
<input type="submit" value="Update">
</form>
#else
-Name: $hardware.getName()<br>
-Location: $hardware.getPhysicalLocation()<br>
-Environment: $hardware.getEnv().getName()<br>
-Instance: $hardware.getInstance().getName()<br>
-Status: $hardware.getStatus().getName()<br>
-Default Ip: $hardware.getDefaultIp().getName()<br>
-Additional Ips:<br>
+Name: $hardware.getName()<br />
+Location: $hardware.getPhysicalLocation()<br />
+Environment: $hardware.getEnv().getName()<br />
+Instance: $hardware.getInstance().getName()<br />
+Status: $hardware.getStatus().getName()<br />
+Default Ip: $hardware.getDefaultIp().getName()<br />
+Additional Ips:<br />
#foreach($ip in $hardware.getIpAddresses())
-$ip.getName()<br>
+$ip.getName()<br />
#end
-Comments: $hardware.getComments()<br>
+Comments: $hardware.getComments()<br />
#end
-<BR><BR>
+<br /><br />
#else
Hardware:
#set ($hws = $view.getHardwares())
@@ -152,12 +152,12 @@
#foreach ($hw in $hws)
<option value="$hw.getPk()">$hw.getName()</option>
#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/State/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm Thu Jul 6 11:03:02 2006
@@ -42,8 +42,8 @@
#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateState")
#set ($state = $view.getState($id))
- Name: $!{state.getName()}<BR>
- Color to Display as: $!{state.getColor()}<BR>
+ Name: $!{state.getName()}<br />
+ Color to Display as: $!{state.getColor()}<br />
#end
@@ -55,7 +55,7 @@
#foreach ($state in $states)
<option value="$state.getPk()">$state.getName()
#end
- </select><BR>
+ </select><br />
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm Thu Jul 6 11:03:02 2006
@@ -44,8 +44,8 @@
<input type="hidden" id="id" name="id" value="$!{id}">
<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
- Name: <input type="text" id="stateName" name="stateName" value="$!{state.getName()}"><BR>
- Color to Display as: <input type="text" id="color" name="color" value="$!{state.getColor()}"><BR>
+ Name: <input type="text" id="stateName" name="stateName" value="$!{state.getName()}"><br />
+ Color to Display as: <input type="text" id="color" name="color" value="$!{state.getColor()}"><br />
<input type="submit" value="Update">
@@ -58,7 +58,7 @@
#foreach ($state in $states)
<option value="$state.getPk()">$state.getName()
#end
- </select><BR>
+ </select><br />
#end
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "User")
#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/UserAction")'>
@@ -100,9 +100,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/User/addAdmin.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm Thu Jul 6 11:03:02 2006
@@ -65,7 +65,7 @@
</SCRIPT>
<div align="center" class="contentbox">
- <br/><br/>
+ <br /><br />
<div class="projectbox">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -77,12 +77,12 @@
</td>
</tr>
</table>
- <br/>
+ <br />
<div class="messagebox">
<form name="Form" method="post" action='$link.setAction("User/AddAdminUserAction")'>
<input type="hidden" name="methodToCall" value="AddUserToProject">
- <BR>
+ <br />
#if($tryuser)
$tryuser
<input type=hidden name="userName" value="$tryuser">
@@ -92,19 +92,19 @@
#end
#else
User ID: <input type="text" name="userId" size="11" onkeypress="return handleEnter(this, event)">
- <br><input type=button value="Add User" onClick='OnClickUser()'>
+ <br /><input type=button value="Add User" onClick='OnClickUser()'>
#end
- <br>
+ <br />
#if ($tryuser)
#if ($User.isAllowed("AddUserToProject"))
#set ($functions = $view.getFunctions())
#foreach($function in $functions)
#if($User.isAllowed($function) || $User.getPk() == 1)
#if($user && $user.isAllowed($function))
- $function.getName() <input type=checkbox name=functions value="$function.getPk()" checked> <br>
+ $function.getName() <input type=checkbox name=functions value="$function.getPk()" checked> <br />
#else
- $function.getName() <input type=checkbox name=functions value="$function.getPk()"> <br>
+ $function.getName() <input type=checkbox name=functions value="$function.getPk()"> <br />
#end
#end
#end
@@ -115,9 +115,9 @@
</form>
</div>
- <br/>
+ <br />
</div>
- <br/>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm Thu Jul 6 11:03:02 2006
@@ -38,7 +38,7 @@
#end
<div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
<div class="projectbox">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -50,7 +50,7 @@
</td>
</tr>
</table>
-<br/>
+<br />
<div class="messagebox">
@@ -112,16 +112,16 @@
<input type="hidden" name="methodToCall" value="AddUserToProject">
#if ($projectId)
#set ($project = $User.getProject($projectId))
-<input type="hidden" name="projectId" value="$projectId">Project: $project.getName() <br>
+<input type="hidden" name="projectId" value="$projectId">Project: $project.getName() <br />
#else
-<BR>
+<br />
Project:
<select name=projectId onchange='OnChangeIn(this);'>
<option value="">Select one
#foreach($project in $User.getAdministratableProjects().orderByName().values())
<option value="$project.getPk()">$project.getName()
#end
-</select><br>
+</select><br />
#end
#if ($projectId)
@@ -134,7 +134,7 @@
#end
#else
User ID: <input type="text" name="userId" size="11" onkeypress="return handleEnter(this, event)">
-<br><input type=button value="Add User" onClick='OnClickUser()'>
+<br /><input type=button value="Add User" onClick='OnClickUser()'>
#end
#end
@@ -147,7 +147,7 @@
#foreach($entry in $view.getEnvironments())
<option value="$entry.getName()">$entry.getName()
#end
-</select><br>
+</select><br />
#end
#if ($selUserId && $envname)
@@ -170,10 +170,10 @@
#foreach($function in $availFunctions)
#if($user && $user.isAllowed($function, $project, $context))
$function.getName() <input type=checkbox name=contextFunction value="$context.getPk(),$function.getPk()"
- checked> <br>
+ checked> <br />
#else
$function.getName() <input type=checkbox name=contextFunction value="$context.getPk(),$function.getPk()">
- <br>
+ <br />
#end
#if(($count % 3) == 0)
</TD>
@@ -188,7 +188,7 @@
#end ## end of for loop
</table>
#end
-<BR><BR>
+<br /><br />
<table>
#if ($projectId)
<tr class=info>$envname Virtualhosts
@@ -204,9 +204,9 @@
#foreach($function in $availFunctions)
#if($user && $user.isAllowed($function, $project, $vhost))
$function.getName() <input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()"
- checked> <br>
+ checked> <br />
#else
- $function.getName() <input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()"> <br>
+ $function.getName() <input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()"> <br />
#end
#if(($count % 3) == 0)
</TD>
@@ -232,20 +232,20 @@
#set ($userFunctions1 = $User.getAllowedFunctions($project))
<tr>
<td width="45%" align="center">
- <br> Assigned <br><br>
+ <br /> Assigned <br /><br />
<select name="ExistProjectFunctions" size=7 scrolling="auto" multiple style="width:220px">
</select>
</td>
<td width="10%" align=center>
- <br> Changes take place immediately.<br><br>
+ <br /> Changes take place immediately.<br /><br />
<input type="Submit" name="DeleteFromUser" value="DeleteFromUser -->" class="button" onblur="this.blur()"
- onfocus="this.blur()"><br><br>
+ onfocus="this.blur()"><br /><br />
<input type="Submit" name="AddToUser" value="<-- AddToUser" class="button" onblur="this.blur()"
onfocus="this.blur()">
</td>
<td width="45%" align=center>
- <b> Available </b> <br>
+ <b> Available </b> <br />
<select name="ProjectFunctions" size=7 scrolling="auto" multiple style="width:220px">
#foreach($func1 in $userFunctions1)
@@ -265,9 +265,9 @@
</form>
</div>
-<br/>
+<br />
</div>
-<br/>
+<br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/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()">
$individual.getName()
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/details.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">
#set ($id = $request.getParameter("id"))
@@ -54,20 +54,20 @@
#set ($u = $view.getUserById($id))
#if ($User.isAllowed("ViewUser"))
- User Name: $!{u.getName()}<br>
- First Name: $!{u.getFirstName()}<br>
- Last Name: $!{u.getLastName()}<br>
- Email Address: $!{u.getEmail()}<br>
- Job Title: $!{u.getJobTitle()}<br>
- Comments: $!{u.getComments()}<br>
+ User Name: $!{u.getName()}<br />
+ First Name: $!{u.getFirstName()}<br />
+ Last Name: $!{u.getLastName()}<br />
+ Email Address: $!{u.getEmail()}<br />
+ Job Title: $!{u.getJobTitle()}<br />
+ Comments: $!{u.getComments()}<br />
#end
- <BR><BR>
+ <br /><br />
#if ($User.isAllowed("UpdateUser") && $methodToCall == "UpdateUser")
- <BR>
- <a href="$appRoot/Core/User/update.vm?id=$id">Update this User</a> <BR><BR>
- <BR>
+ <br />
+ <a href="$appRoot/Core/User/update.vm?id=$id">Update this User</a> <br /><br />
+ <br />
#end
#if ($User.isAllowed("DeleteUser"))
@@ -85,13 +85,13 @@
#foreach ($u in $us)
<option value="$u.getPk()">$u.getName()</option>
#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/User/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ( $pageSelected = "User" )
#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,23 +27,23 @@
</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/>
+ style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br />
#if($User.isAllowed("AddUserToProject"))
- <a href="$appRoot/Core/User/addToProject.vm"> Add user to Project </a><br/>
+ <a href="$appRoot/Core/User/addToProject.vm"> Add user to Project </a><br />
#end
#if($User.isAllowed("AddUserToProject"))
- <a href="$appRoot/Core/User/addAdmin.vm"> Add Admin </a><br/>
+ <a href="$appRoot/Core/User/addAdmin.vm"> Add Admin </a><br />
#end
- <A href="$appRoot/Core/User/add.vm">Add User</a><br/>
- <A href="$appRoot/Core/User/list.vm">List Users</a><br/>
- <BR>
+ <A href="$appRoot/Core/User/add.vm">Add User</a><br />
+ <A href="$appRoot/Core/User/list.vm">List Users</a><br />
+ <br />
</td>
</tr>
</table>
</form>
-<br/>
+<br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/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">
@@ -59,13 +59,13 @@
<form name="Form" method="post" action='$link.setAction("administration/UserAction")'>
<input type="hidden" id="userId" name="userId" value="$!{id}">
<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
- User Name: <input type="text" name="userName" value="$!{u.getName()}"><br>
- First Name: <input type="text" id="firstName" name="firstName" value="$!{u.getFirstName()}"><br>
- Last Name: <input type="text" id="lastName" name="lastName" value="$!{u.getLastName()}"><br>
- Email Address: <input type="text" id="email" name="email" value="$!{u.getEmail()}"><br>
- Job Title: <input type="text" id="jobTitle" name="jobTitle" value="$!{u.getJobTitle()}"><br>
- Comments: <input type="text" id="comments" name="comments" value="$!{u.getComments()}"><br>
- <BR>
+ User Name: <input type="text" name="userName" value="$!{u.getName()}"><br />
+ First Name: <input type="text" id="firstName" name="firstName" value="$!{u.getFirstName()}"><br />
+ Last Name: <input type="text" id="lastName" name="lastName" value="$!{u.getLastName()}"><br />
+ Email Address: <input type="text" id="email" name="email" value="$!{u.getEmail()}"><br />
+ Job Title: <input type="text" id="jobTitle" name="jobTitle" value="$!{u.getJobTitle()}"><br />
+ Comments: <input type="text" id="comments" name="comments" value="$!{u.getComments()}"><br />
+ <br />
<input type="submit" value="Update">
</form>
#end
@@ -78,13 +78,13 @@
#foreach ($u in $us)
<option value="$u.getPk()">$u.getName()</option>
#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/Worker/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Worker/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">
@@ -35,10 +35,10 @@
</tr>
</table>
- <br/>
+ <br />
#if ($name && $type != "")
<div class="messagebox" width="75%" align="center">
- <br/>
+ <br />
<form name="Form1" method="post" action='$appRoot/Core/Worker/search.vm'>
@@ -47,13 +47,13 @@
<option value="ApacheWorker">ApacheWorker</option>
<option value="TomcatWorker">TomcatWorker</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/Worker/search.vm'>
#else
@@ -98,14 +98,14 @@
<option value="">Select one</option>
<option value="ApacheWorker">ApacheWorker</option>
<option value="TomcatWorker">TomcatWorker</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/infrastructure.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/infrastructure.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/infrastructure.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/infrastructure.vm Thu Jul 6 11:03:02 2006
@@ -21,7 +21,7 @@
<div align="center" class="contentbox">
- <br/><br/>
+ <br /><br />
<div class="projectbox">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -30,10 +30,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/infrastructure.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/infrastructure.vm'>
#else
@@ -109,14 +109,14 @@
<option value="Tomcat">Tomcat</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/Help/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/add.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "/help.vm")
#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("help/HelpItemAction")'>
@@ -112,9 +112,9 @@
</div>
- <br/>
+ <br />
</div>
- <br/>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/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()" >
Modified: incubator/lokahi/lokahi/trunk/src/www/Help/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/details.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/details.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "help")
#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>
@@ -54,7 +54,7 @@
#set ($methodToCall = "UpdateHelpItem")
#set ($helpItem = $helpHelper.getHelpItem($id))
-<br/>
+<br />
<table>
<tr>
<td>
@@ -115,9 +115,9 @@
#end
#end
#if ($name)
- $name <br>
+ $name <br />
#else
- No Function Limitation<br>
+ No Function Limitation<br />
#end
</td>
</tr>
@@ -138,8 +138,8 @@
#if ($User.isAllowed("UpdateHelpItem") && $methodToCall == "UpdateHelpItem")
<br\>
-<a href="$appRoot/Help/update.vm?id=$id">Update this Help Item</a> <BR><BR>
-<BR>
+<a href="$appRoot/Help/update.vm?id=$id">Update this Help Item</a> <br /><br />
+<br />
#end
#if ($User.isAllowed("DeleteHelpItem"))
@@ -150,7 +150,7 @@
</form>
#end
#else
-<br/>
+<br />
Help Item:
#set ($hs = $helpHelper.getHelpItems())
<select name=id onchange='OnChangeIn(this);'>
@@ -158,14 +158,14 @@
#foreach ($h in $hs)
<option value="$h.getPk()">$h.getTitle()</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/Help/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/index.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/index.vm Thu Jul 6 11:03:02 2006
@@ -18,25 +18,25 @@
#set ($menu = "/layout/menu/HelpTop.vm")
#set ($pageSelected = "/help.vm")
#parse("/layout/header.vm")
-<br/>
-<br/>
-<br/>
+<br />
+<br />
+<br />
<div align=center>
- <br/>
- <br/>
+ <br />
+ <br />
<table width="700" border="0" cellspacing="0" cellpadding="0">
<tr valign="top" class="info">
<td valign="top" height="25" align="center"> Help Items </td>
</tr>
<tr valign="top" class="body">
<td align="center" valign="top"
- style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br/>
+ style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br />
#set ($helpitems = $helpHelper.getHelpItems())
#foreach ($hi in $helpitems)
- <a href="$appRoot/Help/details.vm?id=$hi.getPk()"> $hi.getName() </a><br/>
+ <a href="$appRoot/Help/details.vm?id=$hi.getPk()"> $hi.getName() </a><br />
#end
- <BR>
+ <br />
</td>
</tr>
Modified: incubator/lokahi/lokahi/trunk/src/www/Help/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/update.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "/help.vm")
#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">
@@ -140,7 +140,7 @@
<input type="submit" value="submit">
</form>
#else
-<br/>
+<br />
Help Item: <!--TODO make this actually display help ITEMS -->
#set ($helpitems = $helpHelper.getHelpItems())
<select name=id onchange='OnChangeIn(this);'>
@@ -148,15 +148,15 @@
#foreach ($hi in $helpitems)
<option value="$hi.getPk()">$hi.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/Template/addInternetProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
- <br/><br/>
+ <br /><br />
#parse("/Core/Project/availtemplates.vm")
<div id="bigright">
<div class="messagebox" align="left">
@@ -46,8 +46,8 @@
</SCRIPT>
<form name="Form" method="post" action='$link.setAction("templating/AddInternetSiteAction")'>
- Project Name: <input type="text" id="projectName" name="projectName" value="$!{projectName}"/><br/>
- Site Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}"/><br/>
+ Project Name: <input type="text" id="projectName" name="projectName" value="$!{projectName}"/><br />
+ Site Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}"/><br />
Hosting Pool:
#set ($hps = $view.getHostingPools())
<select name=hostingPoolId onchange='ToChange(this);'>
@@ -62,32 +62,32 @@
#foreach ($hp in $hps)
<option value="$hp.getPk()">$hp.getName()</option>
#end
- </select><br/>
+ </select><br />
Contexts:
#if($hostingPoolId)
<a href="addInternetProject.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add
- another</a><br/>
+ another</a><br />
#else
- <a href="addInternetProject.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br/>
+ <a href="addInternetProject.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}"/><br/>
- DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"/> <br/>
+ Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"/><br />
+ DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"/> <br />
#end
#end
#if($hostingPoolId)
#set ($hp = $view.getHostingPool($hostingPoolId))
#set ($ap = $hp.getApachePool())
#set($hardware = $ap.getHardwares())
- Ips for $hp.getName():<br/>
- Servername: IP:<br/>
+ Ips for $hp.getName():<br />
+ Servername: IP:<br />
#foreach ($h in $hardware)
$h.getName() <select name=ipId>
#foreach ($ip in $h.getIps())
<option value="$ip.getPk()">$ip.getName()</option>
#end
- </select><br/>
+ </select><br />
#end
#end
@@ -98,7 +98,7 @@
</form>
</div>
</div>
- <br/>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
#parse("/Core/Project/availtemplates.vm")
<div id="bigright">
<div class="messagebox" align="left">
@@ -74,9 +74,9 @@
<input type="hidden" id="methodToCall" name="methodToCall" value="AddVirtualHostToProject"/>
Project Name:
#if ($projectId)
- <input type="hidden" id="projectId" name="projectId" value="$!{project.getPk()}"/> $!{project.getName()}<br/>
+ <input type="hidden" id="projectId" name="projectId" value="$!{project.getPk()}"/> $!{project.getName()}<br />
#else
- <input type="text" id="projectName" name="projectName" value="$!{projectName}"/><br/>
+ <input type="text" id="projectName" name="projectName" value="$!{projectName}"/><br />
#end
Hosting Pool:
#set ($hps = $view.getHostingPools())
@@ -92,28 +92,28 @@
#foreach ($hp in $hps)
<option value="$hp.getPk()">$hp.getName()</option>
#end
- </select><br/>
- Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}"/><br/>
+ </select><br />
+ Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}"/><br />
Entry:
- <textarea id="entry" name="entry" cols="70" rows="7">$!{entry}</textarea><br/>
- NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><br/>
- Catch All: <input type=checkbox name=catchAll value=true/><br/>
- <br/>
+ <textarea id="entry" name="entry" cols="70" rows="7">$!{entry}</textarea><br />
+ NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><br />
+ Catch All: <input type=checkbox name=catchAll value=true/><br />
+ <br />
Contexts:
#if($hostingPoolId && $projectId)
<a href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add
- another</a><br/>
+ 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}"/><br/>
- DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"/><br/>
+ Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"/><br />
+ DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"/><br />
#end
#end
#if($hostingPoolId)
@@ -121,8 +121,8 @@
#set ($hp = $view.getHostingPool($hostingPoolId))
#set ($ap = $hp.getApachePool())
#set($hardware = $ap.getHardwares())
- Ips for $hp.getName():<br/>
- Servername: IP:<br/>
+ Ips for $hp.getName():<br />
+ Servername: IP:<br />
#foreach ($h in $hardware)
$h.getName() <select name=ipId/>
@@ -130,7 +130,7 @@
<option value="$ip.getPk()">$ip.getName()</option>
#end
</select>
-<br/>
+<br />
#end
#end
@@ -139,7 +139,7 @@
</form>
</div>
</div>
-<br/>
+<br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
- <br/><br/>
+ <br /><br />
#parse("/Core/Project/availtemplates.vm")
#set ($data = $dataList.getPartitions())
#set ($vobs = $dataList.getVobs())
@@ -105,7 +105,7 @@
</div>
</div>
- <br/>
+ <br />
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
- <br/><br/>
+ <br /><br />
#parse("/Core/Project/availtemplates.vm")
#set ($command = $request.getParameter("command"))
<div id="bigright">
@@ -52,7 +52,7 @@
</div>
</div>
- <br/>
+ <br />
</div>
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm Thu Jul 6 11:03:02 2006
@@ -25,7 +25,7 @@
#end
#set ($projectId = $request.getParameter("projectId"))
<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">
<form name="Form" method="post" action='$link.setAction("administration/ContextAction")'>
@@ -64,7 +64,7 @@
#foreach ($hp in $hps)
<option value="$hp.getPk()">$hp.getName()
#end
- </select><BR>
+ </select><br />
</td>
</tr>
#else
@@ -76,7 +76,7 @@
#foreach ($vh in $vhs)
<option value="$appRoot/Tomcat/Entity/add.vm?projectId=$projectId&id=$vh.getPk()">$vh.getName()
#end
- </select><BR>
+ </select><br />
</td>
</tr>
#end
@@ -123,9 +123,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/Tomcat/Entity/addExistingToVhost.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm Thu Jul 6 11:03:02 2006
@@ -67,7 +67,7 @@
#foreach ($context in $contexts)
<option value="$context.getPk()">$context.getName() - $!{context.getTomcatPool().getName()}
#end
- </select><BR>
+ </select><br />
</td>
</tr>
</table>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#parse("/layout/header.vm")
<div class="contentbox" align="center">
- <br/><br/>
+ <br /><br />
<div class="messagebox" width="75%" align="center">
#set ($cid = $request.getParameter("c"))
@@ -36,11 +36,11 @@
#if ($context && $f)
#if ($User.isAllowed($f, $project, $context) || $User.isAllowed($f))
#set($tomcatPool = $context.getTomcatPool())
- Please confirm:<BR>
- Project: $!{project.getName()}<BR>
- Context: $context.getName() $!{context.getEnv().getName()}<br>
- Action: $f.getName()<BR>
- Pool: $!{tomcatPool.getName()}<br>
+ Please confirm:<br />
+ Project: $!{project.getName()}<br />
+ Context: $context.getName() $!{context.getEnv().getName()}<br />
+ Action: $f.getName()<br />
+ Pool: $!{tomcatPool.getName()}<br />
#if($f.getCommand() == "DeleteContext")
<form name="Form" method="post" action='$link.setAction("/administration/Context/Delete")'>
#else
@@ -51,7 +51,7 @@
<input type="hidden" id="vhostId" name="vhostId" value="$!{vid}">
#end
#if ($f.getCommand() == "RemoveContextFromVhost")
- Remove from project? <input type="checkbox" name="removeFromProject" id="removeFromProject" value="true"><br>
+ Remove from project? <input type="checkbox" name="removeFromProject" id="removeFromProject" value="true"><br />
#end
<input type="hidden" id="projectId" name="projectId" value="$!{pid}">
<input type="hidden" id="poolId" name="poolId" value="$!{tomcatPool.getPk()}">
@@ -64,9 +64,9 @@
#end
#end
</div>
- <BR><BR>
+ <br /><br />
</div>
-<BR><BR>
+<br /><br />
#parse("/layout/footer.vm")
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm Thu Jul 6 11:03:02 2006
@@ -21,7 +21,7 @@
#end
#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">
@@ -33,7 +33,7 @@
</td>
</TR>
</table>
- <br>
+ <br />
<div class="messagebox">
@@ -57,9 +57,9 @@
</table>
#if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
#if($p)
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <BR><BR>
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <br /><br />
#else
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <BR><BR>
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <br /><br />
#end
#end
@@ -72,14 +72,14 @@
#foreach ($context in $contexts)
<option value="$appRoot/Tomcat/Entity/details.vm?id=$context.getPk()">$context.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/Tomcat/Entity/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/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">
#set ($id = $request.getParameter("id"))
@@ -60,20 +60,20 @@
<input type="hidden" id="projectId" name="projectId" value="$!{projectId}">
<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
- JkMount: <input type="text" id="contextName" name="contextName" value="$!{context.getName()}"><BR>
- DocBase <input type="text" length="60" id="docBase" name="docBase" value="$!{context.getDocBase()}"><br>
- Xml: <textarea cols="60" rows="7" id="appxml" name="appxml">$!{context.getApplicationXml()}</textarea><BR>
- State: <input type="text" readonly id="state" name="state" value="Active"><BR>
- <input type="hidden" id="stateId" name="stateId" value="8"><BR>
- Current TomcatPool: $!{context.getTomcatPool().getName()}<br>
- If migrating to new TomcatPool, select Pool below!<br>
+ JkMount: <input type="text" id="contextName" name="contextName" value="$!{context.getName()}"><br />
+ DocBase <input type="text" length="60" id="docBase" name="docBase" value="$!{context.getDocBase()}"><br />
+ Xml: <textarea cols="60" rows="7" id="appxml" name="appxml">$!{context.getApplicationXml()}</textarea><br />
+ State: <input type="text" readonly id="state" name="state" value="Active"><br />
+ <input type="hidden" id="stateId" name="stateId" value="8"><br />
+ Current TomcatPool: $!{context.getTomcatPool().getName()}<br />
+ If migrating to new TomcatPool, select Pool below!<br />
#set ($aps = $view.getTomcatPools())
<select name=poolId>
<option value="">Select one
#foreach ($ap in $aps)
<option value="$ap.getPk()">$ap.getName()
#end
- </select><BR>
+ </select><br />
#set ($envs = $view.getEnvironments())
<select name=envId>
#if ($context.getEnv())
@@ -85,7 +85,7 @@
#foreach ($env in $envs)
<option value="$env.getPk()">$env.getName()
#end
- </select><BR>
+ </select><br />
<input type="submit" value="Update">
</form>
#else
@@ -96,14 +96,14 @@
#foreach ($context in $contexts)
<option value="$context.getPk()">$context.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/Tomcat/Entity/view.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm Thu Jul 6 11:03:02 2006
@@ -18,7 +18,7 @@
#set ($menu = "/layout/menu/ProjectTop.vm")
#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">
@@ -27,7 +27,7 @@
</TD>
</TR>
</table>
- <br>
+ <br />
<div class="messagebox">
@@ -51,9 +51,9 @@
</table>
#if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
#if($p)
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <BR><BR>
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <br /><br />
#else
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <BR><BR>
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <br /><br />
#end
#end
@@ -66,7 +66,7 @@
#foreach ($context in $contexts)
<option value="$appRoot/Tomcat/Entity/view.vm?id=$context.getPk()">$context.getName()
#end
- </select><BR>
+ </select><br />
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/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">
@@ -31,7 +31,7 @@
</td>
</TR>
</table>
- <br>
+ <br />
<div class="messagebox">
#if ($request.getParameter("workers"))
@@ -106,9 +106,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/Tomcat/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/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()">
$individual.getName()
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm Thu Jul 6 11:03:02 2006
@@ -29,7 +29,7 @@
<div align="center" class="contentbox">
-<br/><br/>
+<br /><br />
<div class="projectbox">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -41,7 +41,7 @@
</td>
</tr>
</table>
-<br/>
+<br />
#if ($id)
@@ -86,14 +86,14 @@
#set ($collection = $view.getHostingPools($tomcatPool))
#if( $collection && ! $collection.isEmpty())
-<br/>
+<br />
#parse("/Core/Pool/list.vm")
#end
#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>
@@ -123,7 +123,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">
@@ -143,7 +143,7 @@
</table>
#end ## of all contexts
-<br/>
+<br />
#else
@@ -155,14 +155,14 @@
#foreach ($ap in $aps)
<option value="$appRoot/Tomcat/Pool/details.vm?id=$ap.getPk()">$ap.getName()
#end
- </select><BR>
+ </select><br />
</div>
#end
-<br/>
+<br />
</div>
-<br/>
+<br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm Thu Jul 6 11:03:02 2006
@@ -38,8 +38,8 @@
<form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
<input type="hidden" id="id" name="id" value="$!{id}">
<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tomcatPool.getWorkerName()}"><BR>
-Pool Name: <input type="text" readonly id="poolName" name="poolName" value="$!{tomcatPool.getName()}"><BR>
+Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tomcatPool.getWorkerName()}"><br />
+Pool Name: <input type="text" readonly id="poolName" name="poolName" value="$!{tomcatPool.getName()}"><br />
Environment:
#set ($envs = $view.getEnvironments())
<select name=envId>
@@ -52,7 +52,7 @@
#foreach ($env in $envs)
<option value="$env.getPk()">$env.getName()
#end
- </select><BR>
+ </select><br />
Tomcat Workers:
<select name="tomcatIds" size="5" style="width:150px" multiple>
@@ -68,7 +68,7 @@
<option value="$worker.getPk()" > $worker.getName()
#end
</select>
-<BR><BR><input type="submit" value="submit">
+<br /><br /><input type="submit" value="submit">
#end
#else
Tomcat Pool:
@@ -78,7 +78,7 @@
#foreach ($ap in $aps)
<option value="$appRoot/Tomcat/Pool/update.vm?id=$ap.getPk()">$ap.getName()
#end
- </select><BR>
+ </select><br />
#end
</form>
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.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">
@@ -45,10 +45,10 @@
#foreach ($tw in $tws)
<option value="$appRoot/Tomcat/Pool/viewconf.vm?id=$tw.getPk()">$tw.getName()
#end
- </select><BR>
+ </select><br />
#end
</div>
- <br/>
+ <br />
</div>
#parse("/layout/footer.vm")
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "Server")
#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">
@@ -162,9 +162,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/Tomcat/Server/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/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()">
$individual.getName()
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.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 />
#if ($id)
@@ -68,7 +68,7 @@
#set ($collection = $view.getTomcatWorkers($tomcat))
#if( $collection && ! $collection.isEmpty())
- <br/>
+ <br />
#parse("/Tomcat/Worker/list.vm")
#end ## of all tomcatworkers
@@ -82,12 +82,12 @@
#foreach ($ap in $aps)
<option value="$appRoot/Tomcat/Server/details.vm?id=$ap.getPk()">$ap.getName()
#end
- </select><BR>
+ </select><br />
</div>
#end
- <br/>
+ <br />
</div>
-<br/>
+<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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "Server")
#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">
#set ($id = $request.getParameter("id"))
@@ -43,28 +43,28 @@
#if ($User.isAllowed("UpdateTomcat") && $methodToCall == "UpdateTomcat")
<form name="Form" method="post" action='$link.setAction("administration/TomcatAction")'>
<input type="hidden" id="id" name="id" value="$id">
- Name: <input type="text" id="name" name="name" value="$!{tomcat.getServerName()}"><BR>
- Description: <input type="text" id="description" name="description" value="$!{tomcat.getDescription()}"><BR>
+ Name: <input type="text" id="name" name="name" value="$!{tomcat.getServerName()}"><br />
+ Description: <input type="text" id="description" name="description" value="$!{tomcat.getDescription()}"><br />
<!-- $tomcat.getType() -->
#if ($tomcat.getType() == 5)
-Version: <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType CHECKED value="5"> 5.0.27 <input type=radio name=tomcatType value="6"> 5.5.9<BR>
+Version: <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType CHECKED value="5"> 5.0.27 <input type=radio name=tomcatType value="6"> 5.5.9<br />
#elseif ($tomcat.getType() == 6)
-Version: <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType value="5"> 5.0.27 <input type=radio name=tomcatType CHECKED value="6"> 5.5.9 <BR>
+Version: <input type=radio name=tomcatType value="4"> 4.0.4 <input type=radio name=tomcatType value="5"> 5.0.27 <input type=radio name=tomcatType CHECKED value="6"> 5.5.9 <br />
#else
-Version: <input type=radio name=tomcatType CHECKED value="4"> 4.0.4 <input type=radio name=tomcatType value="5"> 5.0.27 <input type=radio name=tomcatType value="6"> 5.5.9 <BR>
+Version: <input type=radio name=tomcatType CHECKED value="4"> 4.0.4 <input type=radio name=tomcatType value="5"> 5.0.27 <input type=radio name=tomcatType value="6"> 5.5.9 <br />
#end
-Base Location: <input type="text" size="45" id="baseLocation" name="baseLocation" value="$!{tomcat.getBaseLocation()}"><BR>
-Tomcat Home: <input type="text" size="45" id="tomcatHome" name="tomcatHome" value="$!{tomcat.getTomcatHome()}"><BR>
-HTTP Port: <input type="text" id="httpPort" name="httpPort" value="$!{tomcat.getHttpPort()}"><BR>
-System User: <input type="text" id="sysUser" name="sysUser" value="$!{tomcat.getSysUser()}"><BR>
-System Group: <input type="text" id="sysGroup" name="sysGroup" value="$!{tomcat.getSysGroup()}"><BR>
-Start Class: <input type="text" id="startClass" name="startClass" value="$!{tomcat.getStartClass()}"><BR>
-Standard Out Log: <input type="text" id="stdOutLog" name="stdOutLog" value="$!{tomcat.getStdOutLog()}"><BR>
-Java Home: <input type="text" id="javaHome" name="javaHome" value="$!{tomcat.getJavaHome()}"><BR>
-Environment Varibles: <textarea id="env" name="env" cols="40" rows="5"> $!{tomcat.getEnv()} </textarea><BR>
-Java Options: <textarea id="javaOpts" name="javaOpts" cols="40" rows="5"> $!{tomcat.getJavaOpts()} </textarea><BR>
+Base Location: <input type="text" size="45" id="baseLocation" name="baseLocation" value="$!{tomcat.getBaseLocation()}"><br />
+Tomcat Home: <input type="text" size="45" id="tomcatHome" name="tomcatHome" value="$!{tomcat.getTomcatHome()}"><br />
+HTTP Port: <input type="text" id="httpPort" name="httpPort" value="$!{tomcat.getHttpPort()}"><br />
+System User: <input type="text" id="sysUser" name="sysUser" value="$!{tomcat.getSysUser()}"><br />
+System Group: <input type="text" id="sysGroup" name="sysGroup" value="$!{tomcat.getSysGroup()}"><br />
+Start Class: <input type="text" id="startClass" name="startClass" value="$!{tomcat.getStartClass()}"><br />
+Standard Out Log: <input type="text" id="stdOutLog" name="stdOutLog" value="$!{tomcat.getStdOutLog()}"><br />
+Java Home: <input type="text" id="javaHome" name="javaHome" value="$!{tomcat.getJavaHome()}"><br />
+Environment Varibles: <textarea id="env" name="env" cols="40" rows="5"> $!{tomcat.getEnv()} </textarea><br />
+Java Options: <textarea id="javaOpts" name="javaOpts" cols="40" rows="5"> $!{tomcat.getJavaOpts()} </textarea><br />
<input type="hidden" name="methodToCall" value="UpdateTomcat">
- <input type="submit" value="Update"><BR>
+ <input type="submit" value="Update"><br />
</form>
#end
#else
@@ -75,13 +75,13 @@
#foreach ($ap in $aps)
<option value="$appRoot/Tomcat/Server/update.vm?id=$ap.getPk()">$ap.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/Tomcat/Worker/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm Thu Jul 6 11:03:02 2006
@@ -19,7 +19,7 @@
#set ($pageSelected = "Worker")
#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/TomcatWorkerAction")'>
@@ -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/Tomcat/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm?rev=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/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()">
$individual.getName()
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=419631&r1=419630&r2=419631&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/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)
@@ -90,14 +90,14 @@
</table>
#set ($collection = $view.getTomcatPools($tomcatWorker))
#if( $collection && ! $collection.isEmpty())
-<br/>
+<br />
#parse("/Tomcat/Pool/list.vm")
#end ## of all tomcatpools
#set ($projectContexts = $view.getTomcatContexts($User, $tomcatWorker))
#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>
@@ -119,7 +119,7 @@
<td align="center"> $!{context.getEnv().getName()} </td>
<td align="center">
<A href="$appRoot/Tomcat/Pool/details.vm?id=$!{context.getTomcatPool().getPk()}">$!{context.getTomcatPool().getName()} </a>
- <br>
+ <br />
</td>
<td align="right">
<!-- before macro -->
@@ -136,7 +136,7 @@
#end
#end ##of all servers for this context
</table>
-<br/>
+<br />
#end ## of all contexts
#else
<div class="messagebox">
@@ -147,12 +147,12 @@
#foreach ($tw in $tws)
<option value="$appRoot/Tomcat/Worker/$page?id=$tw.getPk()">$tw.getName()
#end
- </select><BR>
+ </select><br />
</div>
#end
-<br>
+<br />
</div>