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:34:04 UTC

svn commit: r151315 - in lenya/trunk/src/webapp/lenya/pubs/blog/config/menus: archive.xsp entry.xsp feed.xsp

Author: gregor
Date: Thu Feb  3 20:34:02 2005
New Revision: 151315

URL: http://svn.apache.org/viewcvs?view=rev&rev=151315
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/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

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=151314&r2=151315
==============================================================================
--- 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 20:34:02 2005
@@ -42,30 +42,30 @@
   </tabs>
 
   <menus>
-    <menu name="File" label="File">
+    <menu i18n:attr="name" name="File">
       <block>
-        <item><xsp:attribute name="href">?lenya.usecase=ac.logout</xsp:attribute>Logout</item>
+        <item uc:usecase="ac.logout"><i18n:text>Logout</i18n:text></item>
       </block>
     </menu>
 
-    <menu name="Search" label="Search">
+    <menu i18n:attr="name" name="Search">
     </menu>
 
-    <menu name="Help" label="Help">
+    <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>Apache&#160;Lenya&#160;Start&#160;Page</item>
-	  <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About&#160;Apache&#160;Lenya</item>
+        <item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache&#160;Lenya&#160;Start&#160;Page</item>
+        <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About&#160;Apache&#160;Lenya</item>
       </block>
     </menu>
 
-    <menu name="Debug" label="Debug">
+    <menu i18n:attr="name" name="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/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=151314&r2=151315
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp Thu Feb  3 20:34:02 2005
@@ -49,26 +49,14 @@
   </tabs>
 
   <menus>
-    <menu name="File" label="File">
+    <menu i18n:attr="name" name="File">
       <block>
-        <menu name="Edit">
-          <block>
-            <item uc:usecase="edit" href="?lenya.step=open&amp;form=entry">With&#160;Forms</item>
-            <item href="index-bxe.html">With&#160;BXE</item>
-            <item uc:usecase="1formedit" href="?lenya.step=open">With&#160;one&#160;Form</item>
-          </block>
-        </menu>
-      </block>
-      <!-- Edit as a submenu -->
-      <!--
-      <block>
-        <item uc:usecase="edit" href="?lenya.step=open&amp;form=entry">Edit&#160;with&#160;Forms</item>
+        <item uc:usecase="edit" uc:step="open" href="?&amp;form=entry">Edit&#160;with&#160;Forms</item>
         <item href="index-bxe.html">Edit&#160;with&#160;BXE</item>
-        <item uc:usecase="1formedit" href="?lenya.step=open">Edit&#160;with&#160;one&#160;Form</item>
+        <item uc:usecase="1formedit" uc:step="open">Edit&#160;with&#160;one&#160;Form</item>
       </block>
-      -->
       <block>
-        <item uc:usecase="publish" uc:step="showscreen"><xsp:attribute name="href">?sources=<xsp:expr>source</xsp:expr>&amp;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>&amp;uris=<xsp:expr>uri</xsp:expr>,feeds/all/index.html</xsp:attribute><i18n:text>Publish</i18n:text></item>
       </block>
       <!--
       <block>
@@ -76,28 +64,28 @@
       </block>
       -->
       <block>
-        <item><xsp:attribute name="href">?lenya.usecase=ac.logout</xsp:attribute>Logout</item>
+        <item uc:usecase="ac.logout"><i18n:text>Logout</i18n:text></item>
       </block>
     </menu>
 
-    <menu name="Search" label="Search">
+    <menu i18n:attr="name" name="Search">
     </menu>
 
-    <menu name="Help" label="Help">
+    <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>Apache&#160;Lenya&#160;Start&#160;Page</item>
-	  <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About&#160;Apache&#160;Lenya</item>
+        <item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache&#160;Lenya&#160;Start&#160;Page</item>
+        <item><xsp:attribute name="href"><xsp-request:get-context-path/>/about.html</xsp:attribute>About&#160;Apache&#160;Lenya</item>
       </block>
     </menu>
 
-    <menu name="Debug" label="Debug">
+    <menu i18n:attr="name" name="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>

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=151314&r2=151315
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/feed.xsp Thu Feb  3 20:34:02 2005
@@ -42,36 +42,36 @@
   </tabs>
  
   <menus>
-    <menu name="File" label="File">
+    <menu i18n:attr="name" name="File">
       <block>
-        <item uc:usecase="site.create" href="">Add&#160;new&#160;Entry</item>
+        <item uc:usecase="site.create">Add&#160;new&#160;Entry</item>
       </block>
       <block>
-        <item uc:usecase="edit" href="../../sidebar.html?lenya.step=open&amp;form=sidebar">Edit&#160;Sidebar&#160;with&#160;Forms</item>
-        <item uc:usecase="publish" href="../../sidebar.html?sources=sidebar.xml&amp;uris=feeds/all/index.html&amp;lenya.step=showscreen">Publish Sidebar</item>
+        <item uc:usecase="edit" uc:step="open" href="../../sidebar.html?form=sidebar">Edit&#160;Sidebar&#160;with&#160;Forms</item>
+        <item uc:usecase="publish" uc:step="showscreen" href="../../sidebar.html?sources=sidebar.xml&amp;uris=feeds/all/index.html"><i18n:text>Publish Sidebar</i18n:text></item>
       </block>
       <block>
-        <item><xsp:attribute name="href">?lenya.usecase=ac.logout</xsp:attribute>Logout</item>
+        <item uc:usecase="ac.logout"><i18n:text>Logout</i18n:text></item>
       </block>
     </menu>
  
-    <menu name="Search" label="Search">
+    <menu i18n:attr="name" name="Search">
     </menu>
  
-    <menu name="Help" label="Help">
+    <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/>/about.html</xsp:attribute>About&#160;Apache&#160;Lenya</item>
       </block>
     </menu>
  
-    <menu name="Debug" label="Debug">
+    <menu i18n:attr="name" name="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