Skip to content

erp5
erp5
Commit f87386c9 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

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
parent 96f77bae
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 48 deletions
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFinancialInformationList.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role.xml → bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_list.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewPersonList.xml
View file @ f87386c9
......@@ -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>
......
bt5/erp5_base/bt/revision
View file @ f87386c9
122
\ No newline at end of file
123
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7