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 05:35:19 UTC
svn commit: r151316 - in
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus:
archive.xsp entry.xsp feed.xsp
Author: gregor
Date: Thu Feb 3 20:35:18 2005
New Revision: 151316
URL: http://svn.apache.org/viewcvs?view=rev&rev=151316
Log:
Updated the blog menus to use uc attributes and I18n. This resolves http://issues.apache.org/bugzilla/show_bug.cgi?id=27832
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp?view=diff&r1=151315&r2=151316
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp Thu Feb 3 20:35:18 2005
@@ -22,6 +22,7 @@
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
xmlns:xsp="http://apache.org/xsp"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
>
@@ -41,30 +42,30 @@
</tabs>
<menus>
- <menu name="File" label="File">
+ <menu i18n:attr="name" name="File" label="File">
<block>
- <item><xsp:attribute name="href">?lenya.usecase=logout</xsp:attribute>Logout</item>
+ <item uc:usecase="logout"><i18n:text>Logout</i18n:text></item>
</block>
</menu>
- <menu name="Search" label="Search">
+ <menu i18n:attr="name" name="Search" label="Search">
</menu>
- <menu name="Help" label="Help">
+ <menu i18n:attr="name" name="Help" label="Help">
<block>
- <item><xsp:attribute name="href">http://lenya.apache.org/docs/index.html</xsp:attribute>Documentation</item>
- <item href="http://wiki.apache.org/lenya/">Wiki Documentation</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>Apache Lenya Start Page</item>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About Apache Lenya</item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache Lenya Start Page</item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About Apache Lenya</item>
</block>
</menu>
- <menu name="Debug" label="Debug">
+ <menu i18n:attr="name" name="Debug" label="Debug">
<block>
- <item href="index.xml">Feed</item>
- <item href="lenya-page-body.xml">Body</item>
+ <item href="index.xml"><i18n:text>Feed</i18n:text></item>
+ <item href="lenya-page-body.xml"><i18n:text>Body</i18n:text></item>
</block>
</menu>
</menus>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp?view=diff&r1=151315&r2=151316
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp Thu Feb 3 20:35:18 2005
@@ -24,6 +24,7 @@
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
<menu>
@@ -48,51 +49,53 @@
</tabs>
<menus>
- <menu name="File" label="File">
+ <menu i18n:attr="name" name="File" label="File">
<block>
- <item uc:usecase="edit" href="?lenya.step=open&form=entry">Edit with Forms</item>
- <item href="index-bxeng.html">Edit with BXE</item>
- <item uc:usecase="1formedit" href="?lenya.step=open">Edit with one Form</item>
+ <item uc:usecase="edit" uc:step="open" href="?&form=entry">Edit with Forms</item>
+ <item href="index-bxe.html">Edit with BXE</item>
+ <item uc:usecase="1formedit" uc:step="open">Edit with one Form</item>
</block>
<block>
- <item uc:usecase="publish" uc:step="showscreen"><xsp:attribute name="href">?sources=<xsp:expr>source</xsp:expr>&uris=<xsp:expr>uri</xsp:expr>,feeds/all/index.html</xsp:attribute>Publish</item>
+ <item uc:usecase="publish" uc:step="showscreen"><xsp:attribute name="href">?sources=<xsp:expr>source</xsp:expr>&uris=<xsp:expr>uri</xsp:expr>,feeds/all/index.html</xsp:attribute><i18n:text>Publish</i18n:text></item>
</block>
+ <!--
<block>
<item uc:usecase="rollback" uc:step="showscreen" href="?">Revisions</item>
</block>
+ -->
<block>
- <item><xsp:attribute name="href">?lenya.usecase=logout</xsp:attribute>Logout</item>
+ <item uc:usecase="logout"><i18n:text>Logout</i18n:text></item>
</block>
</menu>
- <menu name="Search" label="Search">
+ <menu i18n:attr="name" name="Search" label="Search">
</menu>
- <menu name="Help" label="Help">
+ <menu i18n:attr="name" name="Help" label="Help">
<block>
- <item><xsp:attribute name="href">http://lenya.apache.org/docs/index.html</xsp:attribute>Documentation</item>
- <item href="http://wiki.apache.org/lenya">Wiki Documentation</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>Apache Lenya Start Page</item>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About Apache Lenya</item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache Lenya Start Page</item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About Apache Lenya</item>
</block>
</menu>
- <menu name="Debug" label="Debug">
+ <menu i18n:attr="name" name="Debug" label="Debug">
<block>
- <item href="index.xml">Feed</item>
- <item href="lenya-page-body.xml">Body</item>
+ <item href="index.xml"><i18n:text>Feed</i18n:text></item>
+ <item href="lenya-page-body.xml"><i18n:text>Body</i18n:text></item>
</block>
<block>
<item href="http://www.feedvalidator.org">Feed Validator</item>
</block>
<block>
- <item href="index-bxeng.html">HTML for BXE</item>
- <item href="config-bxeng.xml">Config for BXE</item>
- <item href="entry-bxeng.xsl">XSLT for BXE</item>
- <item href="entry-bxeng.css">CSS for BXE</item>
- <item href="entry-relaxng-bxeng.xml">RelaxNG for BXE</item>
+ <item href="index-bxe.html">HTML for BXE</item>
+ <item href="config-bxe.xml">Config for BXE</item>
+ <item href="entry-bxe.xsl">XSLT for BXE</item>
+ <item href="entry-bxe.css">CSS for BXE</item>
+ <item href="entry-relaxng-bxe.xml">RelaxNG for BXE</item>
</block>
</menu>
</menus>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp?view=diff&r1=151315&r2=151316
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp Thu Feb 3 20:35:18 2005
@@ -22,6 +22,7 @@
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
xmlns:xsp="http://apache.org/xsp"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
>
@@ -41,26 +42,26 @@
</tabs>
<menus>
- <menu name="File" label="File">
+ <menu i18n:attr="name" name="File" label="File">
<block>
<item uc:usecase="create" uc:step="showscreen" href="?doctype=entry">Add new Entry</item>
</block>
<block>
- <item uc:usecase="edit" href="../../sidebar.html?lenya.step=open&form=sidebar">Edit Sidebar with Forms</item>
- <item uc:usecase="publish" href="../../sidebar.html?sources=sidebar.xml&uris=feeds/all/index.html&lenya.step=showscreen">Publish Sidebar</item>
+ <item uc:usecase="edit" uc:step="open" href="../../sidebar.html?form=sidebar">Edit Sidebar with Forms</item>
+ <item uc:usecase="publish" uc:step="showscreen" href="../../sidebar.html?sources=sidebar.xml&uris=feeds/all/index.html"><i18n:text>Publish Sidebar</i18n:text></item>
</block>
<block>
- <item><xsp:attribute name="href">?lenya.usecase=logout</xsp:attribute>Logout</item>
+ <item uc:usecase="logout"><i18n:text>Logout</i18n:text></item>
</block>
</menu>
- <menu name="Search" label="Search">
+ <menu i18n:attr="name" name="Search" label="Search">
</menu>
- <menu name="Help" label="Help">
+ <menu i18n:attr="name" name="Help" label="Help">
<block>
- <item><xsp:attribute name="href">http://lenya.apache.org/docs/index.html</xsp:attribute>Documentation</item>
- <item href="http://wiki.apache.org/lenya">Wiki Documentation</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>Apache Lenya Start Page</item>
@@ -68,10 +69,10 @@
</block>
</menu>
- <menu name="Debug" label="Debug">
+ <menu i18n:attr="name" name="Debug" label="Debug">
<block>
- <item href="index.xml">Feed</item>
- <item href="lenya-page-body.xml">Body</item>
+ <item href="index.xml"><i18n:text>Feed</i18n:text></item>
+ <item href="lenya-page-body.xml"><i18n:text>Body</i18n:text></item>
</block>
<block>
<item href="/lenya/blog/atomapi/">introspection</item>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org