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 2005/03/01 00:52:19 UTC
svn commit: r155717 - in lenya/trunk/src/webapp/lenya:
content/menus/admin.xsp content/menus/info.xsp content/menus/live.xsp
pubs/blog/config/menus/archive.xsp pubs/blog/config/menus/entry.xsp
pubs/blog/config/menus/feed.xsp pubs/default/config/menus/generic.xsp
pubs/default/config/menus/links.xsp
Author: gregor
Date: Mon Feb 28 15:52:16 2005
New Revision: 155717
URL: http://svn.apache.org/viewcvs?view=rev&rev=155717
Log:
Removed obsolete code from menus
Removed:
lenya/trunk/src/webapp/lenya/content/menus/info.xsp
Modified:
lenya/trunk/src/webapp/lenya/content/menus/admin.xsp
lenya/trunk/src/webapp/lenya/content/menus/live.xsp
lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp
Modified: lenya/trunk/src/webapp/lenya/content/menus/admin.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/content/menus/admin.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/menus/admin.xsp (original)
+++ lenya/trunk/src/webapp/lenya/content/menus/admin.xsp Mon Feb 28 15:52:16 2005
@@ -21,35 +21,26 @@
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:xsp-request="http://apache.org/xsp/request/2.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
+ xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
>
-<xsp:structure>
- <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
-</xsp:structure>
-
<menu>
- <xsp:logic>
- String projectid = parameters.getParameter("projectid","null");
- </xsp:logic>
-
<menus>
- <menu i18n:attr="name" name="File" label="File">
+ <menu i18n:attr="name" name="File">
<block>
- <item href="?lenya.usecase=ac.logout"><i18n:text>Logout</i18n:text></item>
+ <item uc:usecase="ac.logout" href="?"><i18n:text>Logout</i18n:text></item>
</block>
</menu>
- <menu i18n:attr="name" name="Edit" label="Search">
+ <menu i18n:attr="name" name="Edit">
</menu>
- <menu i18n:attr="name" name="Workflow" label="Help">
+ <menu i18n:attr="name" name="Workflow">
</menu>
- <menu i18n:attr="name" name="Debug" label="Debug">
+ <menu i18n:attr="name" name="Debug">
</menu>
</menus>
Modified: lenya/trunk/src/webapp/lenya/content/menus/live.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/content/menus/live.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/menus/live.xsp (original)
+++ lenya/trunk/src/webapp/lenya/content/menus/live.xsp Mon Feb 28 15:52:16 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: live.xsp,v 1.8 2004/03/13 12:31:34 gregor Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -23,16 +23,6 @@
>
<menu>
-
- <!-- Import Lenya Page Envelope -->
- <url-info>
- <context-prefix></context-prefix>
- <publication-id></publication-id>
- <area></area>
- <document-id></document-id>
- <servlet-context-path></servlet-context-path>
- <publication></publication>
- </url-info>
</menu>
Modified: lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp Mon Feb 28 15:52:16 2005
@@ -29,14 +29,6 @@
<menu>
- <url-info>
- <context-prefix><xsp-request:get-context-path/></context-prefix>
- <publication-id><input:get-attribute module="page-envelope" as="string" name="publication-id"/></publication-id>
- <area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
- <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
- <document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
- </url-info>
-
<tabs>
<tab label="info" show="false"/>
</tabs>
Modified: lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp Mon Feb 28 15:52:16 2005
@@ -30,14 +30,6 @@
<menu>
- <url-info>
- <context-prefix><xsp-request:get-context-path/></context-prefix>
- <publication-id><input:get-attribute module="page-envelope" as="string" name="publication-id"/></publication-id>
- <area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
- <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
- <document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
- </url-info>
-
<xsp:logic>
String source = <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
source = source.substring(1); // Remove leading slash
Modified: lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp Mon Feb 28 15:52:16 2005
@@ -29,15 +29,7 @@
>
<menu>
-
- <url-info>
- <context-prefix><xsp-request:get-context-path/></context-prefix>
- <publication-id><input:get-attribute module="page-envelope" as="string" name="publication-id"/></publication-id>
- <area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
- <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
- <document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
- </url-info>
-
+
<tabs>
<tab label="info" show="false"/>
</tabs>
Modified: lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp Mon Feb 28 15:52:16 2005
@@ -36,8 +36,6 @@
<menu>
<xsp:logic>
- String projectid = parameters.getParameter("projectid","null");
-
String documentId = <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/authoring" + <input:get-attribute module="page-envelope" as="string" name="document-id"/> + "_" + <input:get-attribute module="page-envelope" as="string" name="document-language"/>;
String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
Modified: lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp?view=diff&r1=155716&r2=155717
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp Mon Feb 28 15:52:16 2005
@@ -36,8 +36,6 @@
<menu>
<xsp:logic>
- String projectid = parameters.getParameter("projectid","null");
-
String xmlSource = <input:get-attribute module="page-envelope" as="string" name="document-path"/>;
String documentId = <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/authoring" + <input:get-attribute module="page-envelope" as="string" name="document-id"/> + "_" + <input:get-attribute module="page-envelope" as="string" name="document-language"/>;
String urisParameter = "uris=" + <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/live" + <input:get-attribute module="page-envelope" as="string" name="document-url"/>;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org