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 2005/03/04 16:23:22 UTC

svn commit: r156161 - in lenya/trunk/src/webapp/lenya/usecases/tab: ac.jx assets.jx meta.jx

Author: andreas
Date: Fri Mar  4 07:23:21 2005
New Revision: 156161

URL: http://svn.apache.org/viewcvs?view=rev&rev=156161
Log:
fixed submit button parameter name

Modified:
    lenya/trunk/src/webapp/lenya/usecases/tab/ac.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/ac.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/ac.jx?view=diff&r1=156160&r2=156161
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/ac.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/ac.jx Fri Mar  4 07:23:21 2005
@@ -16,12 +16,10 @@
 -->
 
 <!-- $Id$ -->
-
-<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: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">
+  
   <div>
     <table border="0" cellpadding="0" cellspacing="0">
       <tr>
@@ -31,7 +29,7 @@
           </a>
         </td>
         <jx:if test="${usecase.getParameter('languageexists').equals('true')}">
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
+          <jx:if test="${not(usecase.getParameter('document').getId().equals('/'))}">
             <td>
               <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
                 <i18n:text>Meta</i18n:text>
@@ -90,63 +88,70 @@
       </tr>
     </table>
     <div id="contentblock1" class="lenya-tab">
-  <table class="lenya-table-noborder">
-  <tr>
-    <td>
-    	<form method="get" name="form_ssl_{@area}">
-        <input type="hidden" name="lenya.usecase" value="tab.asset"/>
-        <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-				<input type="hidden" name="change_ssl" value="true"/>
-        <input type="checkbox" name="ssl" onclick="document.forms.form_ssl_{@area}.submit()" value="true">
-           <jx:if test="${usecase.getParameter('ssl').equals('true')} or ${usecase.getParameter('anchestor-ssl').equals('true')}">
-            <jx:attribute name="checked">checked</jx:attribute>
-            </jx:if>
-            <jx:if test="${usecase.getParameter('anchestor-ssl').equals('true')}">
-              <jx:attribute name="disabled">disabled</jx:attribute>
-            </jx:if>
-          <i18n:text>SSL Encryption</i18n:text>
-        </input>
-      </form>
-    </td>
-	</tr>
-	<tr>
-	<td>
-	<table class="lenya-table">
-		<tr>
-			<th colspan="2"><i18n:text>Access Object</i18n:text></th>
-			<th colspan="2"><jx:if test="${usecase.getParameter('area').equals('authoring')}">
-        <i18n:text>Role</i18n:text></jx:if>&#160;</th>
-		</tr>
-		<tr>
-			<jx:call-template name="form-add-credential">
-				<jx:with-param name="larea" select="@area"/>
-				<jx:with-param name="type">user</jx:with-param>
-				<jx:with-param name="title">User</jx:with-param>
-			</jx:call-template>
-		</tr>
-		<tr>
-			<jx:call-template name="form-add-credential">
-				<jx:with-param name="larea" select="@area"/>
-				<jx:with-param name="type">group</jx:with-param>
-				<jx:with-param name="title">Group</jx:with-param>
-			</jx:call-template>
-		</tr>
-		<jx:if test="@area = 'live'">
-		<tr>
-			<jx:call-template name="form-add-credential">
-				<jx:with-param name="larea" select="@area"/>
-				<jx:with-param name="type">iprange</jx:with-param>
-				<jx:with-param name="title">IP Range</jx:with-param>
-			</jx:call-template>
-		</tr>
-		</jx:if>
-		
-		<jx:apply-templates select="lenya-info:credential">
-          <jx:with-param name="larea" select="@area"/>
-		</jx:apply-templates>
-	</table>
-
-<!--      </jx:if>
--->    </div>
+      <table class="lenya-table-noborder">
+        <tr>
+          <td>
+            <form method="get" name="form_ssl_{@area}">
+              <input type="hidden" name="lenya.usecase" value="tab.asset"/>
+              <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+              <input type="hidden" name="change_ssl" value="true"/>
+              <input type="checkbox" name="ssl"
+                onclick="document.forms.form_ssl_{@area}.submit()" value="true">
+                <jx:if test="${usecase.getParameter('ssl').equals('true')} or ${usecase.getParameter('anchestor-ssl').equals('true')}">
+                  <jx:attribute name="checked">checked</jx:attribute>
+                </jx:if>
+                <jx:if test="${usecase.getParameter('anchestor-ssl').equals('true')}">
+                  <jx:attribute name="disabled">disabled</jx:attribute>
+                </jx:if>
+                <i18n:text>SSL Encryption</i18n:text>
+              </input>
+            </form>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <table class="lenya-table">
+              <tr>
+                <th colspan="2">
+                  <i18n:text>Access Object</i18n:text>
+                </th>
+                <th colspan="2">
+                  <jx:if test="${usecase.getParameter('area').equals('authoring')}">
+                    <i18n:text>Role</i18n:text>
+                  </jx:if>&#160;</th>
+              </tr>
+              <tr>
+                <jx:call-template name="form-add-credential">
+                  <jx:with-param name="larea" select="@area"/>
+                  <jx:with-param name="type">user</jx:with-param>
+                  <jx:with-param name="title">User</jx:with-param>
+                </jx:call-template>
+              </tr>
+              <tr>
+                <jx:call-template name="form-add-credential">
+                  <jx:with-param name="larea" select="@area"/>
+                  <jx:with-param name="type">group</jx:with-param>
+                  <jx:with-param name="title">Group</jx:with-param>
+                </jx:call-template>
+              </tr>
+              <jx:if test="@area = 'live'">
+                <tr>
+                  <jx:call-template name="form-add-credential">
+                    <jx:with-param name="larea" select="@area"/>
+                    <jx:with-param name="type">iprange</jx:with-param>
+                    <jx:with-param name="title">IP Range</jx:with-param>
+                  </jx:call-template>
+                </tr>
+              </jx:if>
+              <jx:apply-templates select="lenya-info:credential">
+                <jx:with-param name="larea" select="@area"/>
+              </jx:apply-templates>
+            </table>
+          </td>
+        </tr>
+      </table>
+      <!--      </jx:if>
+-->
+    </div>
   </div>
-</page:page>
\ No newline at end of file
+</page:page>

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx?view=diff&r1=156160&r2=156161
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx Fri Mar  4 07:23:21 2005
@@ -125,7 +125,7 @@
       </table>
      <jx:if test="${usecase.getParameter('area').equals('authoring')}">
       <form>
-        <input type="hidden" name="lenya.usecase" value="tab.asset"/>
+        <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
         <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
         <table class="lenya-table-noborder">
           <tr>
@@ -163,7 +163,7 @@
           <tr>
             <td/>
             <td>
-              <input i18n:attr="value" type="submit" value="New Asset"/>
+              <input i18n:attr="value" name="submit" type="submit" value="New Asset"/>
             </td>
           </tr>
         </table>

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx?view=diff&r1=156160&r2=156161
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx Fri Mar  4 07:23:21 2005
@@ -162,16 +162,16 @@
               <br/>
               <jx:choose>
                 <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-                  <input i18n:attr="value" type="submit" value="Save"/>
+                  <input i18n:attr="value" name="submit" type="submit" value="Save"/>
                 </jx:when>
                 <jx:otherwise>
-                  <input i18n:attr="value" type="submit" disabled="disabled" value="Save"/>
+                  <input i18n:attr="value" name="submit" type="submit" disabled="disabled" value="Save"/>
                 </jx:otherwise>
               </jx:choose>
             </td>
           </tr>
         </table>
-        <input type="hidden" name="lenya.usecase" value="tab.meta"/>
+        <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
         <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
       </form>
     </div>



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