From 4dde4065598ef3185e57a2deaafe252f73e204b9 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Fri, 20 Apr 2012 17:04:41 +0300
Subject: [PATCH] Improve top menu navigation.

---
 .../WebSection_viewBreadcrumbWidget.xml       | 21 +++++++++++--------
 ...WebSite_viewBrowseNavigationMenuWidget.xml |  2 +-
 .../erp5_km_theme/km_css/km.css.xml           |  5 ++++-
 bt5/erp5_km/bt/revision                       |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewBreadcrumbWidget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewBreadcrumbWidget.xml
index 7339232165..6753e33a85 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewBreadcrumbWidget.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewBreadcrumbWidget.xml
@@ -58,17 +58,20 @@
                        breadcrumb_list python: current_web_section.getBreadcrumbItemList(current_web_document);">\n
 <ul class="breadcrumb">\n
   <li tal:repeat="breadcrumb python:breadcrumb_list[:(is_web_section_default_document and -1 or None)]">\n
-    <a href="#" tal:attributes="href python:current_web_section.getPermanentURL(breadcrumb[1]);\n
-                                title python:breadcrumb[2];"\n
-                tal:content="python:breadcrumb[0]">Title</a>\n
-    <tal:block tal:condition="not: repeat/breadcrumb/end">\n
-      <img class="breadcrumb_separator" src="../km_img/crumb.png" alt="&gt;"\n
-       tal:attributes="src string:${portal_path}/km_img/crumb.png"/>\n
+    <tal:block tal:define="is_last repeat/breadcrumb/end">\n
+      <a href="#"\n
+         tal:attributes="href python:current_web_section.getPermanentURL(breadcrumb[1]);\n
+                         title python:breadcrumb[2];\n
+                         class python: test(is_last, \'last-breadcrumb\', \'breadcrumb\')"\n
+         tal:content="python:breadcrumb[0]">Title</a>\n
+      <img tal:condition="not: is_last"\n
+             class="breadcrumb_separator"\n
+             src="../km_img/crumb.png" alt="&gt;"\n
+             tal:attributes="src string:${portal_path}/km_img/crumb.png"/>\n
     </tal:block>\n
   </li>\n
 </ul>\n
-</tal:block>\n
-
+</tal:block>
 
 ]]></unicode> </value>
         </item>
@@ -86,7 +89,7 @@
         </item>
         <item>
             <key> <string>output_encoding</string> </key>
-            <value> <string>utf-8</string> </value>
+            <value> <string>iso-8859-15</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewBrowseNavigationMenuWidget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewBrowseNavigationMenuWidget.xml
index 14ee18fdbe..484ded48c0 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewBrowseNavigationMenuWidget.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewBrowseNavigationMenuWidget.xml
@@ -79,7 +79,7 @@
     <tal:block tal:repeat="menu_item menu_item_list">\n
 \n
     <li tal:define="sub_item_list menu_item/subsection"\n
-        tal:attributes="class python:\'menu_item_%s\' % repeat[\'menu_item\'].index + \' \' + (sub_item_list and \'collapse-menu\' or \'\')">\n
+        tal:attributes="class python:\'menu_item_%s collapse-menu\' % repeat[\'menu_item\'].index + \' \' + (sub_item_list and \'collapse-able\' or \'\')">\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
       </a>\n
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml
index 1a01bc5e69..72e9852b4f 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml
@@ -252,11 +252,14 @@ div#wrapper_headline div.header_title {\n
   height:100%;\n
 }\n
 \n
-#menu ul li.collapse-menu{\n
+#menu ul li.collapse-able{\n
   background: url(km_img/collapse-down-arrow.gif) no-repeat transparent right 10px;\n
   padding-right: 0px;\n
 }\n
 \n
+\n
+\n
+\n
 #menu ul li.non-collapse-menu{\n
   background: none;\n
   padding-right: 0px;\n
diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision
index 9b68bb3e77..22f5f1cc48 100644
--- a/bt5/erp5_km/bt/revision
+++ b/bt5/erp5_km/bt/revision
@@ -1 +1 @@
-1857
\ No newline at end of file
+1858
\ No newline at end of file
-- 
2.30.9