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/02/04 06:02:11 UTC
svn commit: r151322 - in lenya/trunk/src/webapp/lenya/pubs:
blog/config/menus/archive.xsp default/config/menus/generic.xsp
default/config/menus/links.xsp
Author: gregor
Date: Thu Feb 3 21:02:09 2005
New Revision: 151322
URL: http://svn.apache.org/viewcvs?view=rev&rev=151322
Log:
Removed label attribute from menu (no longer needed)
Modified:
lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.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/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=151321&r2=151322
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/archive.xsp Thu Feb 3 21:02:09 2005
@@ -44,7 +44,7 @@
<menus>
<menu i18n:attr="name" name="File">
<block>
- <item uc:usecase="ac.logout"><i18n:text>Logout</i18n:text></item>
+ <item uc:usecase="ac.logout" href="?"><i18n:text>Logout</i18n:text></item>
</block>
</menu>
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=151321&r2=151322
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp Thu Feb 3 21:02:09 2005
@@ -34,7 +34,7 @@
</xsp:structure>
<menu>
-
+
<xsp:logic>
String projectid = parameters.getParameter("projectid","null");
@@ -69,9 +69,7 @@
</xsp:logic>
<menus>
- <menu i18n:attr="name" name="File" label="File">
- <block>
- <menu name="New">
+ <menu i18n:attr="name" name="File">
<block>
<xsp:logic>
@@ -86,8 +84,6 @@
}
}
</xsp:logic>
- </block>
- </menu>
</block>
<block>
<xsp:logic>
@@ -133,17 +129,13 @@
</block>
</menu>
- <menu i18n:attr="name" name="Edit" label="Search">
+ <menu i18n:attr="name" name="Edit">
<block info="false">
- <menu name="Edit Body">
- <block>
- <item wf:event="edit" uc:usecase="kupu" uc:step="open" href="?"><i18n:text>With Kupu</i18n:text></item>
- <item wf:event="edit" uc:usecase="bxe" uc:step="open" href="?"><i18n:text>With BXE</i18n:text></item>
- <item wf:event="edit" uc:usecase="edit" uc:step="open"><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="1formedit" uc:step="open" href="?"><i18n:text>With one Form</i18n:text></item>
- </block>
- </menu>
+ <item wf:event="edit" uc:usecase="kupu" uc:step="open" href="?"><i18n:text>With Kupu</i18n:text></item>
+ <item wf:event="edit" uc:usecase="bxe" uc:step="open" href="?"><i18n:text>With BXE</i18n:text></item>
+ <item wf:event="edit" uc:usecase="edit" uc:step="open"><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="1formedit" uc:step="open" href="?"><i18n:text>With one Form</i18n:text></item>
</block>
<block info="false">
<item wf:event="edit" uc:usecase="info-meta" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-context-path/>/<input:get-attribute module="page-envelope" as="string" name="publication-id"/>/info-<input:get-attribute module="page-envelope" as="string" name="area"/><input:get-attribute module="page-envelope" as="string" name="document-url"/>?</xsp:attribute><i18n:text>Edit Metadata</i18n:text></item>
@@ -254,7 +246,7 @@
</menu>
- <menu i18n:attr="name" name="Workflow" label="Help">
+ <menu i18n:attr="name" name="Workflow">
<xsp:logic>
{
if (isDocument && Publication.AUTHORING_AREA.equals(area)) {
@@ -281,10 +273,10 @@
</xsp:logic>
</menu>
- <menu i18n:attr="name" name="Help" label="Debug">
+ <menu i18n:attr="name" name="Help">
<block>
- <item><xsp:attribute name="href">http://lenya.apache.org/docs/index.html</xsp:attribute><i18n:text>Documentation</i18n:text></item>
- <item href="http://wiki.apache.org/lenya/"><i18n:text>Wiki</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>
<block>
<item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute><i18n:text>Apache Lenya Homepage</i18n:text></item>
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=151321&r2=151322
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/menus/links.xsp Thu Feb 3 21:02:09 2005
@@ -69,37 +69,34 @@
</xsp:logic>
<menus>
- <menu i18n:attr="name" name="File" label="File">
+ <menu i18n:attr="name" name="File">
<block>
<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">
<block info="false">
- <!-- XSLT not finished yet -->
- <!--<item uc:usecase="edit" uc:step="open"><xsp:attribute name="href"><xsp:expr>"?form=" + docType</xsp:expr></xsp:attribute><i18n:text>Edit with Forms</i18n:text></item>-->
<item uc:usecase="1formedit" uc:step="open" href="?"><i18n:text>Edit with one Form</i18n:text></item>
</block>
</menu>
- <menu i18n:attr="name" name="Workflow" label="Help">
+ <menu i18n:attr="name" name="Workflow">
</menu>
- <menu i18n:attr="name" name="Help" label="Debug">
- <block>
- <item><xsp:attribute name="href">http://lenya.apache.org/docs/index.html</xsp:attribute><i18n:text>Documentation</i18n:text></item>
- <item href="http://wiki.apache.org/lenya/"><i18n:text>Wiki</i18n:text></item>
- </block>
- <block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute><i18n:text>Apache Lenya Homepage</i18n:text></item>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute><i18n:text>About Apache Lenya</i18n:text></item>
- </block>
-
+ <menu i18n:attr="name" name="Help">
+ <block>
+ <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>
+ <block>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute><i18n:text>Apache Lenya Homepage</i18n:text></item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute><i18n:text>About Apache Lenya</i18n:text></item>
+ </block>
<block>
<item uc:usecase="view-logs" uc:step="overview" href="?"><i18n:text>View Task Logs</i18n:text></item>
- </block>
+ </block>
</menu>
</menus>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org