diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml
index 4acfa1f8be88c82f2d3dc1780b4d19afc1b7b444..3a48bf19c7c2206397fdf21d9c18283d57f38446 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="EditorField" module="Products.ERP5Form.EditorField"/>
- <tuple/>
- </tuple>
+ <global name="EditorField" module="Products.ERP5Form.EditorField"/>
</pickle>
<pickle>
<dictionary>
@@ -151,9 +148,7 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -298,10 +293,7 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
@@ -312,20 +304,4 @@
</dictionary>
</pickle>
</record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/Base_canUserAddGadget</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewWidgetManagementButtonsWidget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewWidgetManagementButtonsWidget.xml
index e9407790b05c591025663250fcc341a1651e28f4..6baf05ea5a5b750637ea36fe4dbd22274d2121c6 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewWidgetManagementButtonsWidget.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewWidgetManagementButtonsWidget.xml
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
- <tuple/>
- </tuple>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
@@ -43,42 +40,43 @@
</item>
<item>
<key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
+ <value> <unicode encoding="cdata"><![CDATA[
<tal:block replace="nothing">\n
<!--\n
This widget displays buttons used to add or stick widgets\n
-->\n
</tal:block>\n
-\n
-<tal:block tal:define="\n
- mode python: \'web_section\';\n
- default_pad_group python: options.get(\'default_pad_group\', None);\n
- knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(mode=mode,\n
- default_pad_group=default_pad_group);\n
- struct python: here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, default_pad_group);\n
- active_knowledge_pad python: struct[0];\n
- current_web_section python:\n
- context.REQUEST.get(\'current_web_section\', here);\n
- current_web_section python:\n
+<tal:block tal:condition="here/Base_canUserAddGadget">\n
+ <tal:block tal:define="\n
+ mode python: \'web_section\';\n
+ default_pad_group python: options.get(\'default_pad_group\', None);\n
+ knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ struct python: here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, default_pad_group);\n
+ active_knowledge_pad python: struct[0];\n
+ current_web_section python:\n
+ context.REQUEST.get(\'current_web_section\', here);\n
+ current_web_section python:\n
test(current_web_section.getPortalType()==\'Web Site\',\n
here, current_web_section);\n
- current_web_section_url python: current_web_section.absolute_url();\n
- isKnowledgePadTemplateUsed python:\n
+ current_web_section_url python: current_web_section.absolute_url();\n
+ isKnowledgePadTemplateUsed python:\n
request.get(\'is_knowledge_pad_template_used\', 0);\n
- editable_mode python: context.REQUEST.get(\'editable_mode\', False);\n
- cancel_url string:${current_web_section_url}/view">\n
+ editable_mode python: context.REQUEST.get(\'editable_mode\', False);\n
+ cancel_url string:${current_web_section_url}/view">\n
\n
- <ul class="widget_management_box">\n
- <li>\n
- <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget"> Add Gadgets</span>\n
- <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/stick"> Stick/Unstick</span>\n
- </li>\n
- </ul>\n
+ <ul class="widget_management_box">\n
+ <li>\n
+ <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget"> Add Gadgets</span>\n
+ <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/stick"> Stick/Unstick</span>\n
+ </li>\n
+ </ul>\n
+ </tal:block>\n
</tal:block>\n
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -92,9 +90,13 @@
<key> <string>id</string> </key>
<value> <string>WebSite_viewWidgetManagementButtonsWidget</string> </value>
</item>
+ <item>
+ <key> <string>output_encoding</string> </key>
+ <value> <string>utf-8</string> </value>
+ </item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
index 0e83dc66fac688c31d5d0014b06e9c6e6cb59ba8..858d0d75d174c0fb7ccd38b21b740e871d25c7dd 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
+ <value> <unicode encoding="cdata"><![CDATA[
/****************************************************************/\n
/* TODO: XXX-JPS */\n
@@ -161,9 +161,9 @@ table.table-b tbody tr td { \n
border:none; \n
}\n
\n
-table tbody tr:hover td {\n
+/*table tbody tr:hover td {\n
\tbackground-color: #f7f6f0;\n
-}\n
+}*/\n
\n
.pnav {\n
\tbackground-color: #ecebe2;\n
@@ -431,7 +431,7 @@ div.searchDetails a.modification-date-link{\n
}\n
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -445,9 +445,13 @@ div.searchDetails a.modification-date-link{\n
<key> <string>id</string> </key>
<value> <string>color.css</string> </value>
</item>
+ <item>
+ <key> <string>output_encoding</string> </key>
+ <value> <string>utf-8</string> </value>
+ </item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml
index 74d43ace17d7d0fbecb12c5b9cae7f732d2c0c05..273e4e56988cb567d7f28d435e96cefb8b67c953 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml
@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts87390711.89</string> </value>
+ <value> <string>ts87491856.73</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -52,7 +52,12 @@ div.right-gadget div.portal-column {\n
div.gadget-management{\n
display:block;\n
float:right;\n
- margin-bottom:5px;\n
+ height: 1.65em;\n
+}\n
+\n
+div.right-gadget{\n
+ float:right;\n
+ display:block;\n
}\n
\n
/* hide labels for columns */\n
@@ -482,7 +487,7 @@ div.block div.box_inner_content div.worklist_list ul {\n
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>8854</int> </value>
+ <value> <int>8904</int> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/splash.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/splash.css.xml
index 78a9304f38679b9ccaaf64170f8f0bedb84bf370..d8b308df2ee581cba995a1455ef12c14de492024 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/splash.css.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/splash.css.xml
@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
+ <value> <unicode encoding="cdata"><![CDATA[
<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n
\n
@@ -173,7 +173,7 @@
/* ## home banner ##################################### end ### */\n
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -193,7 +193,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision
index 3766351c703e562ab210825fbf074defd074d858..c6721c4a0ff3eaadff5fb59298b1c1856110490e 100644
--- a/bt5/erp5_km/bt/revision
+++ b/bt5/erp5_km/bt/revision
@@ -1 +1 @@
-1618
\ No newline at end of file
+1621
\ No newline at end of file