From 202dc42d8743627f76384fab1968e5b30d798257 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 4 May 2009 09:14:05 +0000
Subject: [PATCH] all widgets should be located in
erp5_web_multiflex5_demo_layout, and we can just use proxy field to them as
they are in erp5_web_multiflex5_layout.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26772 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../footer_box.xml | 24 +++++-
.../breadcrumb_box.xml | 50 +----------
.../erp5_web_multiflex5_layout/footer_box.xml | 63 +-------------
.../global_navigation_box.xml | 48 +----------
.../language_box.xml | 47 +----------
.../navigation_bar.xml | 50 +----------
.../page_title_box.xml | 62 +-------------
.../erp5_web_multiflex5_layout/rss_box.xml | 45 +---------
.../erp5_web_multiflex5_layout/search_bar.xml | 83 +------------------
.../site_title_box.xml | 73 +---------------
.../subsection_list.xml | 73 +---------------
bt5/erp5_web_multiflex5_theme/bt/revision | 2 +-
12 files changed, 51 insertions(+), 569 deletions(-)
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/footer_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/footer_box.xml
index 4dc9b5c2f2..2b79a6f528 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/footer_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/footer_box.xml
@@ -15,9 +15,9 @@
<list>
<string>title</string>
<string>default</string>
- <string>whitespace_preserve</string>
- <string>height</string>
<string>width</string>
+ <string>height</string>
+ <string>whitespace_preserve</string>
</list>
</value>
</item>
@@ -73,10 +73,26 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -89,7 +105,7 @@
<value> <string encoding="cdata"><![CDATA[
<p>Copyright © 2008 Your Company | All Rights Reserved</p>\n
-<p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="#" title="Modifyer Homepage">Your Name</a> | Powered by <a href="#" title="CMS Homepage">Your CMS</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p>
+<p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="#" title="Modifyer Homepage">Your Name</a> | Powered by <a href="#" title="CMS Homepage">Your CMS</a> | Media Player by <a href="http://flowplayer.org" title="Media Player Credits">Flowplayer</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p>
]]></string> </value>
</item>
@@ -140,7 +156,7 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright © 2009 | All Rights Reserved\')
+python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://flowplayer.org" title="Media Player Credits">Flowplayer</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright © 2009 | All Rights Reserved\')
]]></string> </value>
</item>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/breadcrumb_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/breadcrumb_box.xml
index 82506349b1..3a3da40e04 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/breadcrumb_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/breadcrumb_box.xml
@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>whitespace_preserve</string>
- <string>height</string>
- <string>width</string>
- <string>default</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -59,12 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -86,52 +74,20 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>breadcrumb_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>bottom_header_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/WebSection_viewBreadcrumbWidget</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/footer_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/footer_box.xml
index d28337ea03..03b441c2fb 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/footer_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/footer_box.xml
@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>default</string>
- <string>whitespace_preserve</string>
- <string>height</string>
- <string>width</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -59,12 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -84,67 +72,22 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<p>Copyright © 2008 Your Company | All Rights Reserved</p>\n
-<p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="#" title="Modifyer Homepage">Your Name</a> | Powered by <a href="#" title="CMS Homepage">Your CMS</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p>
-
-]]></string> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>footer_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>footer_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://flowplayer.org" title="Media Player Credits">Flowplayer</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright © 2009 | All Rights Reserved\')
-
-]]></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/global_navigation_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/global_navigation_box.xml
index 250baf1cec..fdc12c2f32 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/global_navigation_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/global_navigation_box.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>default</string>
- <string>whitespace_preserve</string>
- <string>enabled</string>
- <string>height</string>
- <string>width</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -79,53 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<div class="navglobal">\n
-<ul>\n
-<li><a href="#" title="">About</a></li>\n
-<li><a href="#" title="">Contact</a></li>\n
-<li><a href="#" title="">Sitemap</a></li>\n
-<li><a href="#" title="">Links</a></li>\n
-</ul>\n
-</div>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>global_navigation_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>top_header_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/language_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/language_box.xml
index aea950451c..a87d7a855f 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/language_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/language_box.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>default</string>
- <string>whitespace_preserve</string>
- <string>enabled</string>
- <string>height</string>
- <string>width</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -79,52 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<div class="navbuttonflag">\n
-<ul>\n
-<li><a href="#" title="English"><img src="./mf54_image/icon_flag_us.gif" alt="Flag" /></a></li>\n
-<li><a href="#" title="Deutsch"><img src="./mf54_image/icon_flag_de.gif" alt="Flag" /></a></li>\n
-<li><a href="#" title="Svenska"><img src="./mf54_image/icon_flag_se.gif" alt="Flag" /></a></li>\n
-</ul>\n
-</div>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>language_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>header_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/navigation_bar.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/navigation_bar.xml
index 80728f3a6d..af073ca8a6 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/navigation_bar.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/navigation_bar.xml
@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>whitespace_preserve</string>
- <string>height</string>
- <string>width</string>
- <string>default</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -59,12 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -86,52 +74,20 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>navigation_bar</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>navbar_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/WebSection_viewNavigationWidget</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/page_title_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/page_title_box.xml
index e06cee0b08..d412e6fcb8 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/page_title_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/page_title_box.xml
@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>default</string>
- <string>whitespace_preserve</string>
- <string>height</string>
- <string>width</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -59,12 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -84,66 +72,22 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<h1 class="pagetitle">Content Toolbox (With sidebar)</h1>
-
-]]></string> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>page_title_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>headline_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-python:\'<h1 class="pagetitle">%s</h1>\' % request.current_web_document.getTitle()
-
-]]></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/rss_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/rss_box.xml
index 0cbd09f1cd..1f2a01531b 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/rss_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/rss_box.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>default</string>
- <string>whitespace_preserve</string>
- <string>enabled</string>
- <string>height</string>
- <string>width</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -79,50 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<div class="navbutton">\n
-<ul>\n
-<li><a href="#" title="RSS"><img src="./mf54_image/icon_rss.gif" alt="RSS-Button" /></a></li>\n
-</ul>\n
-</div>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>rss_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>header_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml
index 4b4c8ee1df..8c8361b5a9 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml
@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>default</string>
- <string>width</string>
- <string>height</string>
- <string>whitespace_preserve</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -59,12 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -73,26 +61,10 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <string></string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -100,71 +72,22 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<div class="searchform">\n
-<fieldset>\n
-<input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \'./ERP5Site_viewQuickSearchResultList\');" />\n
-<input type="submit" name="./ERP5Site_viewQuickSearchResultList:method" class="button" value="Search" />\n
-</fieldset>\n
-</div>
-
-]]></string> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>search_bar</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>bottom_header_bar</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-python:\'<div class="searchform"><fieldset><input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \\\'%(section_id)s/ERP5Site_viewQuickSearchResultList\\\');" /><input type="submit" name="%(section_id)s/ERP5Site_viewQuickSearchResultList:method" class="button" value="%(search)s" /></fieldset></div>\' % {\'section_id\':getattr(here, \'layout_search_area_section_id\', \'.\'), \'search\':here.Base_translateString(\'Search\')}
-
-]]></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/site_title_box.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/site_title_box.xml
index da9e9859ed..48bbed0508 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/site_title_box.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/site_title_box.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>whitespace_preserve</string>
- <string>height</string>
- <string>width</string>
- <string>default</string>
- <string>enabled</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -60,18 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -93,68 +74,20 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>site_title_box</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>top_header_box</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/WebSection_viewSiteTitleWidget</string> </value>
- </item>
- </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>python:len(request.current_web_site.getTitle())</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/subsection_list.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/subsection_list.xml
index ffc395c83a..508e706f8a 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/subsection_list.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/subsection_list.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>whitespace_preserve</string>
- <string>height</string>
- <string>width</string>
- <string>default</string>
- <string>enabled</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -60,18 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -93,68 +74,20 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_text_content</string> </value>
+ <value> <string>subsection_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
+ <value> <string>erp5_web_multiflex5_demo_layout</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Subsections</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/WebSection_viewSubsectionWidget</string> </value>
- </item>
- </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>python:len(request.current_web_section.contentValues())</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_web_multiflex5_theme/bt/revision b/bt5/erp5_web_multiflex5_theme/bt/revision
index a76c74dcec..aa92725341 100644
--- a/bt5/erp5_web_multiflex5_theme/bt/revision
+++ b/bt5/erp5_web_multiflex5_theme/bt/revision
@@ -1 +1 @@
-75
\ No newline at end of file
+76
\ No newline at end of file
--
2.30.9