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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu May 14 14:11:05 2009
New Revision: 26983

URL: http://svn.erp5.org?rev=26983&view=rev
Log:
* do not display default page in breadcrumb widget.
* invoke recursive call only if required in navigation widget.

Modified:
    erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewBreadcrumbWidget.xml
    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_viewBreadcrumbWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewBreadcrumbWidget.xml?rev=26983&r1=26982&r2=26983&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewBreadcrumbWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewBreadcrumbWidget.xml [utf8] Thu May 14 14:11:05 2009
@@ -56,12 +56,13 @@
 \n
 <tal:block tal:define="current_web_section python:request.get(\'current_web_section\', here);\n
                        current_web_document python:request.get(\'current_web_document\', here);\n
+                       is_web_section_default_document python:request.get(\'is_web_section_default_document\',False);\n
                        breadcrumb_list python: current_web_section.getBreadcrumbItemList(current_web_document);">\n
 <ul>\n
   <li class="nobullet" \n
       i18n:translate=""\n
       i18n:domain="ui">You are here: </li>\n
-  <li tal:repeat="breadcrumb breadcrumb_list">\n
+  <li tal:repeat="breadcrumb python:breadcrumb_list[:(is_web_section_default_document and -1 or None)]">\n
     <a href="#" i18n:domain="ui"\n
                 tal:attributes="href python:breadcrumb[1].absolute_url();"      \n
                 tal:content="python:breadcrumb[0]">Title</a>\n

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=26983&r1=26982&r2=26983&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] Thu May 14 14:11:05 2009
@@ -63,7 +63,7 @@
       <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
+          <tal:recurse define="menu_item item" tal:condition="nocall:item/subsection">\n
             <metal:call use-macro="here/WebSection_viewNavigationWidget/macros/generateTree" />\n
           </tal:recurse>\n
         </li>\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=26983&r1=26982&r2=26983&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] Thu May 14 14:11:05 2009
@@ -1,1 +1,1 @@
-87
+88