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 2008/02/06 22:52:13 UTC
svn commit: r619168 - in /lenya/trunk/src:
pubs/default/config/menus/generic.xsp pubs/default/config/menus/menu.xml
pubs/default/menus.xmap webapp/lenya/content/menus/emptyMenu.xml
webapp/lenya/content/menus/live.xml
Author: andreas
Date: Wed Feb 6 13:52:10 2008
New Revision: 619168
URL: http://svn.apache.org/viewvc?rev=619168&view=rev
Log:
Changing default pub menu from XSP to plain XML.
Added:
lenya/trunk/src/pubs/default/config/menus/menu.xml
- copied, changed from r619159, lenya/trunk/src/pubs/default/config/menus/generic.xsp
lenya/trunk/src/webapp/lenya/content/menus/emptyMenu.xml
- copied unchanged from r619059, lenya/trunk/src/webapp/lenya/content/menus/live.xml
Removed:
lenya/trunk/src/pubs/default/config/menus/generic.xsp
lenya/trunk/src/webapp/lenya/content/menus/live.xml
Modified:
lenya/trunk/src/pubs/default/menus.xmap
Copied: lenya/trunk/src/pubs/default/config/menus/menu.xml (from r619159, lenya/trunk/src/pubs/default/config/menus/generic.xsp)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/menus/menu.xml?p2=lenya/trunk/src/pubs/default/config/menus/menu.xml&p1=lenya/trunk/src/pubs/default/config/menus/generic.xsp&r1=619159&r2=619168&rev=619168&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/config/menus/generic.xsp (original)
+++ lenya/trunk/src/pubs/default/config/menus/menu.xml Wed Feb 6 13:52:10 2008
@@ -6,9 +6,9 @@
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
-
+
+ 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.
@@ -18,87 +18,43 @@
<!-- $Id: generic.xsp 155806 2005-03-01 17:55:42Z andreas $ -->
-<xsp:page
- language="java"
- xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request/2.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
- xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
->
-
- <xsp:structure>
- <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
- <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
- </xsp:structure>
+<menu xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+ xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
+ xmlns="http://apache.org/cocoon/lenya/menubar/1.0">
- <menu>
-
- <xsp:logic>
- 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-uuid"/> + "_" + <input:get-attribute module="page-envelope" as="string" name="document-language"/>;
- String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
+ <menus>
+ <menu i18n:attr="name" name="File">
+ <block areas="authoring site">
+ <item uc:usecase="sitemanagement.createLanguage" href="?"><i18n:text>New Language Version</i18n:text></item>
+ <item uc:usecase="sitemanagement.deleteLanguage" href="?"><i18n:text>Remove Language Version</i18n:text></item>
+ </block>
+ <block areas="authoring">
+ <item uc:usecase="sitemanagement.forceCheckIn" href="?"><i18n:text>force-checkin</i18n:text></item>
+ </block>
+ <block areas="authoring site admin">
+ <item uc:usecase="admin.changePassword" href="?"><i18n:text>Change Password</i18n:text></item>
+ <item uc:usecase="ac.logout" href="?"><i18n:text>Logout</i18n:text></item>
+ </block>
+ </menu>
+
+ <menu i18n:attr="name" name="Edit">
- Object documentObject = <input:get-attribute as="object" module="page-envelope" name="document"/>;
- Document document = null;
- String visible = null;
- if (documentObject != null && !"".equals(documentObject)) {
- document = (Document) documentObject;
-
- visible = <input:get-attribute module="doc-info" as="string">
- <input:param name="name"><xsp:expr>document.getPublication().getId() + ":" + document.getArea() + ":" + document.getUUID() + ":" + document.getLanguage() + ":visibleInNav"</xsp:expr></input:param>
- </input:get-attribute>;
- }
-
- boolean isDocument = false;
- try {
- if (document != null && document.exists()) {
- isDocument = true;
- }
- }
- catch (Exception e) {
- throw new ProcessingException(e);
- }
+ <block areas="authoring">
+ <item uc:usecase="tab.meta" href="?"><i18n:text>Edit Metadata</i18n:text></item>
+ <item uc:usecase="sitemanagement.changeLabel" href="?"><i18n:text>Edit Navigation Title</i18n:text></item>
+ </block>
+ <block areas="site">
+ <item uc:usecase="sitemanagement.cut" href="?"><i18n:text>Cut</i18n:text></item>
+ <item uc:usecase="sitemanagement.copy" href="?"><i18n:text>Copy</i18n:text></item>
+ <item uc:usecase="sitemanagement.paste" href="?"><i18n:text>Paste</i18n:text></item>
+ </block>
- </xsp:logic>
-
- <menus>
- <menu i18n:attr="name" name="File">
- <block areas="authoring site">
- <item uc:usecase="sitemanagement.createLanguage" href="?"><i18n:text>New Language Version</i18n:text></item>
- <item uc:usecase="sitemanagement.deleteLanguage" href="?"><i18n:text>Remove Language Version</i18n:text></item>
- </block>
- <block areas="authoring">
- <item uc:usecase="sitemanagement.forceCheckIn" href="?"><i18n:text>force-checkin</i18n:text></item>
- </block>
- <block areas="authoring site admin">
- <item uc:usecase="admin.changePassword" href="?"><i18n:text>Change Password</i18n:text></item>
- <item uc:usecase="ac.logout" href="?"><i18n:text>Logout</i18n:text></item>
- </block>
- </menu>
- <menu i18n:attr="name" name="Edit">
-
- <block areas="authoring">
- <item uc:usecase="tab.meta" href="?"><i18n:text>Edit Metadata</i18n:text></item>
- <item uc:usecase="sitemanagement.changeLabel" href="?"><i18n:text>Edit Navigation Title</i18n:text></item>
- </block>
-
- <block areas="site">
- <item uc:usecase="sitemanagement.cut" href="?"><i18n:text>Cut</i18n:text></item>
- <item uc:usecase="sitemanagement.copy" href="?"><i18n:text>Copy</i18n:text></item>
- <item uc:usecase="sitemanagement.paste" href="?"><i18n:text>Paste</i18n:text></item>
- </block>
-
-
<block areas="site">
<item uc:usecase="sitemanagement.changeNodeID" href="?"><i18n:text>Rename URL</i18n:text></item>
<item uc:usecase="sitemanagement.changeLabel" href="?"><i18n:text>Edit Navigation Title</i18n:text></item>
- <item uc:usecase="sitemanagement.changeVisibility" href="?">
- <xsp:attribute name="checked"><xsp:expr>visible</xsp:expr></xsp:attribute>
- <i18n:text>Visible in Navigation</i18n:text>
- </item>
+ <item uc:usecase="sitemanagement.changeVisibility" href="?"><i18n:text>Visible in Navigation</i18n:text></item>
</block>
<block areas="site">
<item uc:usecase="sitetree.nudge" href="?direction=up"><i18n:text>Move Up</i18n:text></item>
@@ -109,33 +65,32 @@
<item uc:usecase="sitemanagement.archive" href="?"><i18n:text>Archive</i18n:text></item>
<item uc:usecase="sitemanagement.restore" href="?"><i18n:text>Restore</i18n:text></item>
</block>
-
- </menu>
-
- <menu i18n:attr="name" name="Workflow">
- <block areas="authoring site">
- <item uc:usecase="workflow.submit" href="?"><i18n:text>workflow.submit</i18n:text></item>
- <item uc:usecase="workflow.reject" href="?"><i18n:text>workflow.reject</i18n:text></item>
- <item uc:usecase="workflow.publish" href="?"><i18n:text>workflow.publish</i18n:text></item>
- <item uc:usecase="workflow.deactivate" href="?"><i18n:text>workflow.deactivate</i18n:text></item>
- </block>
- <block areas="authoring site">
- <item uc:usecase="workflow.multiWorkflow" href="?"><i18n:text>workflow.multiWorkflow</i18n:text></item>
- </block>
- </menu>
-
- <menu i18n:attr="name" name="Help">
- <block areas="authoring site admin">
- <item uc:usecase="admin.aboutLenya" href="?"><i18n:text>About Apache Lenya</i18n:text></item>
- <item href="http://lenya.apache.org"><i18n:text>Apache Lenya Homepage</i18n:text></item>
- <item href="http://lenya.apache.org/docs/index.html"><i18n:text>Documentation</i18n:text></item>
- <item href="http://wiki.apache.org/lenya/"><i18n:text>Wiki</i18n:text></item>
- </block>
- </menu>
- <menu i18n:attr="name" name="Development">
- </menu>
- </menus>
+ </menu>
- </menu>
-</xsp:page>
+ <menu i18n:attr="name" name="Workflow">
+ <block areas="authoring site">
+ <item uc:usecase="workflow.submit" href="?"><i18n:text>workflow.submit</i18n:text></item>
+ <item uc:usecase="workflow.reject" href="?"><i18n:text>workflow.reject</i18n:text></item>
+ <item uc:usecase="workflow.publish" href="?"><i18n:text>workflow.publish</i18n:text></item>
+ <item uc:usecase="workflow.deactivate" href="?"><i18n:text>workflow.deactivate</i18n:text></item>
+ </block>
+ <block areas="authoring site">
+ <item uc:usecase="workflow.multiWorkflow" href="?"><i18n:text>workflow.multiWorkflow</i18n:text></item>
+ </block>
+ </menu>
+
+ <menu i18n:attr="name" name="Help">
+ <block areas="authoring site admin">
+ <item uc:usecase="admin.aboutLenya" href="?"><i18n:text>About Apache Lenya</i18n:text></item>
+ <item href="http://lenya.apache.org"><i18n:text>Apache Lenya Homepage</i18n:text></item>
+ <item href="http://lenya.apache.org/docs/index.html"><i18n:text>Documentation</i18n:text></item>
+ <item href="http://wiki.apache.org/lenya/"><i18n:text>Wiki</i18n:text></item>
+ </block>
+ </menu>
+
+ <menu i18n:attr="name" name="Development">
+ </menu>
+ </menus>
+
+</menu>
Modified: lenya/trunk/src/pubs/default/menus.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/menus.xmap?rev=619168&r1=619167&r2=619168&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/menus.xmap (original)
+++ lenya/trunk/src/pubs/default/menus.xmap Wed Feb 6 13:52:10 2008
@@ -25,13 +25,13 @@
<map:pipeline>
<map:match pattern="live/**">
- <map:generate type="serverpages" src="fallback://lenya/content/menus/live.xsp"/>
+ <map:generate src="fallback://lenya/content/menus/emptyMenu.xml"/>
<map:serialize type="xml"/>
</map:match>
<!-- all document types -->
<map:match pattern="**">
- <map:generate type="serverpages" src="fallback://config/menus/generic.xsp"/>
+ <map:generate src="fallback://config/menus/menu.xml"/>
<map:serialize type="xml"/>
</map:match>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org