incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419344 [5/7] - in /incubator/lokahi/lokahi/trunk: ./ conf/ database/ docs/ src/java/org/apache/lokahi/core/agent/ src/java/org/apache/lokahi/core/agent/dao/ src/java/org/apache/lokahi/core/agent/job/ src/java/org/apache/lokahi/core/agent/r...
Date Wed, 05 Jul 2006 21:11:36 GMT
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm Wed Jul  5 14:11:29 2006
@@ -20,48 +20,46 @@
 #set ($pageSelected = "state")
 #parse("/layout/header.vm")
 <div id="bigright">
-<div class="messagebox">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/State/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-	return true;
-}
-//-->
-</SCRIPT>
-
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateState")
-
-#if($id)
-
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateState")
-#set ($state = $view.getState($id))
-Name: $!{state.getName()}<BR>
-Color to Display as: $!{state.getColor()}<BR>
-#end
+  <div class="messagebox">
+    <SCRIPT LANGUAGE=javascript>
+      <!--
+      function OnChange(dropdown)
+      {
+        var myindex = dropdown.selectedIndex;
+        var SelValue = dropdown.options[myindex].value;
+        var baseURL = "$appRoot/Core/State/details.vm?id=" + SelValue;
+        top.location.href = baseURL;
+        return true;
+      }
+      //-->
+    </SCRIPT>
+
+
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "UpdateState")
+
+    #if($id)
+
+    #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateState")
+    #set ($state = $view.getState($id))
+    Name: $!{state.getName()}<BR>
+    Color to Display as: $!{state.getColor()}<BR>
+    #end
+
+
+    #else
+    State:
+    #set ($states = $view.getStates())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($state in $states)
+      <option value="$state.getPk()">$state.getName()
+        #end
+    </select><BR>
 
+    #end
 
-
-
-#else
-State:
-#set ($states = $view.getStates())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($state in $states)
-              			      <option value="$state.getPk()">$state.getName()
-              			      #end
-              			      </select><BR>
-
-#end
-
-</div>
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm Wed Jul  5 14:11:29 2006
@@ -19,50 +19,50 @@
 #set ($pageSelected = "state")
 #parse("/layout/header.vm")
 <div id="bigright">
-<div class="messagebox">
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/State/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateState")
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateState")
-#if($id)
-#set ($state = $view.getState($id))
-<form name="Form" method="post" action='$link.setAction("administration/StateAction")'>
-<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>
-
-<input type="submit" value="Update">
-
-</form>
-#else
-State:
-#set ($states = $view.getStates())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($state in $states)
-              			      <option value="$state.getPk()">$state.getName()
-              			      #end
-              			      </select><BR>
-
-#end
-#end
-</div>
+  <div class="messagebox">
+    <SCRIPT LANGUAGE=javascript>
+      <!--
+      function OnChange(dropdown)
+      {
+        var myindex = dropdown.selectedIndex;
+        var SelValue = dropdown.options[myindex].value;
+        var baseURL = "$appRoot/Core/State/update.vm?id=" + SelValue;
+        top.location.href = baseURL;
+
+        return true;
+      }
+      //-->
+    </SCRIPT>
+
+
+    #set ($id = $request.getParameter("id"))
+    #set ($methodToCall = "UpdateState")
+    #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateState")
+    #if($id)
+    #set ($state = $view.getState($id))
+    <form name="Form" method="post" action='$link.setAction("administration/StateAction")'>
+      <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>
+
+      <input type="submit" value="Update">
+
+    </form>
+    #else
+    State:
+    #set ($states = $view.getStates())
+    <select name=id onchange='OnChange(this);'>
+      <option value="">Select one
+        #foreach ($state in $states)
+      <option value="$state.getPk()">$state.getName()
+        #end
+    </select><BR>
+
+    #end
+    #end
+  </div>
 </div>
 #parse("/layout/footer.vm")
 

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm Wed Jul  5 14:11:29 2006
@@ -19,89 +19,90 @@
 #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">
-<tr class="info" valign="top">
-	<td colspan=3>Administration - <b>User</b>
-  </td>
-  <td align="right">
-  #parse("Core/User/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/UserAction")'>
-<table>
-<tr>
-<td>
-User Name:
-</td>
-<td>
-<input type="text" id="userName" name="userName" value="$!{userName}">
-</td>
-</tr>
-<tr>
-<td>
-First Name:
-</td>
-<td>
-<input type="text" id="firstName" name="firstName" value="$!{firstName}">
-</td>
-</tr>
-<tr>
-<td>
-Last Name:
-</td>
-<td>
-<input type="text" id="lastName" name="lastName" value="$!{lastName}">
-</td>
-</tr>
-<tr>
-<td>
-Email Address:
-</td>
-<td>
-<input type="text" id="email" name="email" value="$!{email}">
-</td>
-</tr>
-<tr>
-<td>
-Comments:
-</td>
-<td>
-<input type="text" id="comments" name="comments" value="$!{comments}">
-</td>
-</tr>
-<tr>
-<td>
-Job Title:
-</td>
-<td>
-<input type="text" id="jobTitle" name="jobTitle" value="$!{jobTitle}">
-</td>
-</tr>
-<tr>
-<td>
-Projects:
-</td>
-<td>
-<select name="projects" height=5 multiple>
-#foreach ($p in $User.getAddableProjects())
-<option value="$p.getPk()"> $p.getName()
-#end
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddUser">
-<input type="submit" value="submit">
-</form>
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Administration - <b>User</b>
+        </td>
+        <td align="right">
+          #parse("Core/User/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <form name="Form" method="post" action='$link.setAction("administration/UserAction")'>
+        <table>
+          <tr>
+            <td>
+              User Name:
+            </td>
+            <td>
+              <input type="text" id="userName" name="userName" value="$!{userName}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              First Name:
+            </td>
+            <td>
+              <input type="text" id="firstName" name="firstName" value="$!{firstName}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Last Name:
+            </td>
+            <td>
+              <input type="text" id="lastName" name="lastName" value="$!{lastName}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Email Address:
+            </td>
+            <td>
+              <input type="text" id="email" name="email" value="$!{email}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Comments:
+            </td>
+            <td>
+              <input type="text" id="comments" name="comments" value="$!{comments}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Job Title:
+            </td>
+            <td>
+              <input type="text" id="jobTitle" name="jobTitle" value="$!{jobTitle}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Projects:
+            </td>
+            <td>
+              <select name="projects" height=5 multiple>
+                #foreach ($p in $User.getAddableProjects())
+                <option value="$p.getPk()"> $p.getName()
+                  #end
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="methodToCall" value="AddUser">
+        <input type="submit" value="submit">
+      </form>
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm Wed Jul  5 14:11:29 2006
@@ -31,93 +31,93 @@
 
 
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnClickUser()
-{
-        //var myindex  = dropdown.selectedIndex;
-        //var SelValue = dropdown.options[myindex].value;
-        var isid = document.Form.userId.value;
-        var baseURL = "";
-
-        var baseURL = "$appRoot/Core/User/addAdmin.vm?tryuser=" + isid;
-
-
-        top.location.href = baseURL;
-
-        return true;
-}
-
-function handleEnter (field, event) {
-                var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
-                if (keyCode == 13) {
-                        var i;
-                        for (i = 0; i < field.form.elements.length; i++)
-                                if (field == field.form.elements[i])
-                                        break;
-                        i = (i + 1) % field.form.elements.length;
-                        field.form.elements[i].focus();
-                        return false;
-                }
-                else
-                return true;
-        }
+  <!--
+  function OnClickUser()
+  {
+    //var myindex  = dropdown.selectedIndex;
+    //var SelValue = dropdown.options[myindex].value;
+    var isid = document.Form.userId.value;
+    var baseURL = "";
+
+    var baseURL = "$appRoot/Core/User/addAdmin.vm?tryuser=" + isid;
+
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+  function handleEnter(field, event) {
+    var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
+    if (keyCode == 13) {
+      var i;
+      for (i = 0; i < field.form.elements.length; i++)
+        if (field == field.form.elements[i])
+          break;
+      i = (i + 1) % field.form.elements.length;
+      field.form.elements[i].focus();
+      return false;
+    }
+    else
+      return true;
+  }
 
-//-->
+  //-->
 </SCRIPT>
 
 <div align="center" class="contentbox">
-<br /><br />
+  <br/><br/>
 
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Administration - <b>User</b>
-  </td>
-  <td align="right">
-  #parse("Core/User/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("User/AddAdminUserAction")'>
-<input type="hidden" name="methodToCall" value="AddUserToProject">
-<BR>
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Administration - <b>User</b>
+        </td>
+        <td align="right">
+          #parse("Core/User/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <form name="Form" method="post" action='$link.setAction("User/AddAdminUserAction")'>
+        <input type="hidden" name="methodToCall" value="AddUserToProject">
+        <BR>
         #if($tryuser)
         $tryuser
         <input type=hidden name="userName" value="$tryuser">
         #set($user = $User.getUser($tryuser))
-                #if ($user)
-                        <input type=hidden name="selUserId" value="$user.getPk()">
-                #end
+        #if ($user)
+        <input type=hidden name="selUserId" value="$user.getPk()">
+        #end
         #else
-                User ID:&nbsp;<input type="text" name="userId" size="11"  onkeypress="return handleEnter(this, event)">
-                <br><input type=button value="Add User" onClick='OnClickUser()'>
+        User ID:&nbsp;<input type="text" name="userId" size="11" onkeypress="return handleEnter(this, event)">
+        <br><input type=button value="Add User" onClick='OnClickUser()'>
 
         #end
-<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()&nbsp;<input type=checkbox name=functions value="$function.getPk()" checked> <br>
-                #else
-                $function.getName()&nbsp;<input type=checkbox name=functions value="$function.getPk()" > <br>
-                #end
-    #end
-    #end
-    
-<input type="submit" value="Submit">
-#end
-#end
-
-</form>
-</div>
-<br />
-</div>
-<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()&nbsp;<input type=checkbox name=functions value="$function.getPk()" checked> <br>
+        #else
+        $function.getName()&nbsp;<input type=checkbox name=functions value="$function.getPk()"> <br>
+        #end
+        #end
+        #end
+
+        <input type="submit" value="Submit">
+        #end
+        #end
+
+      </form>
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm Wed Jul  5 14:11:29 2006
@@ -20,203 +20,207 @@
 #parse("/layout/header.vm")
 
 #if ($request.getParameter("project"))
-	#set ($projectId = $request.getParameter("project"))
+#set ($projectId = $request.getParameter("project"))
 #end
 
 #if ($request.getParameter("seluser"))
-	#set ($selUserId = $request.getParameter("seluser"))
+#set ($selUserId = $request.getParameter("seluser"))
 #end
 
 #if ($request.getParameter("env"))
-	#set ($envname = $request.getParameter("env"))
+#set ($envname = $request.getParameter("env"))
 #end
 
 #if ($request.getParameter("tryuser"))
-	#set ($tryuser = $request.getParameter("tryuser"))
-	#set ($user = $User.getUser($tryuser))
-	#set ($selUserId = $user.getPk())
+#set ($tryuser = $request.getParameter("tryuser"))
+#set ($user = $User.getUser($tryuser))
+#set ($selUserId = $user.getPk())
 #end
 
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-	<tr class="info" valign="top">
-		<td colspan=3>Administration - <b>User</b>
-	  	</td>
-  		<td align="right">
-			#parse("Core/User/menu/global.vm")
-		</td>
-	</tr>
+  <tr class="info" valign="top">
+    <td colspan=3>Administration - <b>User</b>
+    </td>
+    <td align="right">
+      #parse("Core/User/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
+
 <div class="messagebox">
 
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-        var myindex  = dropdown.selectedIndex;
-        var SelValue = dropdown.options[myindex].value;
-        var baseURL  = "$appRoot/Core/User/addToProject.vm?project=" + SelValue;
-        top.location.href = baseURL;
-
-        return true;
-}
-
-function OnClickUser()
-{
-        //var myindex  = dropdown.selectedIndex;
-        //var SelValue = dropdown.options[myindex].value;
-        var isid = document.Form.userId.value;
-        var baseURL = "";
-
-        var baseURL = "$appRoot/Core/User/addToProject.vm?project=$projectId&tryuser=" + isid;
-
-        top.location.href = baseURL;
-
-        return true;
-}
-
-function OnChangeEnv(dropdown)
-{
-        var myindex  = dropdown.selectedIndex;
-        var SelValue = dropdown.options[myindex].value;
-        var baseURL  = "$appRoot/Core/User/addToProject.vm?project=$projectId&tryuser=$tryuser&seluser=$!{selUserId}&env=" + SelValue;
-        top.location.href = baseURL;
-
-        return true;
-}
-
-function handleEnter (field, event) {
-                var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
-                if (keyCode == 13) {
-                        var i;
-                        for (i = 0; i < field.form.elements.length; i++)
-                                if (field == field.form.elements[i])
-                                        break;
-                        i = (i + 1) % field.form.elements.length;
-                        field.form.elements[i].focus();
-                        return false;
-                }
-                else
-                return true;
-        }
+  <!--
+  function OnChangeIn(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Core/User/addToProject.vm?project=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+  function OnClickUser()
+  {
+    //var myindex  = dropdown.selectedIndex;
+    //var SelValue = dropdown.options[myindex].value;
+    var isid = document.Form.userId.value;
+    var baseURL = "";
+
+    var baseURL = "$appRoot/Core/User/addToProject.vm?project=$projectId&tryuser=" + isid;
+
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+  function OnChangeEnv(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Core/User/addToProject.vm?project=$projectId&tryuser=$tryuser&seluser=$!{selUserId}&env=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+  function handleEnter(field, event) {
+    var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
+    if (keyCode == 13) {
+      var i;
+      for (i = 0; i < field.form.elements.length; i++)
+        if (field == field.form.elements[i])
+          break;
+      i = (i + 1) % field.form.elements.length;
+      field.form.elements[i].focus();
+      return false;
+    }
+    else
+      return true;
+  }
 
-//-->
+  //-->
 </SCRIPT>
 
 <form name="Form" method="post" action='$link.setAction("User/AddUserToProjectAction")'>
 <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>
+#set ($project = $User.getProject($projectId))
+<input type="hidden" name="projectId" value="$projectId">Project: $project.getName() <br>
 #else
-	<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>
+<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>
 #end
 
 #if ($projectId)
-	#if($tryuser)
-    	$tryuser
-        <input type=hidden name="userName" value="$tryuser">
-        #set($user = $User.getUser($tryuser))
-                #if ($user)
-                        <input type=hidden name="selUserId" value="$user.getPk()">
-                #end
-        #else
-                User ID:&nbsp;<input type="text" name="userId" size="11"  onkeypress="return handleEnter(this, event)">
-                <br><input type=button value="Add User" onClick='OnClickUser()'>
+#if($tryuser)
+$tryuser
+<input type=hidden name="userName" value="$tryuser">
+#set($user = $User.getUser($tryuser))
+#if ($user)
+<input type=hidden name="selUserId" value="$user.getPk()">
+#end
+#else
+User ID:&nbsp;<input type="text" name="userId" size="11" onkeypress="return handleEnter(this, event)">
+<br><input type=button value="Add User" onClick='OnClickUser()'>
 
-        #end
+#end
 #end
 
 #if($projectId && ($selUserId || $tryuser) && ! $envname)
 Environment:
-        <select name=env onchange='OnChangeEnv(this)'>
-        <option value="">Select one
-          <option value="all">All
-         #foreach($entry in $view.getEnvironments())
-          <option value="$entry.getName()">$entry.getName()
-         #end
-        </select><br>
+<select name=env onchange='OnChangeEnv(this)'>
+  <option value="">Select one
+  <option value="all">All
+    #foreach($entry in $view.getEnvironments())
+  <option value="$entry.getName()">$entry.getName()
+    #end
+</select><br>
 #end
 
 #if ($selUserId && $envname)
 
 #if($User.isAllowed("AddUserToProject",$projectId))
-	<!-- Individual Stuff -->
-	#if ($User.isAllowed("AddUserToProject"))
-        <table>
-        #if ($projectId)
-        	#set ($project = $User.getProject($projectId))
-	        <tr class=info>$envname Contexts
-    	    #foreach($context in $project.getTomcatContexts())
-        		<TR>
-		        #if ($!{context.getEnv().getName()} == $envname || $envname == 'all')
-        			<TD><b> $context.getName() - $!{context.getEnv().getName()}</b></td><td>&nbsp;</td>
-			        #set ($availFunctions = "")
-			        #set ($availFunctions = $User.getContextFunctions($projectId,$context))
-			        #set ($count = 1)
-			        <td align="right">
-			        #foreach($function in $availFunctions)
-            		    #if($user && $user.isAllowed($function, $project, $context))
-		        	        $function.getName()&nbsp;<input type=checkbox name=contextFunction value="$context.getPk(),$function.getPk()" checked> <br>
-        		        #else
-			                $function.getName()&nbsp;<input type=checkbox name=contextFunction value="$context.getPk(),$function.getPk()"> <br>
-            		    #end
-		                #if(($count % 3) == 0)
-        			        </TD>
-			                <td align="right">
-            		    #end
-		                #set ($count = $math.add($count, 1))
-        			#end
-		        </td>
-		        #end ## end of env selection
-        	</tr>
-		</TR>
-        #end ## end of for loop
+<!-- Individual Stuff -->
+#if ($User.isAllowed("AddUserToProject"))
+<table>
+  #if ($projectId)
+  #set ($project = $User.getProject($projectId))
+  <tr class=info>$envname Contexts
+    #foreach($context in $project.getTomcatContexts())
+    <TR>
+      #if ($!{context.getEnv().getName()} == $envname || $envname == 'all')
+      <TD><b> $context.getName() - $!{context.getEnv().getName()}</b></td><td>&nbsp;</td>
+      #set ($availFunctions = "")
+      #set ($availFunctions = $User.getContextFunctions($projectId,$context))
+      #set ($count = 1)
+      <td align="right">
+        #foreach($function in $availFunctions)
+        #if($user && $user.isAllowed($function, $project, $context))
+        $function.getName()&nbsp;<input type=checkbox name=contextFunction value="$context.getPk(),$function.getPk()"
+                                        checked> <br>
+        #else
+        $function.getName()&nbsp;<input type=checkbox name=contextFunction value="$context.getPk(),$function.getPk()">
+        <br>
+        #end
+        #if(($count % 3) == 0)
+      </TD>
+      <td align="right">
+        #end
+        #set ($count = $math.add($count, 1))
+        #end
+      </td>
+      #end ## end of env selection
+    </tr>
+  </TR>
+  #end ## end of for loop
 </table>
 #end
 <BR><BR>
-        <table>
-        #if ($projectId)
-        <tr class=info>$envname Virtualhosts
-        #foreach($vhost in $project.getVirtualHosts())
-        <TR>
-
-        #if ($!{vhost.getEnv().getName()} == $envname || $envname == 'all')
-        <TD><b> $vhost.getName() - $!{vhost.getEnv().getName()}</b></td><td>&nbsp;</td>
-        #set ($availFuntions = "")
-        #set ($availFunctions = $User.getVhostFunctions($projectId,$vhost))
-        #set ($count = 1)
-        <td align="right">
+<table>
+  #if ($projectId)
+  <tr class=info>$envname Virtualhosts
+    #foreach($vhost in $project.getVirtualHosts())
+    <TR>
+
+      #if ($!{vhost.getEnv().getName()} == $envname || $envname == 'all')
+      <TD><b> $vhost.getName() - $!{vhost.getEnv().getName()}</b></td><td>&nbsp;</td>
+      #set ($availFuntions = "")
+      #set ($availFunctions = $User.getVhostFunctions($projectId,$vhost))
+      #set ($count = 1)
+      <td align="right">
         #foreach($function in $availFunctions)
-                #if($user && $user.isAllowed($function, $project, $vhost))
-                $function.getName()&nbsp;<input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()" checked> <br>
-                #else
-                $function.getName()&nbsp;<input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()"> <br>
-                #end
-                #if(($count % 3) == 0)
-                </TD>
-                <td align="right">
-                #end
-                #set ($count = $math.add($count, 1))
+        #if($user && $user.isAllowed($function, $project, $vhost))
+        $function.getName()&nbsp;<input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()"
+                                        checked> <br>
+        #else
+        $function.getName()&nbsp;<input type=checkbox name=vhostFunctions value="$vhost.getPk(),$function.getPk()"> <br>
+        #end
+        #if(($count % 3) == 0)
+      </TD>
+      <td align="right">
         #end
-        </td>
+        #set ($count = $math.add($count, 1))
+        #end
+      </td>
 
-        #end ## end of env selection
-        </tr>
+      #end ## end of env selection
+    </tr>
 
-</TR>
-        #end
+  </TR>
+  #end
 </table>
 <input type="submit" value="Submit">
 
@@ -224,30 +228,32 @@
 #else
 
 <table>
-<tr><td colspan=3>Project Functions</td></tr>
-#set ($userFunctions1 = $User.getAllowedFunctions($project))
-<tr>
-<td width="45%" align="center">
-<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>
-<input type="Submit" name="DeleteFromUser" value="DeleteFromUser -->" class="button" onblur="this.blur()" 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>
-<select name="ProjectFunctions" size=7 scrolling="auto" multiple style="width:220px">
-
-#foreach($func1 in $userFunctions1)
-<option value=$func1.getName()>$func1.getName()
-#end
-</select>
-</td>
-</tr>
+  <tr><td colspan=3>Project Functions</td></tr>
+  #set ($userFunctions1 = $User.getAllowedFunctions($project))
+  <tr>
+    <td width="45%" align="center">
+      <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>
+      <input type="Submit" name="DeleteFromUser" value="DeleteFromUser -->" class="button" onblur="this.blur()"
+             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>
+      <select name="ProjectFunctions" size=7 scrolling="auto" multiple style="width:220px">
+
+        #foreach($func1 in $userFunctions1)
+        <option value=$func1.getName()>$func1.getName()
+          #end
+      </select>
+    </td>
+  </tr>
 
 </table>
 #end
@@ -259,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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/confirm.vm Wed Jul  5 14:11:29 2006
@@ -15,13 +15,17 @@
 ##
 ## $Id$
 ##
-#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>
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
-</form>
-#end
+<div class="messagebox">
+  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
+  <br/>
 
+  <form name="Form" method="post" action='$link.setAction($actionLink)'>
+    <input type=hidden name="methodToCall" value="$methodToCall">
+    <input type="submit" value="$buttonName"><BR>
+    <br/>
+    $methodToCall
+    <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+    $individual.getName()
+  </form>
+  #end
+</div>
\ No newline at end of file

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm Wed Jul  5 14:11:29 2006
@@ -19,78 +19,79 @@
 #set ($pageSelected = "User")
 #parse("/layout/header.vm")
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/User/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
+  <!--
+  function OnChangeIn(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Core/User/details.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+  //-->
 </SCRIPT>
 <div align="center" class="contentbox">
-<br /><br />
+  <br/><br/>
 
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Administration - <b>User</b>
-  </td>
-  <td align="right">
-  #parse("Core/User/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-#set ($id = $request.getParameter("id"))
-
-#if($id)
-#set ($methodToCall = "UpdateUser")
-#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>
-#end
-<BR><BR>
-
-
-#if ($User.isAllowed("UpdateUser") && $methodToCall == "UpdateUser")
-<BR>
-<a href="$appRoot/Core/User/update.vm?id=$id">Update this User</a> &nbsp;<BR><BR>
-<BR>
-#end
-
-#if ($User.isAllowed("DeleteUser"))
-  <form name="Form" method="post" action='$appRoot/administration/User/Delete.do'>
-  <input type=hidden name="methodToCall" value="DeleteUser" >
-  <input type=hidden name=id value="$id">
-  <input type="submit" value="Delete">
-  </form>
-#end
-#else
-  User:
-  #set ($us = $User.getAllUsers())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-              			      #foreach ($u in $us)
-              			      <option value="$u.getPk()">$u.getName()</option>
-              			      #end
-              			      </select><BR>
-#end
-
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Administration - <b>User</b>
+        </td>
+        <td align="right">
+          #parse("Core/User/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      #set ($id = $request.getParameter("id"))
+
+      #if($id)
+      #set ($methodToCall = "UpdateUser")
+      #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>
+      #end
+      <BR><BR>
+
+
+      #if ($User.isAllowed("UpdateUser") && $methodToCall == "UpdateUser")
+      <BR>
+      <a href="$appRoot/Core/User/update.vm?id=$id">Update this User</a> &nbsp;<BR><BR>
+      <BR>
+      #end
+
+      #if ($User.isAllowed("DeleteUser"))
+      <form name="Form" method="post" action='$appRoot/administration/User/Delete.do'>
+        <input type=hidden name="methodToCall" value="DeleteUser">
+        <input type=hidden name=id value="$id">
+        <input type="submit" value="Delete">
+      </form>
+      #end
+      #else
+      User:
+      #set ($us = $User.getAllUsers())
+      <select name=id onchange='OnChangeIn(this);'>
+        <option value="">Select one
+          #foreach ($u in $us)
+        <option value="$u.getPk()">$u.getName()</option>
+        #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+  <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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm Wed Jul  5 14:11:29 2006
@@ -19,30 +19,31 @@
 #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">
-		<td valign="top" height="25" align="center"> User Access </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 />
-			#if($User.isAllowed("AddUserToProject"))
-				<a href="$appRoot/Core/User/addToProject.vm">&nbsp;Add user to Project&nbsp;</a><br />
-			#end
-			#if($User.isAllowed("AddUserToProject"))
-				<a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Add Admin&nbsp;</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>
-		</td>
-	</tr>
-</table>
+  <table width="700" border="0" cellspacing="0" cellpadding="0">
+    <tr valign="top" class="info">
+      <td valign="top" height="25" align="center"> User Access </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/>
+        #if($User.isAllowed("AddUserToProject"))
+        <a href="$appRoot/Core/User/addToProject.vm">&nbsp;Add user to Project&nbsp;</a><br/>
+        #end
+        #if($User.isAllowed("AddUserToProject"))
+        <a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Add Admin&nbsp;</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>
+      </td>
+    </tr>
+  </table>
 </form>
 
-<br />
+<br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm Wed Jul  5 14:11:29 2006
@@ -16,24 +16,24 @@
 ## $Id$
 ##
 #if (!$collection)
-	#set ($menu = "/layout/menu/UserTop.vm")
-	#set ($pageSelected = "User")
-	#parse("/layout/header.vm")
-	#set ($plf = "true")
-	#if ($request.getParameter("id"))
-		#set ($id = $request.getParameter("id"))
-		#set ($individual = $view.getUserById($id))
-		#set ($indivPage = "/Core/User/confirm.vm")
-	#else
-		#set ($collection = $User.getAllUsers())
-	#end
+#set ($menu = "/layout/menu/UserTop.vm")
+#set ($pageSelected = "User")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $view.getUserById($id))
+#set ($indivPage = "/Core/User/confirm.vm")
+#else
+#set ($collection = $User.getAllUsers())
+#end
 #end
 #set ($entity = "User")
 #set ($category = "Administration")
 #set ($usesEnv = "false")
 #set ($path = "Core/User")
 #if (! $currentPage)
-	#set ($currentPage = "$appRoot/Core/User/list.vm")
+#set ($currentPage = "$appRoot/Core/User/list.vm")
 #end
 
 #parse("/layout/list2.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm Wed Jul  5 14:11:29 2006
@@ -16,11 +16,11 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Core/User/details.vm">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Core/User/add.vm">&nbsp;Add&nbsp;</option>
-<option value="$appRoot/Core/User/update.vm">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Core/User/delete.vm">&nbsp;Delete&nbsp;</option>
-<option value="$appRoot/Core/User/addToProject.vm">&nbsp;Add User to Project&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Core/User/details.vm">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Core/User/add.vm">&nbsp;Add&nbsp;</option>
+  <option value="$appRoot/Core/User/update.vm">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Core/User/delete.vm">&nbsp;Delete&nbsp;</option>
+  <option value="$appRoot/Core/User/addToProject.vm">&nbsp;Add User to Project&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm Wed Jul  5 14:11:29 2006
@@ -16,9 +16,9 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Core/User/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Core/User/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Core/User/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Core/User/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Core/User/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Core/User/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
 </select>
 

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm Wed Jul  5 14:11:29 2006
@@ -19,71 +19,72 @@
 #set ($pageSelected = "User")
 #parse("/layout/header.vm")
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/User/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
+  <!--
+  function OnChange(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Core/User/update.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+  //-->
 </SCRIPT>
 <div align="center" class="contentbox">
-<br /><br />
+  <br/><br/>
 
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Administration - <b>User</b>
-  </td>
-  <td align="right">
-  #parse("Core/User/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#set ($id = $request.getParameter("id"))
-
-#if($id)
-
-#set ($methodToCall = "UpdateUser")
-#set ($u = $view.getUserById($id))
-
-#if ($User.isAllowed("UpdateUser") && $methodToCall == "UpdateUser")
-<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>
-<input type="submit" value="Update">
-</form>
-#end
-
-#else
-  User:
-  #set ($us = $User.getAllUsers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($u in $us)
-              			      <option value="$u.getPk()">$u.getName()</option>
-              			      #end
-              			      </select><BR>
-#end
-
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Administration - <b>User</b>
+        </td>
+        <td align="right">
+          #parse("Core/User/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+      #set ($id = $request.getParameter("id"))
+
+      #if($id)
+
+      #set ($methodToCall = "UpdateUser")
+      #set ($u = $view.getUserById($id))
+
+      #if ($User.isAllowed("UpdateUser") && $methodToCall == "UpdateUser")
+      <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>
+        <input type="submit" value="Update">
+      </form>
+      #end
+
+      #else
+      User:
+      #set ($us = $User.getAllUsers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($u in $us)
+        <option value="$u.getPk()">$u.getName()</option>
+        #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm Wed Jul  5 14:11:29 2006
@@ -15,7 +15,7 @@
 ##
 ## $Id$
 ##
-<option value="$appRoot/Apache/Worker/list.vm">&nbsp;View Apache&nbsp;</option> 
+<option value="$appRoot/Apache/Worker/list.vm">&nbsp;View Apache&nbsp;</option>
 <option value="$appRoot/Tomcat/Worker/list.vm">&nbsp;View Tomcat&nbsp;</option>
 <option value="$appRoot/Apache/Worker/add.vm">&nbsp;Add Apache&nbsp;</option>
 <option value="$appRoot/Tomcat/Worker/add.vm">&nbsp;Add Tomcat&nbsp;</option>

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm Wed Jul  5 14:11:29 2006
@@ -22,89 +22,91 @@
 
 
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-<td colspan=3>Infrastructure - Worker - <b>Search</b></td>
-<td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
-<option value="">Select one
-#parse("/Core/Worker/menu/search.vm")
-</select></td>
-</tr>
-</table>
-
-<br />
-#if ($name && $type != "")
-<div class="messagebox" width="75%" align="center">
-<br />
-<form name="Form1" method="post" action='$appRoot/Core/Worker/search.vm'>
-
-Component <select name=type>
-<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 />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
-<br />
-#if ($type == "HostingPool")
-#set($collection = $view.searchHostingPools($name))
-#set($path = "Core/Pool")
-#elseif ($type == "ApachePool")
-#set($collection = $view.searchApachePools($name))
-#set($path = "Apache/Pool")
-#elseif ($type == "TomcatPool")
-#set($collection = $view.searchTomcatPools($name))
-#set($path = "Tomcat/Pool")
-#elseif ($type == "ApacheWorker")
-#set($collection = $view.searchApacheWorkers($name))
-#set($path = "Apache/Worker")
-#elseif ($type == "TomcatWorker")
-#set($collection = $view.searchTomcatWorkers($name))
-#set($path = "Tomcat/Worker")
-#elseif ($type == "Hardware")
-#set($path = "Core/Server")
-#set($collection = $view.searchHardwares($name))
-#elseif ($type == "Apache")
-#set($path = "Apache/Server")
-#set($collection = $view.searchApaches($name))
-#elseif ($type == "Tomcat")
-#set($collection = $view.searchTomcats($name))
-#set($path = "Tomcat/Server")
-#elseif ($type == "Virtualhost")
-#set($path = "Apache/Entity")
-#set($collection = $view.searchVirtualHosts($name))
-#elseif ($type == "Context")
-#set($path = "Tomcat/Entity")
-#set($collection = $view.searchContexts($name))
-#end
-#parse("$path/list.vm")
-#end
-<div class="messagebox" width="75%" align="center">
-<br />
-#if ($name && $type != "")
-<form name="Form2" method="post" action='$appRoot/Core/Worker/search.vm'>
-#else
-<form name="Form1" method="post" action='$appRoot/Core/Worker/search.vm'>
-#end
-Component <select name=type>
-<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 />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
+  <br/><br/>
 
-<br />
-</div>
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - Worker - <b>Search</b></td>
+        <td colspan="2" align="right"><select name=links onchange='OnChange(this);'>
+          <option value="">Select one
+            #parse("/Core/Worker/menu/search.vm")
+        </select></td>
+      </tr>
+    </table>
+
+    <br/>
+    #if ($name && $type != "")
+    <div class="messagebox" width="75%" align="center">
+      <br/>
+
+      <form name="Form1" method="post" action='$appRoot/Core/Worker/search.vm'>
+
+        Component <select name=type>
+        <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/>
+
+        <input type="submit" value="Search">
+      </form>
+      <br/>
+    </div>
+    <br/>
+    #if ($type == "HostingPool")
+    #set($collection = $view.searchHostingPools($name))
+    #set($path = "Core/Pool")
+    #elseif ($type == "ApachePool")
+    #set($collection = $view.searchApachePools($name))
+    #set($path = "Apache/Pool")
+    #elseif ($type == "TomcatPool")
+    #set($collection = $view.searchTomcatPools($name))
+    #set($path = "Tomcat/Pool")
+    #elseif ($type == "ApacheWorker")
+    #set($collection = $view.searchApacheWorkers($name))
+    #set($path = "Apache/Worker")
+    #elseif ($type == "TomcatWorker")
+    #set($collection = $view.searchTomcatWorkers($name))
+    #set($path = "Tomcat/Worker")
+    #elseif ($type == "Hardware")
+    #set($path = "Core/Server")
+    #set($collection = $view.searchHardwares($name))
+    #elseif ($type == "Apache")
+    #set($path = "Apache/Server")
+    #set($collection = $view.searchApaches($name))
+    #elseif ($type == "Tomcat")
+    #set($collection = $view.searchTomcats($name))
+    #set($path = "Tomcat/Server")
+    #elseif ($type == "Virtualhost")
+    #set($path = "Apache/Entity")
+    #set($collection = $view.searchVirtualHosts($name))
+    #elseif ($type == "Context")
+    #set($path = "Tomcat/Entity")
+    #set($collection = $view.searchContexts($name))
+    #end
+    #parse("$path/list.vm")
+    #end
+    <div class="messagebox" width="75%" align="center">
+      <br/>
+      #if ($name && $type != "")
+      <form name="Form2" method="post" action='$appRoot/Core/Worker/search.vm'>
+        #else
+        <form name="Form1" method="post" action='$appRoot/Core/Worker/search.vm'>
+          #end
+          Component <select name=type>
+          <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/>
+
+          <input type="submit" value="Search">
+        </form>
+        <br/>
+    </div>
 
-#parse("/layout/footer.vm")
+    <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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/infrastructure.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/infrastructure.vm Wed Jul  5 14:11:29 2006
@@ -21,101 +21,103 @@
 
 
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-<td colspan=3>Infrastructure - <b>Search</b></td>
-<td colspan="2" align="right"> </td>
-</tr>
-</table>
-<br />
-#if ($name && $type != "")
-<div class="messagebox" width="75%" align="center">
-<br />
-<form name="Form1" method="post" action='$appRoot/Core/infrastructure.vm'>
-
-Component <select name=type>
-<option value="">Select one</option>
-<option value="HostingPool">Hosting Pool</option>
-<option value="ApachePool">Apache Pool</option>
-<option value="TomcatPool">Tomcat Pool</option>
-<option value="ApacheWorker">ApacheWorker</option>
-<option value="TomcatWorker">TomcatWorker</option>
-<option value="Hardware">Hardware</option>
-<option value="Apache">Apache</option>
-<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 />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
-<br />
-#if ($type == "HostingPool")
-#set($collection = $view.searchHostingPools($name))
-#set($path = "Core/Pool")
-#elseif ($type == "ApachePool")
-#set($collection = $view.searchApachePools($name))
-#set($path = "Apache/Pool")
-#elseif ($type == "TomcatPool")
-#set($collection = $view.searchTomcatPools($name))
-#set($path = "Tomcat/Pool")
-#elseif ($type == "ApacheWorker")
-#set($collection = $view.searchApacheWorkers($name))
-#set($path = "Apache/Worker")
-#elseif ($type == "TomcatWorker")
-#set($collection = $view.searchTomcatWorkers($name))
-#set($path = "Tomcat/Worker")
-#elseif ($type == "Hardware")
-#set($path = "Core/Server")
-#set($collection = $view.searchHardwares($name))
-#elseif ($type == "Apache")
-#set($path = "Apache/Server")
-#set($collection = $view.searchApaches($name))
-#elseif ($type == "Tomcat")
-#set($collection = $view.searchTomcats($name))
-#set($path = "Tomcat/Server")
-#elseif ($type == "Virtualhost")
-#set($path = "Apache/Entity")
-#set($collection = $view.searchVirtualHosts($name))
-#elseif ($type == "Context")
-#set($path = "Tomcat/Entity")
-#set($collection = $view.searchContexts($name))
-#end
-#parse("$path/list.vm")
-#end
-<div class="messagebox" width="75%" align="center">
-<br />
-#if ($name && $type != "")
-<form name="Form2" method="post" action='$appRoot/Core/infrastructure.vm'>
-#else
-<form name="Form1" method="post" action='$appRoot/Core/infrastructure.vm'>
-#end
-Component <select name=type>
-<option value="">Select one</option>
-<option value="HostingPool">Hosting Pool</option>
-<option value="ApachePool">Apache Pool</option>
-<option value="TomcatPool">Tomcat Pool</option>
-<option value="ApacheWorker">ApacheWorker</option>
-<option value="TomcatWorker">TomcatWorker</option>
-<option value="Hardware">Hardware</option>
-<option value="Apache">Apache</option>
-<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 />
-
-<input type="submit" value="Search">
-</form>
-<br />
-</div>
+  <br/><br/>
 
-<br />
-</div>
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Infrastructure - <b>Search</b></td>
+        <td colspan="2" align="right"></td>
+      </tr>
+    </table>
+    <br/>
+    #if ($name && $type != "")
+    <div class="messagebox" width="75%" align="center">
+      <br/>
 
-#parse("/layout/footer.vm")
+      <form name="Form1" method="post" action='$appRoot/Core/infrastructure.vm'>
+
+        Component <select name=type>
+        <option value="">Select one</option>
+        <option value="HostingPool">Hosting Pool</option>
+        <option value="ApachePool">Apache Pool</option>
+        <option value="TomcatPool">Tomcat Pool</option>
+        <option value="ApacheWorker">ApacheWorker</option>
+        <option value="TomcatWorker">TomcatWorker</option>
+        <option value="Hardware">Hardware</option>
+        <option value="Apache">Apache</option>
+        <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/>
+
+        <input type="submit" value="Search">
+      </form>
+      <br/>
+    </div>
+    <br/>
+    #if ($type == "HostingPool")
+    #set($collection = $view.searchHostingPools($name))
+    #set($path = "Core/Pool")
+    #elseif ($type == "ApachePool")
+    #set($collection = $view.searchApachePools($name))
+    #set($path = "Apache/Pool")
+    #elseif ($type == "TomcatPool")
+    #set($collection = $view.searchTomcatPools($name))
+    #set($path = "Tomcat/Pool")
+    #elseif ($type == "ApacheWorker")
+    #set($collection = $view.searchApacheWorkers($name))
+    #set($path = "Apache/Worker")
+    #elseif ($type == "TomcatWorker")
+    #set($collection = $view.searchTomcatWorkers($name))
+    #set($path = "Tomcat/Worker")
+    #elseif ($type == "Hardware")
+    #set($path = "Core/Server")
+    #set($collection = $view.searchHardwares($name))
+    #elseif ($type == "Apache")
+    #set($path = "Apache/Server")
+    #set($collection = $view.searchApaches($name))
+    #elseif ($type == "Tomcat")
+    #set($collection = $view.searchTomcats($name))
+    #set($path = "Tomcat/Server")
+    #elseif ($type == "Virtualhost")
+    #set($path = "Apache/Entity")
+    #set($collection = $view.searchVirtualHosts($name))
+    #elseif ($type == "Context")
+    #set($path = "Tomcat/Entity")
+    #set($collection = $view.searchContexts($name))
+    #end
+    #parse("$path/list.vm")
+    #end
+    <div class="messagebox" width="75%" align="center">
+      <br/>
+      #if ($name && $type != "")
+      <form name="Form2" method="post" action='$appRoot/Core/infrastructure.vm'>
+        #else
+        <form name="Form1" method="post" action='$appRoot/Core/infrastructure.vm'>
+          #end
+          Component <select name=type>
+          <option value="">Select one</option>
+          <option value="HostingPool">Hosting Pool</option>
+          <option value="ApachePool">Apache Pool</option>
+          <option value="TomcatPool">Tomcat Pool</option>
+          <option value="ApacheWorker">ApacheWorker</option>
+          <option value="TomcatWorker">TomcatWorker</option>
+          <option value="Hardware">Hardware</option>
+          <option value="Apache">Apache</option>
+          <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/>
+
+          <input type="submit" value="Search">
+        </form>
+        <br/>
+    </div>
+
+    <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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/add.vm Wed Jul  5 14:11:29 2006
@@ -19,105 +19,102 @@
 #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">
-<tr class="info" valign="top">
-	<td colspan=3><b>Help Items - Add</b>
-  </td>
-  <td align="right">
-  #parse("Help/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("help/HelpItemAction")'>
-<table>
-<tr>
-<td>
-Title:
-</td>
-<td>
-<input type="text" id="hiTitle" name="hiTitle" value="$!{hiTitle}">
-</td>
-</tr>
-<tr>
-<td>
-Topic:
-</td>
-<td>
-<input type="text" id="topic" name="topic" value="$!{topic}">
-</td>
-</tr>
-<tr>
-<td>
-Subtopic:
-</td>
-<td>
-<input type="text" id="subtopic" name="subtopic" value="$!{subtopic}">
-</td>
-</tr>
-<tr>
-<td>
-Summary:
-</td>
-<td>
-<input type="text" id="summary" name="summary" value="$!{summary}">
-</td>
-</tr>
-<tr>
-<td>
-Keywords:
-</td>
-<td>
-<input type="text" id="keywords" name="keywords" value="$!{keywords}">
-</td>
-</tr>
-<tr>
-<td>
-Content:
-</td>
-<td>
-<textarea id="content" name="content">$!{content}</textarea>
-</td>
-</tr>
-<tr>
-<td>
-Function:
-</td>
-<td>
-<select name=functionIdString>
-            <option value="0"> No Function Limitation
-            #foreach( $f in $User.getAllMyFunctions())
-			      <option value="$f.getPk()">$f.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-<tr>
-<td>
-Valid:
-</td>
-<td>
-<input type="checkbox" id="valid" name="valid" value="true">
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddHelpItem">
-<input type="submit" value="submit">
-</form>
-
-
-
-
-
-
-</div>
-<br />
-</div>
-<br />
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3><b>Help Items - Add</b>
+        </td>
+        <td align="right">
+          #parse("Help/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+      <form name="Form" method="post" action='$link.setAction("help/HelpItemAction")'>
+        <table>
+          <tr>
+            <td>
+              Title:
+            </td>
+            <td>
+              <input type="text" id="hiTitle" name="hiTitle" value="$!{hiTitle}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Topic:
+            </td>
+            <td>
+              <input type="text" id="topic" name="topic" value="$!{topic}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Subtopic:
+            </td>
+            <td>
+              <input type="text" id="subtopic" name="subtopic" value="$!{subtopic}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Summary:
+            </td>
+            <td>
+              <input type="text" id="summary" name="summary" value="$!{summary}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Keywords:
+            </td>
+            <td>
+              <input type="text" id="keywords" name="keywords" value="$!{keywords}">
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Content:
+            </td>
+            <td>
+              <textarea id="content" name="content">$!{content}</textarea>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Function:
+            </td>
+            <td>
+              <select name=functionIdString>
+                <option value="0"> No Function Limitation
+                  #foreach( $f in $User.getAllMyFunctions())
+                <option value="$f.getPk()">$f.getName()
+                  #end
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              Valid:
+            </td>
+            <td>
+              <input type="checkbox" id="valid" name="valid" value="true">
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="methodToCall" value="AddHelpItem">
+        <input type="submit" value="submit">
+      </form>
+
+
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Added: 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=419344&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm Wed Jul  5 14:11:29 2006
@@ -0,0 +1,31 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+## $Id$
+##
+<div class="messagebox">
+<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<br />
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><BR>
+<br />
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+</div>

Propchange: incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm Wed Jul  5 14:11:29 2006
@@ -15,96 +15,9 @@
 ##
 ## $Id$
 ##
-#set ($menu = "/layout/menu/HelpTop.vm")
-#set ($pageSelected = "help")
-#parse("/layout/header.vm")
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Help/delete.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
-</SCRIPT>
-<div align="center" class="contentbox">
-<br /><br />
-
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Help Items - <b>Help</b>
-  </td>
-  <td align="right">
-  #parse("Help/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-#set ($helpId = $request.getParameter("id"))
-#set($actionLink = "help/HelpAction")
+#set($actionLink = "help/HelpItemAction")
 #set($methodToCall = "DeleteHelpItem")
 #set($buttonName = "Delete")
 #set ($function = "DeleteHelpItem")
-
-#if($helpId)
-#set ($helps = $helpHelper.getHelpItems())
- #foreach ($help in $helps)
-  #if ("$help.getPk()" == $helpId)
-  	#set($h = $help)
-  #end
- #end
-
-##if ($User.isAllowed($function) && $methodToCall == "DeleteHelpItem")
-#if ($methodToCall == "DeleteHelpItem")
-<table>
-<tr>
-
-
-Are you sure you want to delete $!{h.getName()}
-<br>
-<br>
-	<td valign="middle">
-		<form action="javascript:history.go(-1)" method="post">
-		#submit_button("submit" "< Back" "button" "")
-		</form>
-	</td>
-	<td valign="middle">
-		<form method="post" action='$link.setAction("help/HelpItemAction")' method="post">
-		<input type="hidden" name="id" value="$!{helpId}">
-		<input type="hidden" name="methodToCall" value="DeleteHelpItem">
-		#submit_button("submit" "Delete" "button" "")
-		</form>
-	</td>
-
-</tr>
-
-</table>
-#else
-bad function
-#end
-#else
-  <br />
-  Help Item to Delete:
-   #set ($hs = $helpHelper.getHelpItems())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-                                      #foreach ($h in $hs)
-                                      <option value="$h.getPk()">$h.getName()
-                                      #end
-                                      </select><BR>
-  <br />
-#end
-</div>
-<br />
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
-
+#set ($currentPage = "delete.vm")
+#parse("Help/list.vm")

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/details.vm Wed Jul  5 14:11:29 2006
@@ -19,95 +19,153 @@
 #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">
-<tr class="info" valign="top">
-	<td colspan=3>Help Items - <b>Help</b>
-  </td>
-  <td align="right">
-  #parse("Help/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan=3>Help Items - <b>Help</b>
+    </td>
+    <td align="right">
+      #parse("Help/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
+
 <div class="messagebox">
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Help/details.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
+  <!--
+  function OnChangeIn(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Help/details.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+  //-->
 </SCRIPT>
 #set ($id = $request.getParameter("id"))
 #set ($idNum = 1)
 
 #if($id)
-#set ($methodToCall = "UpdateHelp")
+#set ($methodToCall = "UpdateHelpItem")
 #set ($helpItem = $helpHelper.getHelpItem($id))
 
-<br />
-Title: $!{helpItem.getTitle()}<br>
-Topic: $!{helpItem.getTopic()}<br>
-Subtopic: $!{helpItem.getSubtopic()}<br>
-Summary: $!{helpItem.getSummary()}<br>
-Keywords: $!{helpItem.getKeywordsForWeb()}<br>
-Content: $!{helpItem.getContent()}<br>
-Function:
-	#foreach( $f in $User.getAllMyFunctions())
-		#if ($f.getPk() == $helpItem.getFunctionId())
-			#set ($name = $f.getName())
-		#end
-	#end
-	#if ($name)
-		$name <br>
-	#else
-		No Function Limitation<br>
-	#end
-Valid: 
-#if ($helpItem.isValid())
-	True
-#else
-	False
-<br \>
-#end
-##if ($User.isAllowed("UpdateHelpItem") && $methodToCall == "UpdateHelpItem")
-<BR>
+<br/>
+<table>
+  <tr>
+    <td>
+      <b>Title:</b>
+    </td>
+    <td>
+      $!{helpItem.getTitle()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Topic:</b>
+    </td>
+    <td>
+      $!{helpItem.getTopic()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Subtopic:</b>
+    </td>
+    <td>
+      $!{helpItem.getSubtopic()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Summary:</b>
+    </td>
+    <td>
+      $!{helpItem.getSummary()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Keywords:</b>
+    </td>
+    <td>
+      $!{helpItem.getKeywordsForWeb()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Content:</b>
+    </td>
+    <td>
+      $!{helpItem.getContent()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Function:<b/>
+    </td>
+    <td>
+      #foreach( $f in $User.getAllMyFunctions())
+      #if ($f.getPk() == $helpItem.getFunctionId())
+      #set ($name = $f.getName())
+      #end
+      #end
+      #if ($name)
+      $name <br>
+      #else
+      No Function Limitation<br>
+      #end
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Valid:</b>
+    </td>
+    <td>
+      #if ($helpItem.isValid())
+      True
+      #else
+      False
+      #end
+      <br\>
+    </td>
+  </tr>
+</table>
+
+#if ($User.isAllowed("UpdateHelpItem") && $methodToCall == "UpdateHelpItem")
+<br\>
 <a href="$appRoot/Help/update.vm?id=$id">Update this Help Item</a> &nbsp;<BR><BR>
 <BR>
-##end
+#end
 
-##if ($User.isAllowed("DeleteHelpItem"))
-	<form method="post" action='$link.setAction("help/HelpItemAction")' method="post">
-	<input type="hidden" name="id" value="$!{id}">
-	<input type="hidden" name="methodToCall" value="DeleteHelpItem">
-	#submit_button("Submit" "Delete" "button" "")
-	</form>
-##end
+#if ($User.isAllowed("DeleteHelpItem"))
+<form method="post" action='$link.setAction("help/HelpItemAction")' method="post">
+  <input type="hidden" name="id" value="$!{id}">
+  <input type="hidden" name="methodToCall" value="DeleteHelpItem">
+  #submit_button("Submit" "Delete" "button" "")
+</form>
+#end
 #else
-  <br />
-  Help Item:
-  #set ($hs = $helpHelper.getHelpItems())
-               <select name=id onchange='OnChangeIn(this);'>
-                          <option value="">Select one
-              			      #foreach ($h in $hs)
-              			      <option value="$h.getPk()">$h.getTitle()</option>
-              			      #end
-              			      </select><BR>
-<br />
+<br/>
+Help Item:
+#set ($hs = $helpHelper.getHelpItems())
+<select name=id onchange='OnChangeIn(this);'>
+  <option value="">Select one
+    #foreach ($h in $hs)
+  <option value="$h.getPk()">$h.getTitle()</option>
+  #end
+</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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/index.vm Wed Jul  5 14:11:29 2006
@@ -18,28 +18,29 @@
 #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 />
-<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 />
+  <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/>
 
-	#set ($helpitems = $helpHelper.getHelpItems())
-  	#foreach ($hi in $helpitems)
-    	<a href="$appRoot/Help/details.vm?id=$hi.getPk()">&nbsp;$hi.getName()&nbsp;</a><br />
-    #end
-    <BR>
-	</td>
-</tr>
+        #set ($helpitems = $helpHelper.getHelpItems())
+        #foreach ($hi in $helpitems)
+        <a href="$appRoot/Help/details.vm?id=$hi.getPk()">&nbsp;$hi.getName()&nbsp;</a><br/>
+        #end
+        <BR>
+      </td>
+    </tr>
 
-</table>
+  </table>
 
 </div>
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/list.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/list.vm Wed Jul  5 14:11:29 2006
@@ -16,24 +16,24 @@
 ## $Id$
 ##
 #if (!$collection)
-	#set ($menu = "/layout/menu/HelpTop.vm")
-	#set ($pageSelected = "Help")
-	#parse("/layout/header.vm")
-	#set ($plf = "true")
-	#if ($request.getParameter("id"))
-		#set ($id = $request.getParameter("id"))
-		#set ($individual = $helpHelper.getHelpItem($id))
-		#set ($indivPage = "/Help/confirm.vm")
-	#else
-		#set ($collection = $helpHelper.getHelpItems())
-	#end
+#set ($menu = "/layout/menu/HelpTop.vm")
+#set ($pageSelected = "Help")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $helpHelper.getHelpItem($id))
+#set ($indivPage = "/Help/confirm.vm")
+#else
+#set ($collection = $helpHelper.getHelpItems())
+#end
 #end
 #set ($entity = "Help")
 #set ($category = "Help Items")
 #set ($usesEnv = "false")
 #set ($path = "Help")
 #if (!$currentPage)
-	#set ($currentPage = "$appRoot/Help/list.vm")
+#set ($currentPage = "$appRoot/Help/list.vm")
 #end
 
 #parse("/layout/list2.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm Wed Jul  5 14:11:29 2006
@@ -16,10 +16,10 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Help/add.vm">&nbsp;Add&nbsp;</option>
-<option value="$appRoot/Help/details.vm">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Help/update.vm">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Help/delete.vm">&nbsp;Delete&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Help/add.vm">&nbsp;Add&nbsp;</option>
+  <option value="$appRoot/Help/details.vm">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Help/update.vm">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Help/delete.vm">&nbsp;Delete&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm Wed Jul  5 14:11:29 2006
@@ -16,8 +16,16 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Help/update.vm">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Help/details.vm">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Help/delete.vm">&nbsp;Delete&nbsp;</option>
-</select>
\ No newline at end of file
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Help/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Help/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateFile"))
+  <option value="$appRoot/Help/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteFile"))
+  <option value="$appRoot/Help/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
+</select>

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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/update.vm Wed Jul  5 14:11:29 2006
@@ -19,147 +19,144 @@
 #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">
-<tr class="info" valign="top">
-	<td colspan=3><b>Help Items - Update</b>
-  </td>
-  <td align="right">
-  #parse("Help/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan=3><b>Help Items - Update</b>
+    </td>
+    <td align="right">
+      #parse("Help/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
+
 <div class="messagebox">
 
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChangeIn(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Help/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-//-->
+  <!--
+  function OnChangeIn(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Help/update.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+  //-->
 </SCRIPT>
 
 #set ($id = $request.getParameter("id"))
 
 
-
 #if ($id)
 #set($helpItem = $helpHelper.getHelpItem($id))
 
 <form name="Form" method="post" action='$link.setAction("help/HelpItemAction")'>
-<table>
-<tr>
-<td>
-Title:
-</td>
-<td>
-<input type="text" id="hiTitle" name="hiTitle" value="$!{helpItem.getTitle()}">
-</td>
-</tr>
-<tr>
-<td>
-Topic:
-</td>
-<td>
-<input type="text" id="topic" name="topic" value="$!{helpItem.getTopic()}">
-</td>
-</tr>
-<tr>
-<td>
-Subtopic:
-</td>
-<td>
-<input type="text" id="subtopic" name="subtopic" value="$!{helpItem.getSubtopic()}">
-</td>
-</tr>
-<tr>
-<td>
-Summary:
-</td>
-<td>
-<input type="text" id="summary" name="summary" value="$!{helpItem.getSummary()}">
-</td>
-</tr>
-<tr>
-<td>
-Keywords:
-</td>
-<td>
-<input type="text" id="keywords" name="keywords" value="$!{helpItem.getKeywordsForWeb()}">
-</td>
-</tr>
-<tr>
-<td>
-Content:
-</td>
-<td>
-<textarea id="content" name="content">$!{helpItem.getContent()}</textarea>
-</td>
-</tr>
-<tr>
-<td>
-Function:
-</td>
-<td>
-<select name=functionIdString>
-            <option value="0"> No Function Limitation
+  <table>
+    <tr>
+      <td>
+        Title:
+      </td>
+      <td>
+        <input type="text" id="hiTitle" name="hiTitle" value="$!{helpItem.getTitle()}">
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Topic:
+      </td>
+      <td>
+        <input type="text" id="topic" name="topic" value="$!{helpItem.getTopic()}">
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Subtopic:
+      </td>
+      <td>
+        <input type="text" id="subtopic" name="subtopic" value="$!{helpItem.getSubtopic()}">
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Summary:
+      </td>
+      <td>
+        <input type="text" id="summary" name="summary" value="$!{helpItem.getSummary()}">
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Keywords:
+      </td>
+      <td>
+        <input type="text" id="keywords" name="keywords" value="$!{helpItem.getKeywordsForWeb()}">
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Content:
+      </td>
+      <td>
+        <textarea id="content" name="content">$!{helpItem.getContent()}</textarea>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Function:
+      </td>
+      <td>
+        <select name=functionIdString>
+          <option value="0"> No Function Limitation
             #foreach( $f in $User.getAllMyFunctions())
             #if ($f.getPk() == $helpItem.getFunctionId())
-			      <option value="$f.getPk()" selected>$f.getName()
+          <option value="$f.getPk()" selected>$f.getName()
             #else
-			      <option value="$f.getPk()">$f.getName()
+          <option value="$f.getPk()">$f.getName()
             #end
-			      #end
-			      </select>
-</td>
-</tr>
-<tr>
-<td>
-Valid:
-</td>
-<td>
-#if ($helpItem.isValid())
-<input type="checkbox" id="valid" name="valid" value="true" checked>
-#else
-<input type="checkbox" id="valid" name="valid" value="true">
-#end
-</td>
-</tr>
-</table>
-<input type="hidden" name="id" value="$!{id}">
-<input type="hidden" name="methodToCall" value="UpdateHelpItem">
-<input type="submit" value="submit">
+            #end
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Valid:
+      </td>
+      <td>
+        #if ($helpItem.isValid())
+        <input type="checkbox" id="valid" name="valid" value="true" checked>
+        #else
+        <input type="checkbox" id="valid" name="valid" value="true">
+        #end
+      </td>
+    </tr>
+  </table>
+  <input type="hidden" name="id" value="$!{id}">
+  <input type="hidden" name="methodToCall" value="UpdateHelpItem">
+  <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);'>
-                          <option value="">Select one
-                       #foreach ($hi in $helpitems)
-                       <option value="$hi.getPk()">$hi.getName()
-                       #end
-                       </select><BR>
-<br />
+<select name=id onchange='OnChangeIn(this);'>
+  <option value="">Select one
+    #foreach ($hi in $helpitems)
+  <option value="$hi.getPk()">$hi.getName()
+    #end
+</select><BR>
+<br/>
 #end
 
 
-
-
-
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 



Mime
View raw message