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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed May 13 18:13:20 2009
New Revision: 26957

URL: http://svn.erp5.org?rev=26957&view=rev
Log:
* display only available languages in Language Widget.
* output simpler HTML in Breadcrumb 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_viewLanguageWidget.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=26957&r1=26956&r2=26957&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] Wed May 13 18:13:20 2009
@@ -60,20 +60,11 @@
 <ul>\n
   <li class="nobullet" \n
       i18n:translate=""\n
-      i18n:domain="ui"\n
-      i18n:attributes="title"\n
-      title="This breadcrumb help you to remind you where you are in the web site.">You are here</li><span>&nbsp;:&nbsp;</span>\n
+      i18n:domain="ui">You are here: </li>\n
   <li tal:repeat="breadcrumb breadcrumb_list">\n
-    <a href="#" tal:condition="not: repeat/breadcrumb/end"\n
-                i18n:domain="ui" i18n:attributes="title"\n
-                title="A previous emplacement in the web site."\n
+    <a href="#" i18n:domain="ui"\n
                 tal:attributes="href python:breadcrumb[1].absolute_url();"      \n
-                tal:content="python:breadcrumb[0]">Home</a>\n
-    <a href="#" tal:condition="repeat/breadcrumb/end"\n
-                i18n:domain="ui" i18n:attributes="title"\n
-                title="You are here."\n
-                tal:attributes="href python:breadcrumb[1].absolute_url();"      \n
-                tal:content="python:breadcrumb[0]">Home</a>\n
+                tal:content="python:breadcrumb[0]">Title</a>\n
   </li>\n
 </ul>\n
 </tal:block>

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewLanguageWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewLanguageWidget.xml?rev=26957&r1=26956&r2=26957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewLanguageWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewLanguageWidget.xml [utf8] Wed May 13 18:13:20 2009
@@ -49,20 +49,23 @@
                        portal_path python:request.get(\'current_web_site_url\', current_web_site.absolute_url());\n
                        available_language_list current_web_site/getAvailableLanguageList;\n
                        language_list current_web_site/Localizer/get_languages_map;"\n
-           tal:condition="python:len(language_list) > 1">\n
-  <div class="navbuttonflag">\n
-    <ul>\n
-      <li tal:repeat="language language_list">\n
-        <a href="./Base_doLanguage?select_language=en" title="English"\n
-           tal:attributes="href string:${portal_path}/Base_doLanguage?select_language=${language/id}">\n
-          <img src="./mf54_image/icon_flag_us.gif" alt="Flag"\n
-               tal:attributes="src string:${portal_path}/mf54_image/icon_flag_${language/id}.png;\n
-                               title language/title;\n
-                               alt language/title" />\n
-        </a>\n
-      </li>\n
-    </ul>\n
-  </div>\n
+           tal:condition="python:len(available_language_list) > 1">\n
+<div class="navbuttonflag">\n
+  <ul>\n
+    <tal:block tal:repeat="language language_list">\n
+    <li tal:define="language_id language/id"\n
+        tal:condition="python:language_id in available_language_list">\n
+      <a href="./Base_doLanguage?select_language=en" title="English"\n
+         tal:attributes="href string:${portal_path}/Base_doLanguage?select_language=${language_id}">\n
+        <img src="./mf54_image/icon_flag_us.gif" alt="Flag"\n
+             tal:attributes="src string:${portal_path}/mf54_image/icon_flag_${language_id}.png;\n
+                             title language/title;\n
+                             alt language/title" />\n
+      </a>\n
+    </li>\n
+    </tal:block>\n
+  </ul>\n
+</div>\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=26957&r1=26956&r2=26957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] Wed May 13 18:13:20 2009
@@ -1,1 +1,1 @@
-81
+82