incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419682 - /incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm
Date Thu, 06 Jul 2006 19:44:51 GMT
Author: toback
Date: Thu Jul  6 12:44:51 2006
New Revision: 419682

URL: http://svn.apache.org/viewvc?rev=419682&view=rev
Log:
removed an errant \n

Modified:
    incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm

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=419682&r1=419681&r2=419682&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 12:44:51 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">
 
@@ -42,31 +42,43 @@
       #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateApacheWorker")
       #if($id)
       #set ($aw = $view.getApacheWorker($id))
+      <br />
       <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())
+        #set ($awpk = $aw.getApache())
         <select name=apacheId>
           #foreach ($apache in $Apaches)
-          <option value="$apache.getPk()">$apache.getName()
+    		      	  #if ($apache.getPk() == $awpk.getPk())
+              <option value="$apache.getPk()" selected>$apache.getName()
+            #else
+              <option value="$apache.getPk()">$apache.getName()
             #end
+          #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="$!{aw.getState().getName()}"><BR>
+        <input type="hidden" id="stateId" name="stateId" value="$!{aw.getStateId()}">
         Hardware:
         #set($hardware = $view.getHardwares())
         <select name=hardwareId>
           #foreach ($h in $hardware)
-          <option value="$h.getPk()">$h.getName()
-            #end
+            #if ($h.getPk() == $aw.getHardware().getPk())
+          		    <option value="$h.getPk()" selected>$h.getName()
+          		  #else
+          		    <option value="$h.getPk()">$h.getName()
+          		  #end
+          #end
         </select>
-        <br />
+        <BR>
         <input type="submit" value="update">
       </form>
       #else
+      <br />
       Apache Worker:
       #set ($aws = $view.getApacheWorkers())
       <select name=id onchange='OnChange(this);'>
@@ -74,13 +86,14 @@
           #foreach ($aw in $aws)
         <option value="$appRoot/Apache/Worker/update.vm?id=$aw.getPk()">$aw.getName()
           #end
-      </select><br />
+      </select><BR>
+      <br />
       #end
       #end
     </div>
-    <br />
+    <br/>
   </div>
-  <br />
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 



Mime
View raw message