Implement choice of menu for member : browser or sections

Review by Ivan

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40533 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewBrowseNavigationMenuWidget.xml

@@ -48,10 +48,10 @@
                        search_area_url python: \'%s%s\' % (portal_path, current_web_site.getLayoutProperty(\'layout_search_area_web_section_id\', default=\'\'));\n
                        menu_item_list python:current_web_site.WebSection_getSiteMapTree(depth=32, property_mapping=(\'compact_translated_title\',));\n
                        is_anonymous here/portal_membership/isAnonymousUser;\n
-                       anonymous_navigation_menu python:is_anonymous and current_web_site.getLayoutProperty(\'layout_anonymous_navigation_menu\');">\n
+                       static_navigation_menu python:is_anonymous and current_web_site.getLayoutProperty(\'layout_anonymous_navigation_menu\') or  current_web_site.getLayoutProperty(\'layout_member_navigation_menu\');">\n
 \n
   <li class="collapse-menu"\n
-      tal:condition="not:anonymous_navigation_menu">\n
+      tal:condition="not:static_navigation_menu">\n
     <a href="#" >\n
       <tal:block i18n:translate="" i18n:domain="ui">Browse</tal:block>\n
       <!--[if IE 7]><!-->\n
@@ -78,16 +78,16 @@
     <!--[if lte IE 6]></td></tr></table></a><![endif]-->\n
   </li>\n
 \n
-  <tal:block tal:condition="anonymous_navigation_menu">\n
-    <li class="collapse-menu" tal:repeat="menu_item menu_item_list">\n
-      <a href="#" >\n
+  <tal:block tal:condition="static_navigation_menu">\n
+    <tal:block tal:repeat="menu_item menu_item_list">\n
+    <li tal:define="sub_item_list menu_item/subsection">\n
+      <a tal:attributes="href menu_item/url" >\n
         <tal:block tal:replace="menu_item/compact_translated_title | menu_item/translated_title">Menu</tal:block>\n
         <!--[if IE 7]><!-->\n
       </a><!--<![endif]-->\n
-      <!--[if lte IE 6]><table><tr><td><![endif]-->\n
-      <tal:block tal:define="menu_item_list menu_item/subsection">\n
-        <ul tal:condition="menu_item_list">\n
-          <li tal:repeat="menu_item menu_item_list">\n
+      <!--[if lte IE 6]><table><tr><td><![endif]-->      \n
+        <ul tal:condition="sub_item_list">\n
+          <li tal:repeat="menu_item sub_item_list" tal:attributes="class python: menu_item[\'url\'] and \'collapse-menu\' or \'\'">\n
             <tal:block tal:condition="not:nocall:menu_item/subsection"><a tal:attributes="href menu_item/url" tal:content="menu_item/compact_translated_title | 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/compact_translated_title | menu_item/translated_title">Drop-down Menu</tal:block><!--[if IE 7]><!--></a><!--<![endif]-->\n
@@ -105,8 +105,8 @@
           </li>\n
         </ul>\n
         <!--[if lte IE 6]></td></tr></table></a><![endif]-->\n
-      </tal:block>\n
     </li>\n
+    </tal:block>\n
   </tal:block>\n
 </tal:block>  \n
 

bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewNavigationMenuWidget.xml

@@ -54,13 +54,14 @@
                        current_web_section_url python:request.get(\'current_web_section_url\', portal_path);\n
                        search_area_url python: \'%s%s\' % (portal_path, current_web_site.getLayoutProperty(\'layout_search_area_web_section_id\', default=\'\'));\n
                        is_anonymous here/portal_membership/isAnonymousUser;\n
-                       anonymous_navigation_menu python:is_anonymous and current_web_site.getLayoutProperty(\'layout_anonymous_navigation_menu\');">\n
+                       anonymous_navigation_menu python:is_anonymous and current_web_site.getLayoutProperty(\'layout_anonymous_navigation_menu\');\n
+                       static_navigation_menu python: anonymous_navigation_menu or  current_web_site.getLayoutProperty(\'layout_member_navigation_menu\');">\n
 \n
 <ul class="nav">\n
   <li class="home-link"><a href="#" tal:attributes="href portal_path" id="home-link">Home</a></li>\n
 \n
   <tal:block tal:replace="structure here/WebSite_viewBrowseNavigationMenuWidget"/>\n
-\n
+  <tal:block tal:condition="not: static_navigation_menu">\n
   <li class="collapse-menu" \n
       tal:condition="not:anonymous_navigation_menu">\n
     <a href="#" tal:attributes="href string:${search_area_url}/ERP5Site_viewSearchResult">\n
@@ -166,10 +167,10 @@
       </li>\n
     </ul>\n
   </li>\n
+  </tal:block>\n
 </ul>\n
 \n
-</tal:block>\n
-
+</tal:block>
 
 ]]></unicode> </value>
         </item>

bt5/erp5_km/bt/revision

-1687
\ No newline at end of file
+1688
\ No newline at end of file