[Erp5-report] r26795 - in /erp5/trunk/bt5/erp5_web_multiflex5_theme: SkinTemplateItem/porta...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue May  5 09:53:38 2009
New Revision: 26795

URL: http://svn.erp5.org?rev=26795&view=rev
Log:
cleanup WebSection_viewNavigationWidget.

Modified:
    erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml
    erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml?rev=26795&r1=26794&r2=26795&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml [utf8] Tue May  5 09:53:38 2009
@@ -46,37 +46,29 @@
 <tal:block replace="nothing">\n
   <!--\n
   This widget displays the list of Sections contained in the current context.\n
-  It uses the properties defined on sections to decide whether \n
-\n
-  TODO:\n
-    - make sure translation is possible or working\n
-    - make sure URLs are correct\n
-    - use generic method (erp5_web) to retrieve the list of subsections\n
-    - make it hierarchic\n
+  It uses the properties defined on sections to decide whether sections\n
   -->\n
 </tal:block>\n
 \n
 <tal:block tal:define="current_web_site python:request.get(\'current_web_site\', here);\n
                        menu_item_list python:current_web_site.WebSection_getSiteMapTree(depth=3)">\n
-  <ul tal:repeat="menu_item menu_item_list"\n
-      i18n:translate="" i18n:domain="ui" i18n:attributes="title"\n
-      title="Navigate threw the web site.">\n
-    <li tal:condition="python: menu_item is not None"><a href="#" tal:attributes="href menu_item/url"\n
-            tal:content="menu_item/translated_title">Drop-down Menu<!--[if IE 7]><!--></a><!--<![endif]-->\n
+  <ul tal:repeat="menu_item menu_item_list">\n
+    <li tal:condition="python: menu_item is not None">\n
+      <tal:block tal:condition="not:nocall:menu_item/subsection"><a tal:attributes="href menu_item/url" tal:content="menu_item/translated_title">Menu</a></tal:block>\n
+      <tal:block tal:condition="nocall:menu_item/subsection">\n
+      <a tal:attributes="href menu_item/url"><tal:block tal:replace="menu_item/translated_title">Drop-down Menu</tal:block><!--[if IE 7]><!--></a><!--<![endif]-->\n
       <!--[if lte IE 6]><table><tr><td><![endif]-->\n
       <ul metal:define-macro="generateTree">\n
         <li tal:repeat="item menu_item/subsection">\n
           <a href="#" tal:attributes="href item/url" tal:content="item/translated_title">Menu subitem 1</a>\n
-          <tal:recurse define="menu_item item"\n
-                               condition="nocall: menu_item/subsection">\n
+          <tal:recurse define="menu_item item">\n
             <metal:call use-macro="here/WebSection_viewNavigationWidget/macros/generateTree" />\n
           </tal:recurse>\n
         </li>\n
       </ul>\n
       <!--[if lte IE 6]></td></tr></table></a><![endif]-->\n
+      </tal:block>\n
     </li>\n
-    <li tal:condition="not:menu_item/subsection"><a href="#" tal:attributes="href menu_item/url" \n
-            tal:content="menu_item/translated_title">Overview</a></li>\n
   </ul>\n
 </tal:block>\n
 

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision?rev=26795&r1=26794&r2=26795&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] Tue May  5 09:53:38 2009
@@ -1,1 +1,1 @@
-76
+77