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/07 12:09:57 UTC

svn commit: r156415 - in lenya/trunk/src/webapp/lenya/usecases/tab: ac.jx ac/ ac/ac.jx ac/add-credential.jx acAuthoring.jx assets.jx meta.jx overview.jx revisions.jx scheduler.jx tabs.jx workflow.jx

Author: andreas
Date: Mon Mar  7 03:09:53 2005
New Revision: 156415

URL: http://svn.apache.org/viewcvs?view=rev&rev=156415
Log:
refactored tab JX templates

Added:
    lenya/trunk/src/webapp/lenya/usecases/tab/ac/
    lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/ac/add-credential.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/acAuthoring.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/tabs.jx
Removed:
    lenya/trunk/src/webapp/lenya/usecases/tab/ac.jx
Modified:
    lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/revisions.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx
    lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx

Added: lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx?view=auto&rev=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx (added)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx Mon Mar  7 03:09:53 2005
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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: ac.jx 156161 2005-03-04 15:23:21Z 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">
+  
+  <div>
+    <jx:import uri="tab/tabs.jx"/>
+    <div id="contentblock1" class="lenya-tab">
+      <table class="lenya-table-noborder">
+        <tr>
+          <td>
+            <form method="get" name="form_ssl_{$usecase.getParameter('document').getArea()}">
+              <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+              <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+              <input type="hidden" name="change_ssl" value="true"/>
+              
+              <jx:choose>
+                <jx:when test="${usecase.getParameter('ssl').equals('true') || usecase.getParameter('anchestor-ssl').equals('true')}">
+                  <jx:choose>
+                    <jx:when test="${usecase.getParameter('anchestor-ssl').equals('true')}">
+                      <input type="checkbox" name="ssl" onclick="document.forms.form_ssl_{@area}.submit()" value="true" checked="checked" disabled="disabled">
+                        <i18n:text>SSL Encryption</i18n:text>
+                      </input>
+                    </jx:when>
+                    <jx:otherwise>
+                      <input type="checkbox" name="ssl" onclick="document.forms.form_ssl_{@area}.submit()" value="true" checked="checked">
+                        <i18n:text>SSL Encryption</i18n:text>
+                      </input>
+                    </jx:otherwise>
+                  </jx:choose>
+                </jx:when>
+                <jx:otherwise>
+                  <jx:choose>
+                    <jx:when test="${usecase.getParameter('anchestor-ssl').equals('true')}">
+                      <input type="checkbox" name="ssl" onclick="document.forms.form_ssl_{@area}.submit()" value="true" disabled="disabled">
+                        <i18n:text>SSL Encryption</i18n:text>
+                      </input>
+                    </jx:when>
+                    <jx:otherwise>
+                      <input type="checkbox" name="ssl" onclick="document.forms.form_ssl_{@area}.submit()" value="true">
+                        <i18n:text>SSL Encryption</i18n:text>
+                      </input>
+                    </jx:otherwise>
+                  </jx:choose>
+                </jx:otherwise>
+              </jx:choose>
+            </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('document').getArea().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>
+    </div>
+  </div>
+</page:page>

Added: lenya/trunk/src/webapp/lenya/usecases/tab/ac/add-credential.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/ac/add-credential.jx?view=auto&rev=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/ac/add-credential.jx (added)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/ac/add-credential.jx Mon Mar  7 03:09:53 2005
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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: ac.jx 156161 2005-03-04 15:23:21Z andreas $ -->
+<jx:template
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns="http://www.w3.org/1999/xhtml"
+  name="">
+    	<form method="get">
+    	<input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+    	<input type="hidden" name="lenya.step" value="showscreen"/>
+    	<td><i18n:text><xsl:value-of select="$title"/></i18n:text>:</td>
+    	<td><xsl:apply-templates select="//lenya-info:items[@type = $type]"/></td>
+    	<td>
+    		<xsl:choose>
+    			<xsl:when test="$larea != 'live'">
+    				<xsl:apply-templates select="//lenya-info:items[@type = 'role']"/>
+    			</xsl:when>
+    			<xsl:otherwise>
+    				<input type="hidden" name="role_id" value="{//lenya-info:visitor-role}"/>
+    			</xsl:otherwise>
+    		</xsl:choose>
+    	</td>
+    	<td>
+    		<input i18n:attr="value" type="submit" name="add_credential_{$type}" value="Add">
+    			<xsl:if test="not(//lenya-info:items[@type = $type]/lenya-info:item) or ($area = 'live')">
+    				<xsl:attribute name="disabled">disabled</xsl:attribute>
+    			</xsl:if>
+    		</input>
+    	</td>
+    	</form>
+</jx:template>
\ No newline at end of file

Added: lenya/trunk/src/webapp/lenya/usecases/tab/acAuthoring.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/acAuthoring.jx?view=auto&rev=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/acAuthoring.jx (added)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/acAuthoring.jx Mon Mar  7 03:09:53 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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: ac.jx 156161 2005-03-04 15:23:21Z andreas $ -->
+<jx:import uri="tab/ac/ac.jx"
+  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"/>

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=156414&r2=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx Mon Mar  7 03:09:53 2005
@@ -23,72 +23,7 @@
            xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
 
   <div>
-    <table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          <a href="?lenya.usecase=tab.overview" class="lenya-tablink">
-            <i18n:text>Overview</i18n:text>
-          </a>
-        </td>
-        <jx:if test="${usecase.getParameter('languageexists').equals('true')}">
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
-            <td>
-              <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
-                <i18n:text>Meta</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.assets" class="lenya-tablink-active">
-                <i18n:text>Assets</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
-                <i18n:text>Workflow</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
-                <i18n:text>Versions</i18n:text>
-              </a>
-            </td>
-          </jx:if>
-          <jx:choose>
-            <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-              <td>
-                <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
-                  <i18n:text>AC Auth</i18n:text>
-                </a>
-              </td>
-              <td>
-                <a href="?lenya.usecase=tab.acLive" class="lenya-tablink">
-                  <i18n:text>AC Live</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('archive')}">
-              <td>
-                <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink">
-                  <i18n:text>AC Archive</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('trash')}">
-              <td>
-                <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink">
-                  <i18n:text>AC Trash</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-          </jx:choose>
-          <td>
-            <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
-              <i18n:text>Scheduler</i18n:text>
-            </a>
-          </td>
-        </jx:if>
-      </tr>
-    </table>
+    <jx:import uri="tab/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <table class="lenya-table">
         <tr>

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=156414&r2=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx Mon Mar  7 03:09:53 2005
@@ -22,72 +22,7 @@
            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>
-        <td>
-          <a href="?lenya.usecase=tab.overview" class="lenya-tablink">
-            <i18n:text>Overview</i18n:text>
-          </a>
-        </td>
-        <jx:if test="${usecase.getParameter('languageexists').equals('true')}">
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
-            <td>
-              <a href="?lenya.usecase=tab.meta" class="lenya-tablink-active">
-                <i18n:text>Meta</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
-                <i18n:text>Assets</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
-                <i18n:text>Workflow</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
-                <i18n:text>Versions</i18n:text>
-              </a>
-            </td>
-          </jx:if>
-          <jx:choose>
-            <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-              <td>
-                <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
-                  <i18n:text>AC Auth</i18n:text>
-                </a>
-              </td>
-              <td>
-                <a href="?lenya.usecase=tab.acLive" class="lenya-tablink">
-                  <i18n:text>AC Live</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('archive')}">
-              <td>
-                <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink">
-                  <i18n:text>AC Archive</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('trash')}">
-              <td>
-                <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink">
-                  <i18n:text>AC Trash</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-          </jx:choose>
-          <td>
-            <a href="?lenya.usecasetab.scheduler" class="lenya-tablink">
-              <i18n:text>Scheduler</i18n:text>
-            </a>
-          </td>
-        </jx:if>
-      </tr>
-    </table>
+    <jx:import uri="tab/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <form>
         <table class="lenya-table-noborder">

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx?view=diff&r1=156414&r2=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx Mon Mar  7 03:09:53 2005
@@ -22,76 +22,7 @@
            xmlns="http://www.w3.org/1999/xhtml" 
            xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
   <div>
-    <!-- 
-		These are the tabs. Make sure that each of them has the correct id,
-		target and corresponding number in the Tab() call.
-	 -->
-    <table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          <a href="?lenya.usecase=tab.overview" class="lenya-tablink-active">
-            <i18n:text>Overview</i18n:text>
-          </a>
-        </td>
-        <jx:if test="${usecase.getParameter('languageexists').equals('true')}">
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
-            <td>
-              <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
-                <i18n:text>Meta</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
-                <i18n:text>Assets</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
-                <i18n:text>Workflow</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
-                <i18n:text>Versions</i18n:text>
-              </a>
-            </td>
-          </jx:if>
-          <jx:choose>
-            <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-              <td>
-                <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
-                  <i18n:text>AC Auth</i18n:text>
-                </a>
-              </td>
-              <td>
-                <a href="?lenya.usecase=tab.acLive" class="lenya-tablink">
-                  <i18n:text>AC Live</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('archive')}">
-              <td>
-                <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink">
-                  <i18n:text>AC Archive</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('trash')}">
-              <td>
-                <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink">
-                  <i18n:text>AC Trash</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-          </jx:choose>
-          <td>
-            <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
-              <i18n:text>Scheduler</i18n:text>
-            </a>
-          </td>
-        </jx:if>
-      </tr>
-    </table>
+    <jx:import uri="tab/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <jx:choose>
         <jx:when test="${not(empty(usecase.getParameter('title')))}">

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/revisions.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/revisions.jx?view=diff&r1=156414&r2=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/revisions.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/revisions.jx Mon Mar  7 03:09:53 2005
@@ -23,72 +23,7 @@
            xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
 
   <div>
-    <table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          <a href="?lenya.usecase=tab.overview" class="lenya-tablink">
-            <i18n:text>Overview</i18n:text>
-          </a>
-        </td>
-        <jx:if test="${usecase.getParameter('languageexists').equals('true')}">
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
-            <td>
-              <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
-                <i18n:text>Meta</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
-                <i18n:text>Assets</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
-                <i18n:text>Workflow</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.revisions" class="lenya-tablink-active">
-                <i18n:text>Versions</i18n:text>
-              </a>
-            </td>
-          </jx:if>
-          <jx:choose>
-            <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-              <td>
-                <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
-                  <i18n:text>AC Auth</i18n:text>
-                </a>
-              </td>
-              <td>
-                <a href="?lenya.usecase=tab.acLive" class="lenya-tablink">
-                  <i18n:text>AC Live</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('archive')}">
-              <td>
-                <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink">
-                  <i18n:text>AC Archive</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('trash')}">
-              <td>
-                <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink">
-                  <i18n:text>AC Trash</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-          </jx:choose>
-          <td>
-            <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
-              <i18n:text>Scheduler</i18n:text>
-            </a>
-          </td>
-        </jx:if>
-      </tr>
-    </table>
+    <jx:import uri="tab/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <table class="lenya-table-noborder">
       <jx:forEach var="item" items="${usecase.getParameter('entries')}" end="0">

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx?view=diff&r1=156414&r2=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx Mon Mar  7 03:09:53 2005
@@ -22,72 +22,7 @@
            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>
-        <td>
-          <a href="?lenya.usecase=tab.overview" class="lenya-tablink">
-            <i18n:text>Overview</i18n:text>
-          </a>
-        </td>
-        <jx:if test="${usecase.getParameter('languageexists').equals('true')}">
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
-            <td>
-              <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
-                <i18n:text>Meta</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
-                <i18n:text>Assets</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
-                <i18n:text>Workflow</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
-                <i18n:text>Versions</i18n:text>
-              </a>
-            </td>
-          </jx:if>
-          <jx:choose>
-            <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-              <td>
-                <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
-                  <i18n:text>AC Auth</i18n:text>
-                </a>
-              </td>
-              <td>
-                <a href="?lenya.usecase=tab.acLive" class="lenya-tablink">
-                  <i18n:text>AC Live</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('archive')}">
-              <td>
-                <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink">
-                  <i18n:text>AC Archive</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('trash')}">
-              <td>
-                <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink">
-                  <i18n:text>AC Trash</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-          </jx:choose>
-          <td>
-            <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink-active">
-              <i18n:text>Scheduler</i18n:text>
-            </a>
-          </td>
-        </jx:if>
-      </tr>
-    </table>
+    <jx:import uri="tab/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <!-- TODO xinclude schedule output for this document here -->
     </div>

Added: lenya/trunk/src/webapp/lenya/usecases/tab/tabs.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/tabs.jx?view=auto&rev=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/tabs.jx (added)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/tabs.jx Mon Mar  7 03:09:53 2005
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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: overview.jx 123960 2005-01-03 12:39:05Z andreas $ -->
+
+<jx:template
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns="http://www.w3.org/1999/xhtml"
+  name="">
+  
+    <!-- 
+		These are the tabs. Make sure that each of them has the correct id,
+		target and corresponding number in the Tab() call.
+	 -->
+    <table border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td>
+          <jx:choose>
+            <jx:when test="${request.getParameter('lenya.usecase').equals('tab.overview')}">
+              <a href="?lenya.usecase=tab.overview" class="lenya-tablink-active"><i18n:text>Overview</i18n:text></a>
+            </jx:when>
+            <jx:otherwise>
+              <a href="?lenya.usecase=tab.overview" class="lenya-tablink"><i18n:text>Overview</i18n:text></a>
+            </jx:otherwise>
+          </jx:choose>
+        </td>
+        <jx:if test="${usecase.getParameter('document').exists()}">
+          <td>
+            <jx:choose>
+              <jx:when test="${request.getParameter('lenya.usecase').equals('tab.meta')}">
+                <a href="?lenya.usecase=tab.meta" class="lenya-tablink-active"><i18n:text>Meta</i18n:text></a>
+              </jx:when>
+              <jx:otherwise>
+                <a href="?lenya.usecase=tab.meta" class="lenya-tablink"><i18n:text>Meta</i18n:text></a>
+              </jx:otherwise>
+            </jx:choose>
+          </td>
+          <td>
+            <jx:choose>
+              <jx:when test="${request.getParameter('lenya.usecase').equals('tab.assets')}">
+                <a href="?lenya.usecase=tab.assets" class="lenya-tablink-active"><i18n:text>Assets</i18n:text></a>
+              </jx:when>
+              <jx:otherwise>
+                <a href="?lenya.usecase=tab.assets" class="lenya-tablink"><i18n:text>Assets</i18n:text></a>
+              </jx:otherwise>
+            </jx:choose>
+          </td>
+          <td>
+            <jx:choose>
+              <jx:when test="${request.getParameter('lenya.usecase').equals('tab.workflow')}">
+                <a href="?lenya.usecase=tab.workflow" class="lenya-tablink"><i18n:text>Workflow</i18n:text></a>
+              </jx:when>
+              <jx:otherwise>
+              </jx:otherwise>
+            </jx:choose>
+          </td>
+          <td>
+            <jx:choose>
+              <jx:when test="${request.getParameter('lenya.usecase').equals('tab.revisions')}">
+                <a href="?lenya.usecase=tab.revisions" class="lenya-tablink-active"><i18n:text>Versions</i18n:text></a>
+              </jx:when>
+              <jx:otherwise>
+                <a href="?lenya.usecase=tab.revisions" class="lenya-tablink"><i18n:text>Versions</i18n:text></a>
+              </jx:otherwise>
+            </jx:choose>
+          </td>
+          <jx:choose>
+            <jx:when test="${usecase.getParameter('document').getArea().equals('authoring')}">
+              <td>
+                <jx:choose>
+                  <jx:when test="${request.getParameter('lenya.usecase').equals('tab.acAuthoring')}">
+                    <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink-active"><i18n:text>AC Auth</i18n:text></a>
+                  </jx:when>
+                  <jx:otherwise>
+                    <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink"><i18n:text>AC Auth</i18n:text></a>
+                  </jx:otherwise>
+                </jx:choose>
+              </td>
+              <td>
+                <jx:choose>
+                  <jx:when test="${request.getParameter('lenya.usecase').equals('tab.acLive')}">
+                    <a href="?lenya.usecase=tab.acLive" class="lenya-tablink-active"><i18n:text>AC Live</i18n:text></a>
+                  </jx:when>
+                  <jx:otherwise>
+                    <a href="?lenya.usecase=tab.acLive" class="lenya-tablink"><i18n:text>AC Live</i18n:text></a>
+                  </jx:otherwise>
+                </jx:choose>
+              </td>
+            </jx:when>
+            <jx:when test="${usecase.getParameter('document').getArea().equals('archive')}">
+              <td>
+                <jx:choose>
+                  <jx:when test="${request.getParameter('lenya.usecase').equals('tab.acArchive')}">
+                    <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink-active"><i18n:text>AC Archive</i18n:text></a>
+                  </jx:when>
+                  <jx:otherwise>
+                    <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink"><i18n:text>AC Archive</i18n:text></a>
+                  </jx:otherwise>
+                </jx:choose>
+              </td>
+            </jx:when>
+            <jx:when test="${usecase.getParameter('document').getArea().equals('trash')}">
+              <td>
+                <jx:choose>
+                  <jx:when test="${request.getParameter('lenya.usecase').equals('tab.acTrash')}">
+                    <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink-active"><i18n:text>AC Trash</i18n:text></a>
+                  </jx:when>
+                  <jx:otherwise>
+                    <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink"><i18n:text>AC Trash</i18n:text></a>
+                  </jx:otherwise>
+                </jx:choose>
+              </td>
+            </jx:when>
+          </jx:choose>
+          <td>
+            <jx:choose>
+              <jx:when test="${request.getParameter('lenya.usecase').equals('tab.scheduler')}">
+                <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink-active"><i18n:text>Scheduler</i18n:text></a>
+              </jx:when>
+              <jx:otherwise>
+                <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink"><i18n:text>Scheduler</i18n:text></a>
+              </jx:otherwise>
+            </jx:choose>
+          </td>
+        </jx:if>
+      </tr>
+    </table>
+</jx:template>
\ No newline at end of file

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx?view=diff&r1=156414&r2=156415
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx Mon Mar  7 03:09:53 2005
@@ -22,70 +22,7 @@
            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>
-        <td>
-          <a href="?lenya.usecase=tab.overview" class="lenya-tablink">
-            <i18n:text>Overview</i18n:text>
-          </a>
-        </td>
-          <jx:if test="${not(usecase.getParameter('documentid').equals('/'))}">
-            <td>
-              <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
-                <i18n:text>Meta</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
-                <i18n:text>Assets</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.workflow" class="lenya-tablink-active">
-                <i18n:text>Workflow</i18n:text>
-              </a>
-            </td>
-            <td>
-              <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
-                <i18n:text>Versions</i18n:text>
-              </a>
-            </td>
-          </jx:if>
-          <jx:choose>
-            <jx:when test="${usecase.getParameter('area').equals('authoring')}">
-              <td>
-                <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
-                  <i18n:text>AC Auth</i18n:text>
-                </a>
-              </td>
-              <td>
-                <a href="?lenya.usecase=tab.acLive" class="lenya-tablink">
-                  <i18n:text>AC Live</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('archive')}">
-              <td>
-                <a href="?lenya.usecase=tab.acArchive" class="lenya-tablink">
-                  <i18n:text>AC Archive</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-            <jx:when test="${usecase.getParameter('area').equals('trash')}">
-              <td>
-                <a href="?lenya.usecase=tab.acTrash" class="lenya-tablink">
-                  <i18n:text>AC Trash</i18n:text>
-                </a>
-              </td>
-            </jx:when>
-          </jx:choose>
-          <td>
-            <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
-              <i18n:text>Scheduler</i18n:text>
-            </a>
-          </td>
-      </tr>
-    </table>
+    <jx:import uri="tab/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h2><i18n:text>Variables</i18n:text></h2>
       <table class="lenya-table">



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