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/07 00:04:11 UTC
svn commit: r619210 - in /lenya/trunk/src/modules: cforms/config/menu.xml
fckeditor/config/menu.xml links/config/menu.xml links/config/menu.xsp
news/config/menu.xml opendocument/config/menu.xml resource/config/menu.xml
xhtml/config/menu.xml
Author: andreas
Date: Wed Feb 6 15:04:09 2008
New Revision: 619210
URL: http://svn.apache.org/viewvc?rev=619210&view=rev
Log:
Remove obsolete href='?' attributes from module menu items.
Added:
lenya/trunk/src/modules/links/config/menu.xml
- copied, changed from r618794, lenya/trunk/src/modules/links/config/menu.xsp
Removed:
lenya/trunk/src/modules/links/config/menu.xsp
Modified:
lenya/trunk/src/modules/cforms/config/menu.xml
lenya/trunk/src/modules/fckeditor/config/menu.xml
lenya/trunk/src/modules/news/config/menu.xml
lenya/trunk/src/modules/opendocument/config/menu.xml
lenya/trunk/src/modules/resource/config/menu.xml
lenya/trunk/src/modules/xhtml/config/menu.xml
Modified: lenya/trunk/src/modules/cforms/config/menu.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/cforms/config/menu.xml?rev=619210&r1=619209&r2=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/cforms/config/menu.xml (original)
+++ lenya/trunk/src/modules/cforms/config/menu.xml Wed Feb 6 15:04:09 2008
@@ -34,10 +34,10 @@
<menu i18n:attr="name" name="Edit">
<block areas="authoring" resourceTypes="cforms">
- <item uc:usecase="cforms.edit" href="?"><i18n:text>With CForms</i18n:text></item>
+ <item uc:usecase="cforms.edit"><i18n:text>With CForms</i18n:text></item>
<!-- TODO: add RelaxNG schemas for cforms doctype.
<item wf:event="edit" uc:usecase="editors.forms"><xsp:attribute name="href"><xsp:expr>"?form=" + doctype</xsp:expr></xsp:attribute><i18n:text>With Forms</i18n:text></item>
- <item wf:event="edit" uc:usecase="editors.oneform" href="?"><i18n:text>With one Form</i18n:text></item>
+ <item wf:event="edit" uc:usecase="editors.oneform"><i18n:text>With one Form</i18n:text></item>
-->
</block>
</menu>
Modified: lenya/trunk/src/modules/fckeditor/config/menu.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/config/menu.xml?rev=619210&r1=619209&r2=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/fckeditor/config/menu.xml (original)
+++ lenya/trunk/src/modules/fckeditor/config/menu.xml Wed Feb 6 15:04:09 2008
@@ -22,7 +22,7 @@
<menus>
<menu i18n:attr="name" name="Edit">
<block info="false" resourceTypes="xhtml homepage">
- <item uc:usecase="fckeditor.edit" href="?"><i18n:text>With FCKEditor</i18n:text></item>
+ <item uc:usecase="fckeditor.edit"><i18n:text>With FCKEditor</i18n:text></item>
</block>
</menu>
</menus>
Copied: lenya/trunk/src/modules/links/config/menu.xml (from r618794, lenya/trunk/src/modules/links/config/menu.xsp)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/links/config/menu.xml?p2=lenya/trunk/src/modules/links/config/menu.xml&p1=lenya/trunk/src/modules/links/config/menu.xsp&r1=618794&r2=619210&rev=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/links/config/menu.xsp (original)
+++ lenya/trunk/src/modules/links/config/menu.xml Wed Feb 6 15:04:09 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,56 +18,28 @@
<!-- $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:wf="http://apache.org/cocoon/lenya/workflow/1.0"
- 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>
-
- <menus>
- <menu i18n:attr="name" name="File">
- <block areas="site authoring" id="create">
- <item uc:usecase="sitemanagement.create" href="?doctype=links">
- <i18n:translate>
- <i18n:text>New ... Document</i18n:text>
- <i18n:param><i18n:text>resourceType-links</i18n:text></i18n:param>
- </i18n:translate>
- </item>
- </block>
- </menu>
-
- <menu i18n:attr="name" name="Edit">
- <xsp:logic>
- try {
- Object doc = <input:get-attribute module="page-envelope" as="object" name="document"/>;
- if (doc instanceof Document && ((Document) doc).exists()) {
- String doctype = <input:get-attribute module="page-envelope" as="string" name="document-type"/>;
- if ("links".equals(doctype)) {
- <block areas="authoring">
- <item wf:event="edit" uc:usecase="editors.oneform" href="?"><i18n:text>With one Form</i18n:text></item>
- </block>
- }
- }
- }
- catch (Exception e) {
- throw new ProcessingException("Error during menu generation: ", e);
- }
- </xsp:logic>
- </menu>
-
- </menus>
+ <menus>
+ <menu i18n:attr="name" name="File">
+ <block areas="site authoring" id="create">
+ <item uc:usecase="sitemanagement.create" href="?doctype=links">
+ <i18n:translate>
+ <i18n:text>New ... Document</i18n:text>
+ <i18n:param><i18n:text>resourceType-links</i18n:text></i18n:param>
+ </i18n:translate>
+ </item>
+ </block>
+ </menu>
- </menu>
-</xsp:page>
+ <menu i18n:attr="name" name="Edit">
+ <block areas="authoring" resourceTypes="links">
+ <item uc:usecase="editors.oneform"><i18n:text>With one Form</i18n:text></item>
+ </block>
+ </menu>
+
+ </menus>
+
+</menu>
Modified: lenya/trunk/src/modules/news/config/menu.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/news/config/menu.xml?rev=619210&r1=619209&r2=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/news/config/menu.xml (original)
+++ lenya/trunk/src/modules/news/config/menu.xml Wed Feb 6 15:04:09 2008
@@ -34,7 +34,7 @@
<menu i18n:attr="name" name="Edit">
<block areas="authoring" resourceTypes="news">
- <item uc:usecase="news.edit" href="?"><i18n:text>news-settings</i18n:text></item>
+ <item uc:usecase="news.edit"><i18n:text>news-settings</i18n:text></item>
</block>
</menu>
Modified: lenya/trunk/src/modules/opendocument/config/menu.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/opendocument/config/menu.xml?rev=619210&r1=619209&r2=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/opendocument/config/menu.xml (original)
+++ lenya/trunk/src/modules/opendocument/config/menu.xml Wed Feb 6 15:04:09 2008
@@ -36,7 +36,7 @@
<menu i18n:attr="name" name="Edit">
<block areas="authoring" resourceTypes="opendocument">
<item href="?lenya.module=opendocument&download"><i18n:text>Download ODT</i18n:text></item>
- <item uc:usecase="opendocument.upload" href="?"><i18n:text>Upload ODT</i18n:text></item>
+ <item uc:usecase="opendocument.upload"><i18n:text>Upload ODT</i18n:text></item>
</block>
</menu>
</menus>
Modified: lenya/trunk/src/modules/resource/config/menu.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/config/menu.xml?rev=619210&r1=619209&r2=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/config/menu.xml (original)
+++ lenya/trunk/src/modules/resource/config/menu.xml Wed Feb 6 15:04:09 2008
@@ -32,7 +32,7 @@
</menu>
<menu i18n:attr="name" name="Edit">
<block areas="authoring" resourceTypes="resource">
- <item uc:usecase="resource.upload" href="?"><i18n:text>Upload File</i18n:text></item>
+ <item uc:usecase="resource.upload"><i18n:text>Upload File</i18n:text></item>
</block>
</menu>
</menus>
Modified: lenya/trunk/src/modules/xhtml/config/menu.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/config/menu.xml?rev=619210&r1=619209&r2=619210&view=diff
==============================================================================
--- lenya/trunk/src/modules/xhtml/config/menu.xml (original)
+++ lenya/trunk/src/modules/xhtml/config/menu.xml Wed Feb 6 15:04:09 2008
@@ -35,10 +35,10 @@
<menu i18n:attr="name" name="Edit">
<block areas="authoring" resourceTypes="xhtml">
- <item uc:usecase="kupu.edit" href="?"><i18n:text>With Kupu</i18n:text></item>
- <item uc:usecase="bxe.edit" href="?"><i18n:text>With BXE</i18n:text></item>
+ <item uc:usecase="kupu.edit"><i18n:text>With Kupu</i18n:text></item>
+ <item uc:usecase="bxe.edit"><i18n:text>With BXE</i18n:text></item>
<item uc:usecase="editors.forms" href="?form=xhtml"><i18n:text>With Forms</i18n:text></item>
- <item uc:usecase="editors.oneform" href="?"><i18n:text>With one Form</i18n:text></item>
+ <item uc:usecase="editors.oneform"><i18n:text>With one Form</i18n:text></item>
</block>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org