From f0c5f47f6397545a99408c2c318a8872eb3f59a0 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Mon, 4 Aug 2008 10:51:43 +0000 Subject: [PATCH] - delegate some property fields to proxyfields - use preference order for date fields - change field order git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22855 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_egov/Organisation_viewDetails.xml | 4 ++-- .../Organisation_viewDetails/my_acronym.xml | 5 ----- .../Organisation_viewDetails/my_sign.xml | 5 ----- .../Organisation_viewDetails/my_start_date.xml | 8 +------- .../Organisation_viewDetails/my_stop_date.xml | 17 ++++++++++------- bt5/erp5_egov/bt/revision | 2 +- 6 files changed, 14 insertions(+), 27 deletions(-) diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails.xml index e9df2c9ae3..7fd544749c 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails.xml @@ -108,11 +108,11 @@ <string>my_start_date</string> <string>my_stop_date</string> <string>my_skill_list</string> + <string>my_acronym</string> + <string>my_sign</string> <string>my_reference</string> <string>my_password</string> <string>password_confirm</string> - <string>my_acronym</string> - <string>my_sign</string> </list> </value> </item> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_acronym.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_acronym.xml index eedd95ff72..a36e3d5a28 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_acronym.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_acronym.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>display_width</string> </list> </value> </item> @@ -75,10 +74,6 @@ <key> <string>values</string> </key> <value> <dictionary> - <item> - <key> <string>display_width</string> </key> - <value> <int>20</int> </value> - </item> <item> <key> <string>field_id</string> </key> <value> <string>my_string_field</string> </value> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_sign.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_sign.xml index 24bc246251..f8ef97e00b 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_sign.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_sign.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>display_width</string> </list> </value> </item> @@ -75,10 +74,6 @@ <key> <string>values</string> </key> <value> <dictionary> - <item> - <key> <string>display_width</string> </key> - <value> <int>20</int> </value> - </item> <item> <key> <string>field_id</string> </key> <value> <string>my_string_field</string> </value> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_start_date.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_start_date.xml index 44aef7eaff..8ecf2515a1 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_start_date.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_start_date.xml @@ -12,9 +12,7 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list> - <string>input_order</string> - </list> + <list/> </value> </item> <item> @@ -82,10 +80,6 @@ <key> <string>form_id</string> </key> <value> <string>Organisation_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>input_order</string> </key> - <value> <string>dmy</string> </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_stop_date.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_stop_date.xml index 87b24eaba4..77a2b03062 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_stop_date.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_stop_date.xml @@ -15,7 +15,6 @@ <list> <string>title</string> <string>description</string> - <string>input_order</string> </list> </value> </item> @@ -57,6 +56,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -69,6 +72,10 @@ <key> <string>target</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -83,7 +90,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The date the organisation was stopped.</string> </value> </item> <item> @@ -94,16 +101,12 @@ <key> <string>form_id</string> </key> <value> <string>Organisation_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>input_order</string> </key> - <value> <string>dmy</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> + <key> <string>title</string> </key> <value> <string>Stop Date</string> </value> </item> </dictionary> diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index c5a644422f..6dd90d24d3 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -221 \ No newline at end of file +222 \ No newline at end of file -- 2.30.9