From f87386c9106775524af34c19b703163a65009d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 26 Jun 2007 17:58:33 +0000 Subject: [PATCH] Updated Organisation view: * role is now a multi listfield * all listfields uses translated logical path item list * my_title set in center group, to take 100% width * use preference for date order git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14990 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Entity_viewFinancialInformationList.xml | 8 +-- .../erp5_base/Organisation_view.xml | 4 +- .../Organisation_view/my_activity.xml | 2 +- .../erp5_base/Organisation_view/my_group.xml | 2 +- .../{my_role.xml => my_role_list.xml} | 38 ++++++------- .../erp5_base/Organisation_view/my_site.xml | 2 +- .../my_start_date.xml | 53 ++++++++++++++----- .../erp5_base/Organisation_viewPersonList.xml | 8 +-- bt5/erp5_base/bt/revision | 2 +- 9 files changed, 71 insertions(+), 48 deletions(-) rename bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/{my_role.xml => my_role_list.xml} (90%) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFinancialInformationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFinancialInformationList.xml index a14e11c602..5d586c12db 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFinancialInformationList.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFinancialInformationList.xml @@ -89,15 +89,15 @@ <item> <key> <string>center</string> </key> <value> - <list/> + <list> + <string>my_title</string> + </list> </value> </item> <item> <key> <string>left</string> </key> <value> - <list> - <string>my_title</string> - </list> + <list/> </value> </item> <item> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml index 414be758df..a41ca97224 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml @@ -101,10 +101,9 @@ <string>my_title</string> <string>my_corporate_name</string> <string>my_group</string> - <string>my_role</string> + <string>my_role_list</string> <string>my_activity</string> <string>my_site</string> - <string>my_translated_validation_state_title</string> </list> </value> </item> @@ -119,6 +118,7 @@ <string>my_default_address_zip_code</string> <string>my_default_address_city</string> <string>my_default_address_region</string> + <string>my_translated_validation_state_title</string> </list> </value> </item> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml index 0cf2f0f7cd..4ce4a51851 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml @@ -281,7 +281,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/activity/getCategoryChildCompactLogicalPathItemList</string> </value> + <value> <string>here/portal_categories/activity/getCategoryChildTranslatedLogicalPathItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml index ea4956e9f6..054cd04d8c 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml @@ -281,7 +281,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/group/getCategoryChildCompactLogicalPathItemList</string> </value> + <value> <string>here/portal_categories/group/getCategoryChildTranslatedLogicalPathItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_list.xml similarity index 90% rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_list.xml index ff4b8ce78b..18c9fd75be 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_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_role</string> </value> + <value> <string>my_role_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> @@ -243,11 +233,11 @@ </item> <item> <key> <string>required</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </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> @@ -281,7 +275,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/role/getCategoryChildCompactLogicalPathItemList</string> </value> + <value> <string>here/portal_categories/role/getCategoryChildTranslatedLogicalPathItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml index 70563c242b..97d29ba857 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml @@ -281,7 +281,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/site/getCategoryChildCompactLogicalPathItemList</string> </value> + <value> <string>here/portal_categories/site/getCategoryChildTranslatedLogicalPathItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml index 56c17d385b..85789beca7 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml @@ -193,9 +193,19 @@ <value> <string></string> </value> </item> <item> - <key> <string>input_order</string> </key> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> <item> <key> <string>input_style</string> </key> <value> <string></string> </value> @@ -346,37 +356,37 @@ <item> <key> <string>ampm</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> <key> <string>day</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> </value> </item> <item> <key> <string>hour</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> <key> <string>minute</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> </value> </item> <item> <key> <string>month</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> </value> </item> <item> <key> <string>year</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> </value> </item> </dictionary> @@ -449,6 +459,25 @@ </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> @@ -711,7 +740,7 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="5" aka="AAAAAAAAAAU="> <pickle> <tuple> <tuple> @@ -966,7 +995,7 @@ </dictionary> </pickle> </record> - <record id="5" aka="AAAAAAAAAAU="> + <record id="6" aka="AAAAAAAAAAY="> <pickle> <tuple> <tuple> @@ -1221,7 +1250,7 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -1476,7 +1505,7 @@ </dictionary> </pickle> </record> - <record id="7" aka="AAAAAAAAAAc="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -1731,7 +1760,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewPersonList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewPersonList.xml index a5de6a8c6a..26695dedab 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewPersonList.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewPersonList.xml @@ -90,7 +90,9 @@ <item> <key> <string>center</string> </key> <value> - <list/> + <list> + <string>my_title</string> + </list> </value> </item> <item> @@ -102,9 +104,7 @@ <item> <key> <string>left</string> </key> <value> - <list> - <string>my_title</string> - </list> + <list/> </value> </item> <item> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 3fdc173dab..d800886d9c 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -122 \ No newline at end of file +123 \ No newline at end of file -- 2.30.9