svn commit: r738149 - in /lenya/trunk/src/modules-core/administration/usecases: deleteGroup.jx deleteIPRange.jx deleteUser.jx groups.jx ipRanges.jx users.jx

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]>
Author: andreas
Date: Tue Jan 27 17:05:58 2009
New Revision: 738149

URL: http://svn.apache.org/viewvc?rev=738149&view=rev
Log:
Removing some validation issues in administration module.

Added:
    lenya/trunk/src/modules-core/administration/usecases/deleteIPRange.jx
Modified:
    lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx
    lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx
    lenya/trunk/src/modules-core/administration/usecases/groups.jx
    lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
    lenya/trunk/src/modules-core/administration/usecases/users.jx

Modified: lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx?rev=738149&r1=738148&r2=738149&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx Tue Jan 27 17:05:58 2009
@@ -33,29 +33,22 @@
         <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">
-              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
-            </td>
-          </tr>
-          <tr>
-            <td/>
-            <td>
-              <i18n:translate>
-                <i18n:text i18n:key="delete-object?"/>
-                <i18n:param><i18n:text>group</i18n:text>&#160;<q><jx:out value="${request.getParameter('groupId')}"/></q></i18n:param>
-              </i18n:translate>       
-            </td>
-          </tr>
-          <tr>
-            <td/>
-            <td>
-              <input i18n:attr="value" type="submit" name="submit" value="Yes"/>
-              <input i18n:attr="value" type="submit" name="cancel" value="No"/>
-            </td>
-          </tr>
-        </table>
+        <p>
+          <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+        </p>
+        
+        <p>
+          <i18n:translate>
+            <i18n:text i18n:key="delete-object?"/>
+            <i18n:param><i18n:text>group</i18n:text>&#160;<q><jx:out value="${request.getParameter('groupId')}"/></q></i18n:param>
+          </i18n:translate>       
+        </p>
+        
+        <p>
+          <input i18n:attr="value" type="submit" name="submit" value="Yes"/>
+          <input i18n:attr="value" type="submit" name="cancel" value="No"/>
+        </p>
+        
       </form>
     </div>
   </page:body>

Added: lenya/trunk/src/modules-core/administration/usecases/deleteIPRange.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteIPRange.jx?rev=738149&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/deleteIPRange.jx (added)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteIPRange.jx Tue Jan 27 17:05:58 2009
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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: deleteUser.jx 738135 2009-01-27 16:32:15Z andreas $ -->
+
+<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:body>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
+    <div id="contentblock1" class="lenya-tab">
+      <h1><i18n:text>Delete IP Range</i18n:text></h1>    
+      <form id="form-delete_iprange" action="${usecase.getSourceURL()}" method="post">
+        <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+        <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+        
+        <p>
+          <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+        </p>
+        
+        <p>
+          <i18n:translate>
+            <i18n:text i18n:key="delete-object?"/>
+            <i18n:param><i18n:text>IP Range</i18n:text>&#160;<q><jx:out value="${request.getParameter('ipRangeId')}"/></q></i18n:param>
+          </i18n:translate>       
+        </p>
+        
+        <p>
+          <input i18n:attr="value" type="submit" name="submit" value="Yes"/>
+          <input i18n:attr="value" type="submit" name="cancel" value="No"/>
+        </p>
+      </form>
+    </div>
+  </page:body>
+</page:page>
\ No newline at end of file

Modified: lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx?rev=738149&r1=738148&r2=738149&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx Tue Jan 27 17:05:58 2009
@@ -32,29 +32,21 @@
         <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">
-              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
-            </td>
-          </tr>
-          <tr>
-            <td/>
-            <td>
-              <i18n:translate>
-                <i18n:text i18n:key="delete-object?"/>
-                <i18n:param><i18n:text>user</i18n:text>&#160;<q><jx:out value="${request.getParameter('userId')}"/></q></i18n:param>
-              </i18n:translate>       
-            </td>
-          </tr>
-          <tr>
-            <td/>
-            <td>
-              <input i18n:attr="value" type="submit" name="submit" value="Yes"/>
-              <input i18n:attr="value" type="submit" name="cancel" value="No"/>
-            </td>
-          </tr>
-        </table>
+        <p>
+          <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+        </p>
+        
+        <p>
+          <i18n:translate>
+            <i18n:text i18n:key="delete-object?"/>
+            <i18n:param><i18n:text>user</i18n:text>&#160;<q><jx:out value="${request.getParameter('userId')}"/></q></i18n:param>
+          </i18n:translate>       
+        </p>
+        
+        <p>
+          <input i18n:attr="value" type="submit" name="submit" value="Yes"/>
+          <input i18n:attr="value" type="submit" name="cancel" value="No"/>
+        </p>
       </form>
     </div>
   </page:body>

Modified: lenya/trunk/src/modules-core/administration/usecases/groups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groups.jx?rev=738149&r1=738148&r2=738149&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groups.jx Tue Jan 27 17:05:58 2009
@@ -39,7 +39,7 @@
       </p>
       
       <p>
-        <a href="{usecase.getSourceURL()}?lenya.usecase=admin.addGroup" class="lenyaButton">
+        <a href="${usecase.getSourceURL()}?lenya.usecase=admin.addGroup" class="lenyaButton">
           <i18n:text>Add Group</i18n:text>
         </a>
       </p>
@@ -60,7 +60,7 @@
               <jx:out value="${group.getName()}"/>
             </td>
             <td style="vertical-align: middle">
-              <a href="{usecase.getSourceURL()}?lenya.usecase=admin.deleteGroup&amp;groupId=${group.getId()}" class="lenyaButton">
+              <a href="${usecase.getSourceURL()}?lenya.usecase=admin.deleteGroup&amp;groupId=${group.getId()}" class="lenyaButton">
                 <i18n:text>Delete</i18n:text>
               </a>
             </td>

Modified: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx?rev=738149&r1=738148&r2=738149&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx Tue Jan 27 17:05:58 2009
@@ -66,11 +66,9 @@
               </jx:forEach>
             </td>
             <td style="vertical-align: middle">
-              <form method="get" id="form-delete_iprange" action="${usecase.getSourceURL()}">
-                <input type="hidden" name="lenya.usecase" value="admin.deleteIPRange"/>
-                <input name="ipRangeId" type="hidden" value="${ipRange.getId()}"/>
-                <input i18n:attr="value" type="submit" value="Delete" name="input-delete_iprange"/>
-              </form>
+              <a href="${usecase.getSourceURL()}?lenya.usecase=admin.deleteIPRange&amp;ipRangeId=${ipRange.getId()}" class="lenyaButton">
+                <i18n:text>Delete</i18n:text>
+              </a>
             </td>
           </tr>
         </jx:forEach>

Modified: lenya/trunk/src/modules-core/administration/usecases/users.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/users.jx?rev=738149&r1=738148&r2=738149&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/users.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/users.jx Tue Jan 27 17:05:58 2009
@@ -32,13 +32,9 @@
       
       <h1><i18n:text>Users</i18n:text></h1>
       
-      <table class="lenya-table-noborder">
-        <tr>
-          <td colspan="2">
-            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
-          </td>
-        </tr>
-      </table>
+      <p>
+        <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      </p>
       
       <p>
         <i18n:text>Add User</i18n:text>:
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.