diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml index 32270ca0b92592559ec167bbb6437532d6a16913..6cf4d8fe0f304329fe2844052f6b44f03a512122 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml @@ -95,7 +95,9 @@ <string>my_title</string> <string>my_short_title</string> <string>my_reference</string> - <string>my_translated_validation_state_title</string> + <string>my_int_index</string> + <string>my_version</string> + <string>my_language</string> </list> </value> </item> @@ -103,10 +105,8 @@ <key> <string>right</string> </key> <value> <list> - <string>my_publication_section</string> - <string>my_version</string> - <string>my_language</string> - <string>my_int_index</string> + <string>my_publication_section_list</string> + <string>my_translated_validation_state_title</string> </list> </value> </item> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_publication_section.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_publication_section_list.xml similarity index 91% rename from bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_publication_section.xml rename to bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_publication_section_list.xml index 833cb9e2548a844b090c28d548531c78c281201f..67ca79f216c99b058072deb7f81053ca36cf01a2 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_publication_section.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_publication_section_list.xml @@ -5,7 +5,7 @@ <tuple> <tuple> <string>Products.Formulator.StandardFields</string> - <string>ListField</string> + <string>MultiListField</string> </tuple> <none/> </tuple> @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_publication_section</string> </value> + <value> <string>my_publication_section_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -75,10 +75,6 @@ <key> <string>extra_item</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>hidden</string> </key> <value> <string></string> </value> @@ -104,7 +100,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>whitespace_preserve</string> </key> + <key> <string>view_separator</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -150,10 +146,6 @@ <key> <string>extra_item</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>hidden</string> </key> <value> <string></string> </value> @@ -181,7 +173,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>whitespace_preserve</string> </key> + <key> <string>view_separator</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -201,7 +193,9 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <list/> + </value> </item> <item> <key> <string>description</string> </key> @@ -227,10 +221,6 @@ <key> <string>extra_item</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>first_item</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> @@ -247,7 +237,7 @@ </item> <item> <key> <string>size</string> </key> - <value> <int>1</int> </value> + <value> <int>5</int> </value> </item> <item> <key> <string>title</string> </key> @@ -258,8 +248,12 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br /> + +]]></string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view.xml index 7f776cea60be67f3f6bdca453da75f1def5bf79e..52900de98b9f7818f13a27a7d33dfe277c3a6a3b 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view.xml @@ -94,7 +94,8 @@ <list> <string>my_title</string> <string>my_id</string> - <string>my_int_index</string> + <string>my_container_layout</string> + <string>my_content_layout</string> <string>my_visible</string> </list> </value> @@ -103,8 +104,8 @@ <key> <string>right</string> </key> <value> <list> - <string>my_container_layout</string> - <string>my_content_layout</string> + <string>my_int_index</string> + <string>my_aggregate_title</string> <string>my_source_title_list</string> </list> </value> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_aggregate_title.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_aggregate_title.xml new file mode 100644 index 0000000000000000000000000000000000000000..7e30a9063eff0169cb2d28b88359aa1fc2ea729e --- /dev/null +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_aggregate_title.xml @@ -0,0 +1,531 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Form.RelationField</string> + <string>RelationStringField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>my_aggregate_title</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>line_too_long</string> </key> + <value> <string>A line was too long.</string> </value> + </item> + <item> + <key> <string>relation_result_ambiguous</string> </key> + <value> <string>Select appropriate document in the list.</string> </value> + </item> + <item> + <key> <string>relation_result_empty</string> </key> + <value> <string>No such document was found.</string> </value> + </item> + <item> + <key> <string>relation_result_too_long</string> </key> + <value> <string>Too many documents were found.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>You entered too many characters.</string> </value> + </item> + <item> + <key> <string>too_many_lines</string> </key> + <value> <string>You entered too many lines.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_creation</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>allow_jump</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>base_category</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>jump_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>parameter_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>relation_setter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>update_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_creation</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>allow_jump</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>base_category</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>jump_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>parameter_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>relation_setter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>update_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_creation</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>allow_jump</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>base_category</string> </key> + <value> <string>aggregate</string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string>title</string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Link to the Web Page to display as default content of the current section</string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>40</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>jump_method</string> </key> + <value> <string>Base_jumpToRelatedDocument</string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>parameter_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> + <list> + <tuple> + <string>Web Page</string> + <string>Web Page</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>relation_setter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Default Page</string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>update_method</string> </key> + <value> <string>Base_validateRelation</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_container_layout.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_container_layout.xml index f5e726ac2a81c4a878728b102c12c5d2728eae2d..19d7b0475a276d6d986bfcad5fc791e78ed4c716 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_container_layout.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_container_layout.xml @@ -211,7 +211,7 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>30</int> </value> + <value> <int>20</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_content_layout.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_content_layout.xml index d8945d64dbf4901e5e085f11bc79a1dd48cea4d7..efceb51eeed594c8ebdf742a2344d35fa09def56 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_content_layout.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_content_layout.xml @@ -217,7 +217,7 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>30</int> </value> + <value> <int>20</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_id.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_id.xml index 1886a5f47269f9ef8ce8e9ad13180a7275b8a1b8..06fc5a29420b0e1fd1401a620894de122483e337 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_id.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_id.xml @@ -211,7 +211,7 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>20</int> </value> + <value> <int>30</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_source_title_list.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_source_title_list.xml index 55b2ff7d64facbbd06b246c2d30fbff485b543c7..2a2ccee98967ae0e478f288a4a017fc62ed1ee8c 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_source_title_list.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_source_title_list.xml @@ -459,7 +459,7 @@ </item> <item> <key> <string>height</string> </key> - <value> <int>5</int> </value> + <value> <int>3</int> </value> </item> <item> <key> <string>hidden</string> </key> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view.xml index b7ffad4ccb0b38e3b93a393092ba84fcd7b6b39d..a0801504994f9d8795bf2fe35e9ef6172aebccda 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view.xml @@ -103,7 +103,6 @@ <string>my_title</string> <string>my_container_layout</string> <string>my_content_layout</string> - <string>my_webmaster</string> </list> </value> </item> @@ -111,6 +110,7 @@ <key> <string>right</string> </key> <value> <list> + <string>my_webmaster</string> <string>my_source_title_list</string> </list> </value> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/my_source_title_list.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/my_source_title_list.xml index fe525e11c94b73d84c879a66a3aa1a87b65d8687..83da763cd0ec768544dba82bbc47a46a93ae2282 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/my_source_title_list.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/my_source_title_list.xml @@ -403,6 +403,10 @@ <list/> </value> </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -455,7 +459,7 @@ </item> <item> <key> <string>height</string> </key> - <value> <int>5</int> </value> + <value> <int>3</int> </value> </item> <item> <key> <string>hidden</string> </key> diff --git a/bt5/erp5_web/bt/change_log b/bt5/erp5_web/bt/change_log index a5b7db1bfd38191ac89265418641747a0bf0bfac..d5836efa4daa21bfd7a7be09f1eb5cfb53f0ed3a 100644 --- a/bt5/erp5_web/bt/change_log +++ b/bt5/erp5_web/bt/change_log @@ -1,3 +1,7 @@ +2006-08-23 Kevin +* Multiple Publication Sections can be set on Web Pages. +* One default page can be set on Web Section through agregate relation. + 2006-08-22 Kevin * Add default web site theme. * Set default web theme on newly created Web Sites. diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index a14c1ee5ab423ef2b6365bb156245892bcd7dfa9..80945bc4363d59056a852d30423fbd3517241b17 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -180 \ No newline at end of file +183 \ No newline at end of file diff --git a/bt5/erp5_web/bt/version b/bt5/erp5_web/bt/version index d81f1c3fc730cfe551aee61e773b0194f2bacd43..d156ab466031a29873bef2c2c0e538da85950a50 100644 --- a/bt5/erp5_web/bt/version +++ b/bt5/erp5_web/bt/version @@ -1 +1 @@ -0.2.9 \ No newline at end of file +0.2.10 \ No newline at end of file