From 79c4a044038e6b777c7707f18021fdf033e748da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 26 Jun 2007 18:56:05 +0000 Subject: [PATCH] Integrate thierry's changes on person view, use preference for dates, translated logical path for listfields and move workflow title to the bottom right. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14995 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_base/Person_view.xml | 2 +- .../Person_view/my_default_address_region.xml | 2 +- .../erp5_base/Person_view/my_gender.xml | 2 +- .../erp5_base/Person_view/my_nationality.xml | 2 +- .../erp5_base/Person_viewAssignment.xml | 4 +- .../Person_viewCareer/my_career_role.xml | 2 +- .../my_career_start_date.xml | 53 ++++++++++++++----- .../Person_viewCareer/my_career_stop_date.xml | 53 ++++++++++++++----- .../Person_viewDetails/my_birthday.xml | 53 ++++++++++++++----- .../Person_viewProfile/my_career_role.xml | 2 +- bt5/erp5_base/bt/revision | 2 +- 11 files changed, 132 insertions(+), 45 deletions(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml index 802fbb5448..536e2d5796 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml @@ -103,7 +103,6 @@ <string>my_career_subordination_title</string> <string>my_gender</string> <string>my_nationality</string> - <string>my_translated_validation_state_title</string> </list> </value> </item> @@ -118,6 +117,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/Person_view/my_default_address_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.xml index 14c38dafb4..565f482650 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.xml @@ -281,7 +281,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/region/getCategoryChildCompactLogicalPathItemList</string> </value> + <value> <string>here/portal_categories/region/getCategoryChildTranslatedLogicalPathItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml index e8f63c127c..600c673642 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml @@ -281,7 +281,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.portal_categories.gender.getCategoryChildCompactLogicalPathItemList(sort_id=\'int_index\')</string> </value> + <value> <string>python: here.portal_categories.gender.getCategoryChildTranslatedLogicalPathItemList(sort_id=\'int_index\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml index 9edec560d7..7d46aeec60 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml @@ -281,7 +281,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/nationality/getCategoryChildCompactLogicalPathItemList</string> </value> + <value> <string>here/portal_categories/nationality/getCategoryChildTranslatedLogicalPathItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml index bd8bb3af62..d6715faf9c 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml @@ -67,7 +67,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> + <string>center</string> <string>bottom</string> </list> </value> @@ -85,7 +85,7 @@ </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>center</string> </key> <value> <list> <string>my_title</string> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_role.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_role.xml index 4765e672d8..6b7d42879a 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_role.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_role.xml @@ -281,7 +281,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/Person_viewCareer/my_career_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_start_date.xml index 25537dc299..88963415f6 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_start_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_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/Person_viewCareer/my_career_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_stop_date.xml index 8daa63556f..ebe12ba7a4 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_stop_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_stop_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/Person_viewDetails/my_birthday.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birthday.xml index 81ea60f019..e33264599d 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birthday.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birthday.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/Person_viewProfile/my_career_role.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile/my_career_role.xml index 4765e672d8..6b7d42879a 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile/my_career_role.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile/my_career_role.xml @@ -281,7 +281,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/bt/revision b/bt5/erp5_base/bt/revision index a09fd8ad47..00c98bb3ad 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -124 \ No newline at end of file +125 \ No newline at end of file -- 2.30.9