You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/12/29 14:19:14 UTC
svn commit: r123638 - in lenya/trunk/src/webapp: WEB-INF lenya lenya/usecases lenya/usecases/site lenya/usecases/tab
Author: gregor
Date: Wed Dec 29 05:19:13 2004
New Revision: 123638
URL: http://svn.apache.org/viewcvs?view=rev&rev=123638
Log:
Refactored site-area usecases that are displayed in a tab to have the naming convention tab.*
Added seperate view pipeline for those usecases, plus arbitration code in usecases.js
Added:
lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
- copied, changed from r123528, lenya/trunk/src/webapp/lenya/usecases/site/assets.jx
lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
- copied, changed from r123421, lenya/trunk/src/webapp/lenya/usecases/site/meta.jx
lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx
- copied, changed from r123421, lenya/trunk/src/webapp/lenya/usecases/site/overview.jx
lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx
- copied, changed from r123421, lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx
lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx
- copied, changed from r123421, lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx
Removed:
lenya/trunk/src/webapp/lenya/usecases/site/assets.jx
lenya/trunk/src/webapp/lenya/usecases/site/meta.jx
lenya/trunk/src/webapp/lenya/usecases/site/overview.jx
lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx
lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx
Modified:
lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
lenya/trunk/src/webapp/lenya/usecase.xmap
lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
lenya/trunk/src/webapp/lenya/usecases/usecases.js
Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?view=diff&rev=123638&p1=lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl&r1=123637&p2=lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Wed Dec 29 05:19:13 2004
@@ -236,15 +236,15 @@
role="org.apache.lenya.cms.usecase.UnitOfWorkImpl"/>
<usecases>
+ <component-instance name="ac.login" logger="lenya.ac" class="org.apache.lenya.cms.ac.Login"/>
+ <component-instance name="ac.logout" logger="lenya.ac" class="org.apache.lenya.cms.ac.Logout"/>
<component-instance name="admin.addUser" logger="lenya.admin" class="org.apache.lenya.cms.admin.AddUser"/>
<component-instance name="admin.userProfile" logger="lenya.admin" class="org.apache.lenya.cms.admin.UserProfile"/>
<component-instance name="admin.changePassword" logger="lenya.admin" class="org.apache.lenya.cms.admin.UserPassword"/>
<component-instance name="admin.userGroups" logger="lenya.admin" class="org.apache.lenya.cms.admin.UserGroups"/>
- <component-instance name="ac.login" logger="lenya.ac" class="org.apache.lenya.cms.ac.Login"/>
- <component-instance name="ac.logout" logger="lenya.ac" class="org.apache.lenya.cms.ac.Logout"/>
- <component-instance name="site.meta" logger="lenya.site" class="org.apache.lenya.cms.metadata.Metadata"/>
- <component-instance name="site.assets" logger="lenya.site" class="org.apache.lenya.cms.site.Assets"/>
<component-instance name="authoring.create" logger="lenya.authoring" class="org.apache.lenya.cms.authoring.Create"/>
+ <component-instance name="tab.meta" logger="lenya.site" class="org.apache.lenya.cms.metadata.Metadata"/>
+ <component-instance name="tab.assets" logger="lenya.site" class="org.apache.lenya.cms.site.Assets"/>
</usecases>
Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecase.xmap?view=diff&rev=123638&p1=lenya/trunk/src/webapp/lenya/usecase.xmap&r1=123637&p2=lenya/trunk/src/webapp/lenya/usecase.xmap&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Wed Dec 29 05:19:13 2004
@@ -56,58 +56,58 @@
<map:match pattern="authoring.create" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.acArchive" type="usecase">
+ <map:match pattern="site.archive" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.acAuthoring" type="usecase">
+ <map:match pattern="site.copy" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.acLive" type="usecase">
+ <map:match pattern="site.cut" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.acTrash" type="usecase">
+ <map:match pattern="site.deactivate" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.archive" type="usecase">
+ <map:match pattern="site.delete" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.assets" type="usecase">
+ <map:match pattern="site.paste" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.copy" type="usecase">
+ <map:match pattern="site.renameLabel" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.cut" type="usecase">
+ <map:match pattern="site.renameURL" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.deactivate" type="usecase">
+ <map:match pattern="site.restore" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.delete" type="usecase">
+ <map:match pattern="tab.acArchive" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.meta" type="usecase">
+ <map:match pattern="tab.acAuthoring" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.overview" type="usecase">
+ <map:match pattern="tab.acLive" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.paste" type="usecase">
+ <map:match pattern="tab.acTrash" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.renameLabel" type="usecase">
+ <map:match pattern="tab.assets" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.renameURL" type="usecase">
+ <map:match pattern="tab.meta" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.restore" type="usecase">
+ <map:match pattern="tab.overview" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.scheduler" type="usecase">
+ <map:match pattern="tab.scheduler" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
- <map:match pattern="site.workflow" type="usecase">
+ <map:match pattern="tab.workflow" type="usecase">
<map:mount src="usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
<map:match pattern="workflow.publish" type="usecase">
Deleted: /lenya/trunk/src/webapp/lenya/usecases/site/assets.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/assets.jx?view=auto&rev=123637
==============================================================================
Deleted: /lenya/trunk/src/webapp/lenya/usecases/site/meta.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/meta.jx?view=auto&rev=123637
==============================================================================
Deleted: /lenya/trunk/src/webapp/lenya/usecases/site/overview.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/overview.jx?view=auto&rev=123637
==============================================================================
Deleted: /lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx?view=auto&rev=123637
==============================================================================
Deleted: /lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx?view=auto&rev=123637
==============================================================================
Copied: lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx (from r123528, lenya/trunk/src/webapp/lenya/usecases/site/assets.jx)
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx?view=diff&rev=123638&p1=lenya/trunk/src/webapp/lenya/usecases/site/assets.jx&r1=123528&p2=lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/site/assets.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx Wed Dec 29 05:19:13 2004
@@ -17,39 +17,38 @@
<!-- $Id$ -->
-<html xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+<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" >
- <head/>
- <body>
+
<div>
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
- <a href="?lenya.usecase=site.overview" class="lenya-tablink">
+ <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=site.meta" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
<i18n:text>Meta</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.assets" class="lenya-tablink-active">
+ <a href="?lenya.usecase=tab.assets" class="lenya-tablink-active">
<i18n:text>Assets</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.workflow" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
<i18n:text>Workflow</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.revisions" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
<i18n:text>Versions</i18n:text>
</a>
</td>
@@ -57,33 +56,33 @@
<jx:choose>
<jx:when test="${usecase.getParameter('area').equals('authoring')}">
<td>
- <a href="?lenya.usecase=site.acAuthoring" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
<i18n:text>AC Auth</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.acLive" class="lenya-tablink">
+ <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=site.acArchive" class="lenya-tablink">
+ <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=site.acTrash" class="lenya-tablink">
+ <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=site.scheduler" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
<i18n:text>Scheduler</i18n:text>
</a>
</td>
@@ -113,7 +112,7 @@
<td align="right"><jx:out value="${item.date}"/></td>
<td>
<form>
- <input type="hidden" name="lenya.usecase" value="site.asset"/>
+ <input type="hidden" name="lenya.usecase" value="tab.asset"/>
<input type="hidden" name="name" value="${item.source}"/>
<jx:choose>
<jx:when test="${usecase.getParameter('area').equals('authoring')}"><input i18n:attr="value" type="submit" value="Delete"/></jx:when>
@@ -126,7 +125,7 @@
</table>
<!-- <jx:if test="${usecase.getParameter('area').equals('authoring')}">
--> <form>
- <input type="hidden" name="lenya.usecase" value="site.asset"/>
+ <input type="hidden" name="lenya.usecase" value="tab.asset"/>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
<table class="lenya-table-noborder">
<tr>
@@ -172,5 +171,4 @@
<!-- </jx:if>
--> </div>
</div>
- </body>
-</html>
\ No newline at end of file
+</page:page>
\ No newline at end of file
Copied: lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx (from r123421, lenya/trunk/src/webapp/lenya/usecases/site/meta.jx)
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx?view=diff&rev=123638&p1=lenya/trunk/src/webapp/lenya/usecases/site/meta.jx&r1=123421&p2=lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/site/meta.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx Wed Dec 29 05:19:13 2004
@@ -25,29 +25,29 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
- <a href="?lenya.usecase=site.overview" class="lenya-tablink">
+ <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=site.meta" class="lenya-tablink-active">
+ <a href="?lenya.usecase=tab.meta" class="lenya-tablink-active">
<i18n:text>Meta</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.assets" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
<i18n:text>Assets</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.workflow" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
<i18n:text>Workflow</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.revisions" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
<i18n:text>Versions</i18n:text>
</a>
</td>
@@ -55,33 +55,33 @@
<jx:choose>
<jx:when test="${usecase.getParameter('area').equals('authoring')}">
<td>
- <a href="?lenya.usecase=site.acAuthoring" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
<i18n:text>AC Auth</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.acLive" class="lenya-tablink">
+ <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=site.acArchive" class="lenya-tablink">
+ <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=site.acTrash" class="lenya-tablink">
+ <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.usecasesite.scheduler" class="lenya-tablink">
+ <a href="?lenya.usecasetab.scheduler" class="lenya-tablink">
<i18n:text>Scheduler</i18n:text>
</a>
</td>
@@ -171,7 +171,7 @@
</td>
</tr>
</table>
- <input type="hidden" name="lenya.usecase" value="site.meta"/>
+ <input type="hidden" name="lenya.usecase" value="tab.meta"/>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
</form>
</div>
Copied: lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx (from r123421, lenya/trunk/src/webapp/lenya/usecases/site/overview.jx)
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx?view=diff&rev=123638&p1=lenya/trunk/src/webapp/lenya/usecases/site/overview.jx&r1=123421&p2=lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/site/overview.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/overview.jx Wed Dec 29 05:19:13 2004
@@ -29,29 +29,29 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
- <a href="?lenya.usecase=site.overview" class="lenya-tablink-active">
+ <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=site.meta" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
<i18n:text>Meta</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.assets" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
<i18n:text>Assets</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.workflow" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
<i18n:text>Workflow</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.revisions" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
<i18n:text>Versions</i18n:text>
</a>
</td>
@@ -59,33 +59,33 @@
<jx:choose>
<jx:when test="${usecase.getParameter('area').equals('authoring')}">
<td>
- <a href="?lenya.usecase=site.acAuthoring" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
<i18n:text>AC Auth</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.acLive" class="lenya-tablink">
+ <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=site.acArchive" class="lenya-tablink">
+ <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=site.acTrash" class="lenya-tablink">
+ <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=site.scheduler" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
<i18n:text>Scheduler</i18n:text>
</a>
</td>
Copied: lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx (from r123421, lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx)
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx?view=diff&rev=123638&p1=lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx&r1=123421&p2=lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/site/scheduler.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/scheduler.jx Wed Dec 29 05:19:13 2004
@@ -25,29 +25,29 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
- <a href="?lenya.usecase=site.overview" class="lenya-tablink">
+ <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=site.meta" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
<i18n:text>Meta</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.assets" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
<i18n:text>Assets</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.workflow" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.workflow" class="lenya-tablink">
<i18n:text>Workflow</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.revisions" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
<i18n:text>Versions</i18n:text>
</a>
</td>
@@ -55,33 +55,33 @@
<jx:choose>
<jx:when test="${usecase.getParameter('area').equals('authoring')}">
<td>
- <a href="?lenya.usecase=site.acAuthoring" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
<i18n:text>AC Auth</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.acLive" class="lenya-tablink">
+ <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=site.acArchive" class="lenya-tablink">
+ <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=site.acTrash" class="lenya-tablink">
+ <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=site.scheduler" class="lenya-tablink-active">
+ <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink-active">
<i18n:text>Scheduler</i18n:text>
</a>
</td>
Copied: lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx (from r123421, lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx)
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx?view=diff&rev=123638&p1=lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx&r1=123421&p2=lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/site/workflow.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/workflow.jx Wed Dec 29 05:19:13 2004
@@ -25,29 +25,29 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
- <a href="?lenya.usecase=site.overview" class="lenya-tablink">
+ <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=site.meta" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.meta" class="lenya-tablink">
<i18n:text>Meta</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.assets" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.assets" class="lenya-tablink">
<i18n:text>Assets</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.workflow" class="lenya-tablink-active">
+ <a href="?lenya.usecase=tab.workflow" class="lenya-tablink-active">
<i18n:text>Workflow</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.revisions" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.revisions" class="lenya-tablink">
<i18n:text>Versions</i18n:text>
</a>
</td>
@@ -55,33 +55,33 @@
<jx:choose>
<jx:when test="${usecase.getParameter('area').equals('authoring')}">
<td>
- <a href="?lenya.usecase=site.acAuthoring" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.acAuthoring" class="lenya-tablink">
<i18n:text>AC Auth</i18n:text>
</a>
</td>
<td>
- <a href="?lenya.usecase=site.acLive" class="lenya-tablink">
+ <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=site.acArchive" class="lenya-tablink">
+ <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=site.acTrash" class="lenya-tablink">
+ <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=site.scheduler" class="lenya-tablink">
+ <a href="?lenya.usecase=tab.scheduler" class="lenya-tablink">
<i18n:text>Scheduler</i18n:text>
</a>
</td>
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=123638&p1=lenya/trunk/src/webapp/lenya/usecases/usecase.xmap&r1=123637&p2=lenya/trunk/src/webapp/lenya/usecases/usecase.xmap&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecase.xmap Wed Dec 29 05:19:13 2004
@@ -19,6 +19,7 @@
<map:serialize/>
</map:match>
+ <!-- view for usecases that take up the full screen -->
<map:match pattern="view/**">
<map:generate type="jx" src="{1}.jx"/>
<map:transform type="i18n">
@@ -27,8 +28,32 @@
<map:transform src="cocoon://lenya-screen.xsl"/>
<map:serialize type="html"/>
</map:match>
- </map:pipeline>
+ <!-- view for usecases that are displayed in a tab in the site area -->
+ <!--TODO root.xsl does not expect the page:page element currently -->
+ <map:match pattern="view-tab/**">
+ <map:generate type="jx" src="{1}.jx"/>
+ <map:transform type="i18n">
+ <map:parameter name="locale" value="{request:locale}"/>
+ </map:transform>
+ <map:transform src="fallback://lenya/xslt/info/root.xsl" label="content">
+ <map:parameter name="infoarea" value="true"/>
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
+ <map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
+ <map:parameter name="area" value="{page-envelope:area}"/>
+ <map:parameter name="tab" value="{1}"/>
+ <map:parameter name="chosenlanguage" value="{page-envelope:document-language}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documenturl" value="/{page-envelope:document-url}"/>
+ <map:parameter name="documentextension" value="{page-envelope:document-extension}"/>
+ <map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
+ <map:parameter name="languages" value="{page-envelope:publication-languages-csv}"/>
+ </map:transform>
+ <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/info/default.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
+
<map:pipeline>
<map:match type="request-parameter" pattern="lenya.continuation">
<map:call continuation="{1}"/>
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=123638&p1=lenya/trunk/src/webapp/lenya/usecases/usecases.js&r1=123637&p2=lenya/trunk/src/webapp/lenya/usecases/usecases.js&r2=123638
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecases.js (original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecases.js Wed Dec 29 05:19:13 2004
@@ -38,6 +38,20 @@
}
}
+/* Helper method to choose the appropriate view pipeline. The usecases displayed in a tab in the site
+ area need a more complex view, so they have their own pipeline. */
+function selectView(usecaseName) {
+ var usecaseView = new Packages.java.lang.String(usecaseName).replace('.', '/');
+ var isTabUsecase = new Packages.java.lang.String(usecaseName).startsWith('tab');
+ if (isTabUsecase) {
+ var view = "view-tab/" + usecaseView;
+ } else {
+ var view = "view/" + usecaseView;
+ }
+
+ return view;
+}
+
function executeUsecase() {
var usecaseName = cocoon.request.getParameter("lenya.usecase");
var usecaseResolver = cocoon.getComponent("org.apache.lenya.cms.usecase.UsecaseResolver");
@@ -50,14 +64,14 @@
passRequestParameters(flowHelper, usecase);
+ var view = selectView(usecaseName);
+
var ready = false;
var success = false;
-
- var usecaseView = new Packages.java.lang.String(usecaseName).replace('.', '/');
-
+
while (!ready) {
- cocoon.sendPageAndWait("view/" + usecaseView, {
+ cocoon.sendPageAndWait(view, {
"usecase" : usecase
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org