From dfed1896f2dbe38ad3cc5c39d9dcd5bf75898a0a Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Thu, 25 Nov 2010 13:05:16 +0000
Subject: [PATCH] Use generic Knowledge Pad column renderer. Remove unnecessary
KM theme DOM element.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40685 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../bottom_gadget.xml | 17 ++++-------------
.../right_gadget.xml | 2 +-
.../erp5_km_theme/km_css/gadget.css.xml | 6 +++---
.../erp5_km_theme/template_erp5_km_minimal.xml | 3 ---
bt5/erp5_km/bt/revision | 2 +-
5 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/bottom_gadget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/bottom_gadget.xml
index e42604ec26..9a8410a15d 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/bottom_gadget.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/bottom_gadget.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>
@@ -298,26 +295,20 @@
</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>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.WebSection_viewColumnTwo(default_pad_group=\'default_content_pad\')</string> </value>
+ <value> <string>python: here.WebSection_viewKnowledgePadColumn(default_pad_group=\'default_content_pad\', pad_column=1, use_anonymous_knowledge_pad=context.getLayoutProperty(\'layout_force_anonymous_gadget\',False))</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml
index a9ada347f7..e48e0ca773 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml
@@ -301,7 +301,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.WebSection_viewColumnOne(default_pad_group=\'default_content_pad\', use_anonymous_knowledge_pad=context.getLayoutProperty(\'layout_force_anonymous_gadget\',False))</string> </value>
+ <value> <string>python: here.WebSection_viewKnowledgePadColumn(default_pad_group=\'default_content_pad\', pad_column=0, create_default_pad=True, make_security_check=True, use_anonymous_knowledge_pad=context.getLayoutProperty(\'layout_force_anonymous_gadget\',False))</string> </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 ec504738bf..9a8815cca7 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>ts90684440.87</string> </value>
+ <value> <string>ts90687468.68</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -749,7 +749,7 @@ div.gadget-tagged-documents div.listbox-head-content{\n
\n
/* Worklist gadget */\n
div.block div.box_inner_content div.worklist_list ul {\n
- padding-left: 0.5em;\n
+ padding-left: 1em;\n
}\n
\n
\n
@@ -771,7 +771,7 @@ div.block fieldset.gadget-profile div.field{\n
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>12697</int> </value>
+ <value> <int>12695</int> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
index 18b83e7ccc..d9bafad309 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
@@ -175,7 +175,6 @@
</tal:block>\n
</tal:block>\n
\n
- <div id="content_back_km">\n
<!-- Headline Box -->\n
<!-- Layout form rendering -->\n
<div id="km_left" \n
@@ -214,12 +213,10 @@
</tal:block>\n
</tal:block>\n
</div>\n
- <br/><br/>\n
<!-- Top Bar: navigation and search -->\n
<!-- Layout form rendering -->\n
</div>\n
\n
- </div>\n
\n
<tal:block tal:condition="python: layout_form is not None">\n
<tal:block tal:repeat="aggregate python: [(\'footer\', footer_area)]">\n
diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision
index 1291917b26..007a7f1573 100644
--- a/bt5/erp5_km/bt/revision
+++ b/bt5/erp5_km/bt/revision
@@ -1 +1 @@
-1694
\ No newline at end of file
+1695
\ No newline at end of file
--
2.30.9