incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r418333 - in /incubator/lokahi/lokahi/trunk: conf/ database/ docs/ src/java/org/apache/lokahi/core/common/collection/ src/java/org/apache/lokahi/core/controller/ src/java/org/apache/lokahi/core/gui/help/ src/java/org/apache/lokahi/core/gui/...
Date Fri, 30 Jun 2006 17:18:55 GMT
Author: toback
Date: Fri Jun 30 10:18:54 2006
New Revision: 418333

URL: http://svn.apache.org/viewvc?rev=418333&view=rev
Log:
Update to fix the controller thread not starting.

Added:
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/FixedLenghtQueue.java   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Help/details.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Help/list.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm   (with props)
Modified:
    incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
    incubator/lokahi/lokahi/trunk/conf/function.xml
    incubator/lokahi/lokahi/trunk/conf/web.xml
    incubator/lokahi/lokahi/trunk/database/functions.sql
    incubator/lokahi/lokahi/trunk/docs/README.TXT
    incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java
    incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/update.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm

Modified: incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties (original)
+++ incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties Fri Jun 30 10:18:54 2006
@@ -78,6 +78,7 @@
 function.success.DeleteFile=The file has been deleted.
 function.success.DeleteFunction=The function has been deleted.
 function.success.DeleteHardware=The hardware has been deleted.  Why would you want to do that to me?
+function.success.DeleteHelpItem=The Help Topic has been deleted.
 function.success.DeleteHostingPool=The hosting pool has been deleted.
 function.success.DeleteInstance=The instance has been deleted.
 function.success.DeleteIp=The ip has been deleted.

Modified: incubator/lokahi/lokahi/trunk/conf/function.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/function.xml?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/function.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/function.xml Fri Jun 30 10:18:54 2006
@@ -113,6 +113,7 @@
 <function id="88" name="Restart Tomcat" command="RestartTomcat" />
 <function id="23" name="Update IP" command="UpdateIp" />
 <function id="117" name="Add Help Entry" command="AddHelpItem" />
+<function id="136" name="Delete Help Entry" command="DeleteHelpItem" />
 <function id="42" name="Update File" command="UpdateFile" />
 <function id="39" name="Delete Tomcat" command="DeleteTomcat" />
 <function id="67" name="Add Instance" command="AddInstance" />

Modified: incubator/lokahi/lokahi/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/web.xml?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/web.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/web.xml Fri Jun 30 10:18:54 2006
@@ -10,6 +10,10 @@
         <servlet-class>org.apache.lokahi.core.gui.www.TMCStartupServlet</servlet-class>
 
       <init-param>
+            <param-name>JvmHttp</param-name>
+            <param-value>8008</param-value>
+      </init-param>
+      <init-param>
             <param-name>log4j-init-file</param-name>
             <param-value>WEB-INF/log4j.xml</param-value>
       </init-param>

Modified: incubator/lokahi/lokahi/trunk/database/functions.sql
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/functions.sql?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/database/functions.sql (original)
+++ incubator/lokahi/lokahi/trunk/database/functions.sql Fri Jun 30 10:18:54 2006
@@ -347,9 +347,7 @@
 BEGIN
     OPEN l_cursor FOR
 		 SELECT a.ALERT_ID, a.SUBMISION_DATE, a.SUBMITTER_ID, a.ALERT_TITLE, a.ALERT_LINK, a.alert_contents
-		 FROM TMC_ALERTS a, TMC_REL_ALERT_PROJECT rel
-		 where rel.project_id=-1
-		 and rel.alert_ID=a.Alert_ID;
+		 FROM TMC_ALERTS a;
     RETURN l_cursor;
 END;
 /

Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/README.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/README.TXT Fri Jun 30 10:18:54 2006
@@ -1,4 +1,7 @@
-   Requirements:  Tomcat 5.5.9, Oracle 9i, JDK 1.5, ant 1.6.5 or later.
+   Requirements:  Tomcat 5.5.9 is installed, and you know how to configure it
+                  Oracle 9i database is available to you
+                  JDK 1.5
+                  ant 1.6.5 or later
 
    Build instructions:
 
@@ -41,10 +44,10 @@
 
    SECTION III: Database Setup (Oracle)
 
-   1. Change directory to build/database/ directory.
-   2. Create the lokahi schema <SCHEMA> in your Oracle database with default tablespace
+   1. Change directory to build/lokahi/database/ directory.
+   2. Database Administrator task: Create the lokahi schema <SCHEMA> in your Oracle database with default tablespace
       and enough quota on that tablespace (100 MB is sufficient for install).
-   3. Run schema_priv.sql as DBA to grant system privileges to <SCHEMA>:
+   3. Database Administrator task: Run schema_priv.sql as DBA to grant system privileges to <SCHEMA>:
       > @schema_priv.sql <SCH>
 
    4. Login from sqlplus as <SCHEMA> and run:
@@ -56,6 +59,11 @@
 
    5. Create the superuser. Login from sqlplus as <SCHEMA> and run:
       > @tmc_user_data.sql
+
+      You will be prompted to enter a username, password, first name, last name, and
+      email address.  These will be used to create the superuser account.
+
+      Then run:
       > @tmc_rel_function_user_data.sql
 
    6. Create the initial instance.
@@ -69,9 +77,10 @@
    SECTION IV: Agent Install
 
    1.	copy the files in $LOKAHI_SOURCE/build/agent to a directory on each server.
-   2.	start the agent buy running:
-      > $JAVA_HOME/bin/java -classpath $JAVA_HOME/lib/tools.jar:$AGENT_HOME/log4j-1.2.13.jar:$AGENT_HOME/lokahi.jar:$AGENT_HOME/axis.jar:$AGENT_HOME/commons-logging.jar:$AGENT_HOME/commons-discovery-0.2.jar:$AGENT_HOME/jdom.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/derby.jar:$AGENT_HOME:/derbyclient.jar:$AGENT_HOME/commons-pool-1.2.jar org.apache.lokahi.core.agent.TMCAgent start
+   2.	start the agent by running:
+      > $JAVA_HOME/bin/java -classpath  $JAVA_HOME/lib/tools.jar:$AGENT_HOME/axis.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/commons-discovery-0.2.jar:$AGENT_HOME/commons-logging.jar:$AGENT_HOME/commons-pool-1.2.jar:$AGENT_HOME/derby.jar:$AGENT_HOME/derbyclient.jar:$AGENT_HOME/jaxrpc.jar:$AGENT_HOME/jdom.jar:$AGENT_HOME/log4j-1.2.13.jar:$AGENT_HOME/lokahi.jar:$AGENT_HOME/saaj.jar:$AGENT_HOME/wsdl4j-1.5.1.jar org.apache.lokahi.core.agent.TMCAgent start
 
 
    SECTION V: Console Install
-   1. define the context in tomcats server.xml file and start tomcat.
+   1.  Modify the web.xml in the <install.location> and set the JvmHttp parameter to the HTTP port of the jvm.
+   1.  define the context in tomcat's server.xml file and start tomcat.

Modified: incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/RUNNING.TXT Fri Jun 30 10:18:54 2006
@@ -1,3 +1,6 @@
+If you have not yet performed the steps outlined in README.txt, stop here and go
+through the README.txt directions before proceeding.
+
 
                  ===========================
                  Getting Started with Lokahi
@@ -7,7 +10,6 @@
 to be added to the database before you can use Lokahi to manage web applications.
 
 The following items must be performed through the GUI.
-
 
 
 ============================

Added: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/FixedLenghtQueue.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/FixedLenghtQueue.java?rev=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/FixedLenghtQueue.java (added)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/FixedLenghtQueue.java Fri Jun 30 10:18:54 2006
@@ -0,0 +1,37 @@
+/*
+* 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.
+*/
+package org.apache.lokahi.core.common.collection;
+
+import java.util.AbstractCollection;
+import java.util.Iterator;
+
+/**
+ * @author Stephen Toback
+ * @version $Id$
+ */
+public class FixedLenghtQueue<T> extends AbstractCollection<T> {
+  public Iterator<T> iterator() {
+    return null;
+  }
+
+  public int size() {
+    return 0;
+  }
+
+  public boolean add(T o) {
+    return false;
+  }
+}

Propchange: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/FixedLenghtQueue.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java Fri Jun 30 10:18:54 2006
@@ -217,7 +217,7 @@
    * @return - array of Strings, got by splitting the String passed
    */
   public String[] split(String str, String delim) {
-    Vector v = new Vector();  //todo make this a collection.
+    Vector v = new Vector();  
 
     StringTokenizer st = new StringTokenizer(str, delim);
     while (st.hasMoreTokens()) v.addElement(st.nextToken().trim());

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java Fri Jun 30 10:18:54 2006
@@ -21,6 +21,7 @@
 import org.apache.lokahi.core.common.interfaces.Collectable;
 import org.apache.lokahi.core.common.interfaces.Dao;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.interfaces.Restable;
 import org.apache.log4j.Logger;
 import org.jdom.Element;
 
@@ -33,7 +34,7 @@
  * @author Stephen Toback
  * @version $Id$
  */
-public class HelpItemDAO implements Dao, Collectable {
+public class HelpItemDAO implements Dao, Collectable, Restable {
   private static final TMCBroker<HelpItemDAO> broker = new BrokerFactory<HelpItemDAO>().getBroker();
   static final Logger logger = Logger.getLogger(HelpItemDAO.class);
   private int pk;
@@ -49,11 +50,11 @@
 
   private Function function;
 
-  public Element buildXMLRepresention() {
+  public StringBuilder buildXMLRepresention() {
     return null;  //TODO finish this.
   }
 
-  public Element buildShortXMLRepresentation() {
+  public StringBuilder buildShortXMLRepresentation() {
     return null;  //TODO finish this.
   }
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java Fri Jun 30 10:18:54 2006
@@ -23,6 +23,7 @@
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.core.common.interfaces.LokahiModel;
 import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.collection.TMCSet;
 import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
@@ -32,13 +33,13 @@
  * @author Stephen Toback
  * @version $Id$
  */
-public class HelpItemModel extends LokahiModel {
+public class HelpItemModel extends LokahiModel<HelpItemDAO> {
   static final Logger logger = Logger.getLogger(HelpItemModel.class);
 
   public HelpItemModel() {
   }
 
-  public void add(User u, HelpItemDAO hi, Function f) throws SQLException, AuthorizationException {
+  public void addHelpItem(User u, HelpItemDAO hi, Function f) throws SQLException, AuthorizationException {
     if (u.isAllowed(f) && "AddHelpItem".equals(f.getCommand())) {
       this.jpInit(f, u, hi.getName());
       HelpItemDAO.store(hi);
@@ -49,8 +50,8 @@
     }
   }
 
-  public void delete(User u, HelpItemDAO hi, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
-    if (u.isAllowed(f) && "AddHelpItem".equals(f.getCommand())) {
+  public void deleteHelpItem(User u, HelpItemDAO hi, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
+    if (u.isAllowed(f) && "DeleteHelpItem".equals(f.getCommand())) {
       if (hi == null || hi.getPk() < 1) throw new TMCIllegalArgumentException("Help Item can not be null");
       this.jpInit(f, u, hi.getName());
       HelpItemDAO.delete(hi);
@@ -61,7 +62,7 @@
     }
   }
 
-  public void update(User u, HelpItemDAO hi, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
+  public void updateHelpItem(User u, HelpItemDAO hi, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
     if (u.isAllowed(f) && "UpdateHelpItem".equals(f.getCommand())) {
       if (hi.getPk() >= 1 && hi.getName() != null && !"".equals(hi.getName())) {
         this.jpInit(f, u, hi.getName());
@@ -76,13 +77,14 @@
     }
   }
 
-  public Collection<TMCDao> getObjects() throws SQLException {
-    return null;  //TODO finish this.
-  }
+  public Collection<HelpItemDAO> getObjects() throws SQLException {
+      return new TMCSet<HelpItemDAO>(HelpItemDAO.getHelpItems());
+    }
+
+    public HelpItemDAO getObject(int id) throws SQLException {
+      return HelpItemDAO.getHelpItem(id);
+    }
 
-  public TMCDao getObject(int id) throws SQLException {
-    return null;  //TODO finish this.
-  }
 }
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java Fri Jun 30 10:18:54 2006
@@ -38,7 +38,7 @@
   public void init() throws ServletException {
     super.init();
     ServletConfig servletcfg = this.getServletConfig();
-    String jvmHttp = this.getServletContext().getInitParameter("TmcJvmHttp");
+    String jvmHttp = getInitParameter("JvmHttp");
     String prefix = getServletContext().getRealPath("/");
     String file = getInitParameter("log4j-init-file");
     // if the log4j-init-file is not set, then no point in trying

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm Fri Jun 30 10:18:54 2006
@@ -110,7 +110,7 @@
 </tr>
 <tr>
 <td>
-Environment Varibles:
+Environment Variables:
 </td>
 <td>
 <input type="text" id="envVaribles" name="envVaribles" value="$!{envVaribles}">

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm?rev=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,26 @@
+##
+## 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$
+##
+#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

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

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm Fri Jun 30 10:18:54 2006
@@ -24,7 +24,7 @@
 {
 	var myindex  = dropdown.selectedIndex;
 	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Core/alerts/delete.vm?id=" + SelValue;
+	var baseURL  = "$appRoot/Core/Alerts/delete.vm?id=" + SelValue;
 	top.location.href = baseURL;
 
 	return true;
@@ -48,18 +48,14 @@
 <div class="messagebox">
 
 #set ($alertId = $request.getParameter("id"))
+#set ($alertIdNum = 1)
 #set($actionLink = "administration/AlertAction")
 #set($methodToCall = "DeleteAlert")
 #set($buttonName = "Delete")
 #set ($function = "DeleteAlert")
 
 #if($alertId)
-#set ($alerts = $alertSet.getRecentAlerts())
- #foreach ($alert in $alerts)
-  #if ("$alert.getPk()" == $alertId)
-  	#set($a = $alert)
-  #end
- #end
+#set ($a = $alertSet.getAlertById($alertIdNum.valueOf($alertId)))
 ##parse("Core/project/list.vm")
 
 ##set ($id = $request.getParameter("id"))
@@ -94,6 +90,7 @@
 </table>
 #end
 #else
+  <br />
   Alert to Delete:
    #set ($als = $alertSet.getRecentAlerts())
                <select name=id onchange='OnChangeIn(this);'>
@@ -102,6 +99,7 @@
                                       <option value="$al.getPk()">$al.getName()
                                       #end
                                       </select><BR>
+  <br />
 #end
 </div>
 <br />

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm?rev=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,95 @@
+##
+## 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$
+##
+#set ($menu = "/layout/menu/EntityTop.vm")
+#set ($pageSelected = "alert")
+#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Administration - <b>Alert</b>
+  </td>
+  <td align="right">
+  #parse("Core/Alerts/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+<div class="messagebox">
+<SCRIPT LANGUAGE=javascript>
+<!--
+function OnChangeIn(dropdown)
+{
+	var myindex  = dropdown.selectedIndex;
+	var SelValue = dropdown.options[myindex].value;
+	var baseURL  = "$appRoot/Core/Alerts/details.vm?id=" + SelValue;
+	top.location.href = baseURL;
+
+	return true;
+}
+//-->
+</SCRIPT>
+#set ($id = $request.getParameter("id"))
+#set ($idNum = 1)
+
+#if($id)
+#set ($methodToCall = "UpdateAlert")
+#set ($a = $alertSet.getAlertById($idNum.valueOf($id)))
+
+##if ($User.isAllowed("ViewAlert"))
+<br />
+Alert Title: $!{a.getName()}<br>
+Alert Link: $!{a.getLink()}<br>
+Alert Content: $!{a.getContent()}<br>
+##end
+
+#if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
+<BR>
+<a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<BR><BR>
+<BR>
+#end
+
+#if ($User.isAllowed("DeleteAlert"))
+	<form method="post" action='$link.setAction("administration/AlertAction")' method="post">
+	<input type="hidden" name="id" value="$!{id}">
+	<input type="hidden" name="methodToCall" value="DeleteAlert">
+	#submit_button("Submit" "Delete" "button" "")
+	</form>
+#end
+#else
+  <br />
+  Alert:
+  #set ($als = $alertSet.getRecentAlerts())
+               <select name=id onchange='OnChangeIn(this);'>
+                          <option value="">Select one
+              			      #foreach ($al in $als)
+              			      <option value="$al.getPk()">$al.getName()</option>
+              			      #end
+              			      </select><BR>
+<br />
+#end
+
+</div>
+<br />
+</div>
+<br />
+</div>
+#parse("/layout/footer.vm")
+

Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm?rev=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,44 @@
+##
+## 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$
+##
+#if (!$collection)
+	#set ($menu = "/layout/menu/EntityTop.vm")
+	#set ($pageSelected = "alerts")
+	#parse("/layout/header.vm")
+
+	#set ($plf = "true")
+	#if ($request.getParameter("id"))
+		#set ($id = $request.getParameter("id"))
+		#set ($idNum = 1)
+		#set ($individual = $alertSet.getAlertById($idNum.valueOf($id)))
+		#set ($indivPage = "/Core/Alerts/confirm.vm")
+	#else
+		#set ($collection = $alertSet.getRecentAlerts())
+	#end
+#end
+#set ($entity = "Alerts")
+#set ($category = "Administration")
+#set ($usesEnv = "false")
+#set ($path = "Core/Alerts")
+#if (!$currentPage)
+	#set ($currentPage = "$appRoot/Core/Alerts/list.vm")
+#end
+
+#parse("/layout/list2.vm")
+#if ($plf)
+	#parse("/layout/footer.vm")
+#end

Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm Fri Jun 30 10:18:54 2006
@@ -31,9 +31,6 @@
 }
 //-->
 </SCRIPT>
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateAlert")
-
 <div align="center" class="contentbox">
 <br /><br />
 
@@ -50,24 +47,17 @@
 <br />
 <div class="messagebox">
 
+#set ($id = $request.getParameter("id"))
+#set ($idNum = 1)
+#set ($methodToCall = "UpdateAlert")
+
 ##When AlertTool is upgraded uncomment this
 #if($id)
-#set($a = $alertSet.getAlertById($id))
-
-##delete this block when the above is uncommented
-##if($id)
-##set ($alerts = $alertSet.getRecentAlerts())
-##foreach ($alert in $alerts)
-##if ("$alert.getPk()" == $id)
-##set($a = $alert)
-##end
-##end
-##block above
-
+#set($a = $alertSet.getAlertById($idNum.valueOf($id)))
 
 ##remove below comment at appropriate time
 #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
-
+<br />
 <form name="Form" method="post" action='$link.setAction("administration/AlertAction")'>
 <table>
 <tr>
@@ -97,10 +87,11 @@
 </table>
 <input type="hidden" name="methodToCall" value="UpdateAlert">
 <input type="hidden" name="id" value="$!{id}">
-<input type="submit" value="Modify">
+<input type="submit" value="Update">
 </form>
 #end
 #else
+  <br />
   Alerts:
    #set ($als = $alertSet.getRecentAlerts())
                <select name=id onchange='OnChangeIn(this);'>
@@ -109,6 +100,7 @@
                                       <option value="$al.getPk()">$al.getName()
                                       #end
                                       </select><BR>
+  <br />
 #end
 </div>
 <br />

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm Fri Jun 30 10:18:54 2006
@@ -15,10 +15,103 @@
 ##
 ## $Id$
 ##
-#set($actionLink = "administration/File/Delete")
+#set ($menu = "/layout/menu/EntityTop.vm")
+#set ($pageSelected = "file")
+#parse("/layout/header.vm")
+<SCRIPT LANGUAGE=javascript>
+<!--
+function OnChangeIn(dropdown)
+{
+	var myindex  = dropdown.selectedIndex;
+	var SelValue = dropdown.options[myindex].value;
+	var baseURL  = "$appRoot/Core/File/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>Administration - <b>File</b>
+  </td>
+  <td align="right">
+  #parse("Core/File/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+<div class="messagebox">
+
+#set ($fileId = $request.getParameter("id"))
+#set($actionLink = "administration/FileAction")
 #set($methodToCall = "DeleteFile")
 #set($buttonName = "Delete")
 #set ($function = "DeleteFile")
-#parse("Core/File/list.vm")
+
+#if($fileId)
+#set ($file = $view.getFile($id))
+
+#if ($User.isAllowed($function) && $methodToCall == "DeleteFile")
+<table>
+<tr>
+Are you sure you want to delete $!{file.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("administration/FileAction")' method="post">
+		<input type="hidden" name="id" value="$!{fileId}">
+		<input type="hidden" name="methodToCall" value="DeleteFile">
+		#submit_button("Submit" "Delete" "button" "")
+		</form>
+	</td>
+
+</tr>
+
+</table>
+#end
+#else
+  <br />
+  File to Delete:
+   #set ($fs = $view.getFiles())
+               <select name=id onchange='OnChangeIn(this);'>
+                          <option value="">Select one
+                                      #foreach ($f in $fs)
+                                      <option value="$f.getPk()">$f.getName()
+                                      #end
+                                      </select><BR>
+  <br />
+#end
+</div>
+<br />
+</div>
+<br />
+</div>
+#parse("/layout/footer.vm")
+
+
+
+
 
 
+
+
+
+
+
+
+
+#set($actionLink = "administration/File/Delete")
+#set($methodToCall = "DeleteFile")
+#set($buttonName = "Delete")
+#set ($function = "DeleteFile")
+#parse("Core/File/list.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm Fri Jun 30 10:18:54 2006
@@ -64,11 +64,11 @@
 #end
 
 #if ($User.isAllowed("DeleteFile"))
-  <form name="Form" method="post" action='$appRoot/administration/File/Delete.do'>
-  <input type=hidden name="methodToCall" value="delete" >
-  <input type=hidden name=id value="$id" >
-  <input type="submit" value="Delete">
-  </form>
+	<form method="post" action='$link.setAction("administration/FileAction")' method="post">
+	<input type="hidden" name="id" value="$!{id}">
+	<input type="hidden" name="methodToCall" value="DeleteFile">
+	#submit_button("Submit" "Delete" "button" "")
+	</form>
 #end
 
 #else

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm Fri Jun 30 10:18:54 2006
@@ -111,7 +111,7 @@
 </tr>
 <tr>
 <td>
-Additional IPs (comma seperated):
+Additional IPs (comma separated):
 </td>
 <td>
 <input type="text" id="ips" name="ips" value="$!{ips}">

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=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm Fri Jun 30 10:18:54 2006
@@ -16,23 +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/Help/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/add.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/add.vm Fri Jun 30 10:18:54 2006
@@ -20,7 +20,18 @@
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
 <br /><br />
-<div align=center>
+
+<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>
@@ -104,6 +115,7 @@
 
 
 </div>
+<br />
 </div>
 <br />
 </div>

Added: 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=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,110 @@
+##
+## 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$
+##
+#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($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")
+

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

Added: 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=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/details.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/details.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,113 @@
+##
+## 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$
+##
+#set ($menu = "/layout/menu/HelpTop.vm")
+#set ($pageSelected = "help")
+#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan=3>Help Items - <b>Help</b>
+  </td>
+  <td align="right">
+  #parse("Help/menu/global.vm")
+  </td>
+</tr>
+</table>
+<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;
+}
+//-->
+</SCRIPT>
+#set ($id = $request.getParameter("id"))
+#set ($idNum = 1)
+
+#if($id)
+#set ($methodToCall = "UpdateHelp")
+#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>
+<a href="$appRoot/Help/update.vm?id=$id">Update this Help Item</a> &nbsp;<BR><BR>
+<BR>
+##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 />
+#end
+
+</div>
+<br />
+</div>
+<br />
+</div>
+#parse("/layout/footer.vm")
+

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

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=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/index.vm Fri Jun 30 10:18:54 2006
@@ -26,14 +26,14 @@
 <br />
 <table width="700" border="0" cellspacing="0" cellpadding="0" >
 <tr valign="top" class="info">
-	<td valign="top" height="25" align="center"> Help Topics </td>
+	<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/update.vm?id=$hi.getPk()">&nbsp;$hi.getName()&nbsp;</a><br />
+    	<a href="$appRoot/Help/details.vm?id=$hi.getPk()">&nbsp;$hi.getName()&nbsp;</a><br />
     #end
     <BR>
 	</td>

Added: 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=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/list.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/list.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,42 @@
+##
+## 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$
+##
+#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
+#end
+#set ($entity = "Help")
+#set ($category = "Help Items")
+#set ($usesEnv = "false")
+#set ($path = "Help")
+#if (!$currentPage)
+	#set ($currentPage = "$appRoot/Help/list.vm")
+#end
+
+#parse("/layout/list2.vm")
+#if ($plf)
+#parse("/layout/footer.vm")
+#end

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

Added: 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=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,25 @@
+##
+## 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$
+##
+<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>
+</select>
+

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

Added: 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=418333&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm Fri Jun 30 10:18:54 2006
@@ -0,0 +1,23 @@
+##
+## 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$
+##
+<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

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

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=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/update.vm Fri Jun 30 10:18:54 2006
@@ -21,9 +21,22 @@
 <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><b>Help Items - Update</b>
+  </td>
+  <td align="right">
+  #parse("Help/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+<div class="messagebox">
+
 <SCRIPT LANGUAGE=javascript>
 <!--
-function OnChange(dropdown)
+function OnChangeIn(dropdown)
 {
 	var myindex  = dropdown.selectedIndex;
 	var SelValue = dropdown.options[myindex].value;
@@ -41,11 +54,7 @@
 
 #if ($id)
 #set($helpItem = $helpHelper.getHelpItem($id))
-$id
-$helpItem
 
-<div align=center>
-<div class="messagebox">
 <form name="Form" method="post" action='$link.setAction("help/HelpItemAction")'>
 <table>
 <tr>
@@ -53,9 +62,6 @@
 Title:
 </td>
 <td>
-<input type="hidden" id="id" name="id" value="$hi.getPk()">
-</td>
-<td>
 <input type="text" id="hiTitle" name="hiTitle" value="$!{helpItem.getTitle()}">
 </td>
 </tr>
@@ -133,14 +139,16 @@
 <input type="submit" value="submit">
 </form>
 #else
+<br />
 Help Item:  <!--TODO make this actually display help ITEMS -->
 #set ($helpitems = $helpHelper.getHelpItems())
-               <select name=id onchange='OnChange(this);'>
+               <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
 
 
@@ -148,8 +156,8 @@
 
 
 </div>
+<br />
 </div>
-
 <br />
 </div>
 #parse("/layout/footer.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm Fri Jun 30 10:18:54 2006
@@ -20,6 +20,7 @@
 ## $usesEnv (true|false)
 ## $currentPage   //todo make the env filter work and make it javascript.
 ## $entity
+## $category (optional)
 ## $collection
 ##
 ## $function
@@ -31,39 +32,43 @@
 ##
 <!--$collection -->
 #if($plf)
-<div align="center" class="contentbox">
-<br /><br />
-#if ($request.getParameter("e"))
-  #set ($envId = $request.getParameter("e"))
-#end
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info">
-<td colspan=3>Infrastructure - <b>$entity</b>
-#if($usesEnv == "true")
-  &nbsp;
-  #foreach ($env in $view.getEnvironments())
-    <a class="info" href="$currentPage?e=$env.getPk()">$env.getName()</a> &nbsp;
-  #end
-  <a class="info" href="$currentPage">All</a> &nbsp;
-#end
-</td>
-<td colspan="2" align="right">
-#parse("$path/menu/global.vm")
-</td>
-</tr>
-</table>
-<br />
+	<div align="center" class="contentbox">
+	<br /><br />
+	#if ($request.getParameter("e"))
+		#set ($envId = $request.getParameter("e"))
+	#end
+	<div class="projectbox">
+	<table width="100%" border="0" cellspacing="0" cellpadding="1">
+	<tr class="info">
+	#if ($category)
+		<td colspan=3>$category - <b>$entity</b>
+	#else
+		<td colspan=3>Infrastructure - <b>$entity</b>
+	#end
+	#if($usesEnv == "true")
+		&nbsp;
+		#foreach ($env in $view.getEnvironments())
+			<a class="info" href="$currentPage?e=$env.getPk()">$env.getName()</a> &nbsp;
+		#end
+		<a class="info" href="$currentPage">All</a> &nbsp;
+	#end
+	</td>
+	<td colspan="2" align="right">
+	#parse("$path/menu/global.vm")
+	</td>
+	</tr>
+	</table>
+	<br />
 #end
 <!--$collection -->
 <!-- $individual -->
 <!-- $indivPage -->
 #if ($individual && $indivPage)
-  #parse($indivPage)
+#parse($indivPage)
 #else
-  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
-  <form name="Form" method="post" action='$link.setAction($actionLink)'>
-    <input type=hidden name="methodToCall" value="$methodToCall" />
+#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" />
   #end
   #set($c = 1)

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm?rev=418333&r1=418332&r2=418333&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm Fri Jun 30 10:18:54 2006
@@ -22,6 +22,7 @@
 #if($User.isAllowed("AddHelpItem"))
 <li><a href="$appRoot/Help/add.vm" class="rowlink" >&nbsp;Add&nbsp;</a></li>
 <li><a href="$appRoot/Help/update.vm" class="rowlink" >&nbsp;Update&nbsp;</a></li>
+<li><a href="$appRoot/Help/delete.vm" class="rowlink" >&nbsp;Delete&nbsp;</a></li>
 #end
 </ul>
 </div>



Mime
View raw message