You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/12/22 11:33:32 UTC

svn commit: r123083 - in lenya/trunk/src/webapp/lenya/usecases: . admin

Author: andreas
Date: Wed Dec 22 02:33:31 2004
New Revision: 123083

URL: http://svn.apache.org/viewcvs?view=rev&rev=123083
Log:
re-organized admin usecases
Added:
   lenya/trunk/src/webapp/lenya/usecases/admin/
   lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx
   lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx
Removed:
   lenya/trunk/src/webapp/lenya/usecases/addUser.jx
   lenya/trunk/src/webapp/lenya/usecases/userProfile.jx
Modified:
   lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
   lenya/trunk/src/webapp/lenya/usecases/usecases.js

Deleted: /lenya/trunk/src/webapp/lenya/usecases/addUser.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/addUser.jx?view=auto&rev=123082
==============================================================================

Added: lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx?view=auto&rev=123083
==============================================================================
--- (empty file)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx	Wed Dec 22 02:33:31 2004
@@ -0,0 +1,82 @@
+<page:page
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"    
+  >
+  
+  <page:title><i18n:text>Add <jx:out value="${request.getParameter('userType')}"/></i18n:text></page:title>
+  <page:body>
+    
+    <form>
+      <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+      <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+
+      <table class="lenya-table-noborder">
+        <tr>
+          <td colspan="2">
+            <ul>
+            <jx:forEach var="message" items="${usecase.getErrorMessages()}">
+              <li>
+                <i18n:text><jx:out value="${message}"/></i18n:text>
+              </li>
+            </jx:forEach>
+            <jx:forEach var="message" items="${usecase.getInfoMessages()}">
+              <li>
+                <i18n:text><jx:out value="${message}"/></i18n:text>
+              </li>
+            </jx:forEach>
+            </ul>
+          </td>
+        </tr>
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>User ID</i18n:text> *</td>
+          <td><input type="text" name="userId" class="lenya-form-entry" value="${request.getParameter('userId')}"/></td>
+        </tr>
+        
+        <jx:if test="${request.getParameter('className') == 'org.apache.lenya.ac.ldap.LDAPUser'}">
+          <tr>
+            <td class="lenya-entry-caption"><i18n:text>LDAP ID</i18n:text> *</td>
+            <td><input type="text" name="ldapId" class="lenya-form-entry" value="${request.getParameter('ldapId')}"/></td>
+          </tr>
+        </jx:if>
+        
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>Name</i18n:text> *</td>
+          <td><input type="text" name="fullName" class="lenya-form-entry" value="${request.getParameter('fullName')}"/></td>
+        </tr>
+        <tr>
+          <td valign="top" class="lenya-entry-caption"><i18n:text>Description</i18n:text></td>
+          <td>
+            <textarea name="description" class="lenya-form-entry">
+              <jx:out value="${request.getParameter('description')}"/>
+            </textarea>
+          </td>
+        </tr>
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>E-Mail</i18n:text> *</td>
+          <td><input type="text" name="email" class="lenya-form-entry" value="${request.getParameter('email')}"/></td>
+        </tr>
+        
+        <jx:if test="${request.getParameter('className') != 'org.apache.lenya.ac.ldap.LDAPUser'}">
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>Password</i18n:text> *</td>
+          <td><input type="password" name="password" class="lenya-form-entry" value="${request.getParameter('password')}"/></td>
+        </tr>
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>Confirm pasword</i18n:text> *</td>
+          <td><input type="password" name="confirmPassword" class="lenya-form-entry" value="${request.getParameter('confirmPassword')}"/></td>
+        </tr>
+        </jx:if>
+        
+        <tr>
+          <td/>
+          <td>
+            <input i18n:attr="value" type="submit" name="submit" value="Add"/>
+            <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </page:body>
+</page:page>
\ No newline at end of file

Added: lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx?view=auto&rev=123083
==============================================================================
--- (empty file)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx	Wed Dec 22 02:33:31 2004
@@ -0,0 +1,59 @@
+<page:page
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"    
+  >
+  
+  <page:title><i18n:text>Edit User Profile</i18n:text></page:title>
+  <page:body>
+    
+    <form>
+      <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+      <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+
+      <table class="lenya-table-noborder">
+        <tr>
+          <td colspan="2">
+            <ul>
+            <jx:forEach var="message" items="${usecase.getErrorMessages()}">
+              <li>
+                <i18n:text><jx:out value="${message}"/></i18n:text>
+              </li>
+            </jx:forEach>
+            <jx:forEach var="message" items="${usecase.getInfoMessages()}">
+              <li>
+                <i18n:text><jx:out value="${message}"/></i18n:text>
+              </li>
+            </jx:forEach>
+            </ul>
+          </td>
+        </tr>
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>Name</i18n:text> *</td>
+          <td><input type="text" name="fullName" class="lenya-form-entry" value="${usecase.getParameter('fullName')}"/></td>
+        </tr>
+        <tr>
+          <td valign="top" class="lenya-entry-caption"><i18n:text>Description</i18n:text></td>
+          <td>
+            <textarea name="description" class="lenya-form-entry">
+              <jx:out value="${usecase.getParameter('description')}"/>
+            </textarea>
+          </td>
+        </tr>
+        <tr>
+          <td class="lenya-entry-caption"><i18n:text>E-Mail</i18n:text> *</td>
+          <td><input type="text" name="email" class="lenya-form-entry" value="${usecase.getParameter('email')}"/></td>
+        </tr>
+        
+        <tr>
+          <td/>
+          <td>
+            <input i18n:attr="value" type="submit" name="submit" value="Save"/>
+            <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </page:body>
+</page:page>
\ No newline at end of file

Modified: lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/usecase.xmap?view=diff&rev=123083&p1=lenya/trunk/src/webapp/lenya/usecases/usecase.xmap&r1=123082&p2=lenya/trunk/src/webapp/lenya/usecases/usecase.xmap&r2=123083
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecase.xmap	(original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecase.xmap	Wed Dec 22 02:33:31 2004
@@ -45,7 +45,7 @@
         <map:serialize/>
       </map:match>
       
-      <map:match pattern="view/*">
+      <map:match pattern="view/**">
         <map:generate type="jx" src="{1}.jx"/>
         <map:transform type="i18n">
           <map:parameter name="locale" value="{request:locale}"/>

Modified: lenya/trunk/src/webapp/lenya/usecases/usecases.js
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/usecases.js?view=diff&rev=123083&p1=lenya/trunk/src/webapp/lenya/usecases/usecases.js&r1=123082&p2=lenya/trunk/src/webapp/lenya/usecases/usecases.js&r2=123083
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecases.js	(original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecases.js	Wed Dec 22 02:33:31 2004
@@ -8,7 +8,6 @@
 			&& !name.equals("submit")) {
 			
 			var value = flowHelper.getRequest(cocoon).get(name);
-			Packages.java.lang.System.out.println("name: " + name + "  value: " + value.getClass());
 			
 			var string = new Packages.java.lang.String();
 			if (string.getClass().isInstance(value)) {
@@ -37,9 +36,12 @@
 	var ready = false;
 	var success = false;
 	
+	var usecaseView = new Packages.java.lang.String(usecaseName).replace('.', '/');
+	Packages.java.lang.System.out.println(usecaseView);
+	
 	while (!ready) {
 	
-		cocoon.sendPageAndWait("view/" + usecaseName, {
+		cocoon.sendPageAndWait("view/" + usecaseView, {
 		    "usecase" : usecase
 		});
 		

Deleted: /lenya/trunk/src/webapp/lenya/usecases/userProfile.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/userProfile.jx?view=auto&rev=123082
==============================================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org