From f9d903d8f724a5e471bbc8b0a78f370a154ae2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 16 Jul 2009 09:36:29 +0000
Subject: [PATCH] - use TradeCondition_viewTradeModelLineList as base for
Delivery_viewTradeModelLineList to have maximum consistency in UI
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28093 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../Delivery_viewTradeModelLineList.xml | 2 +
.../listbox.xml | 59 +-----------
.../listbox_base_application_title_list.xml | 93 +++++++++++++++++++
.../listbox_base_contribution_title_list.xml | 93 +++++++++++++++++++
.../listbox_price.xml | 4 +-
.../my_title.xml | 10 +-
6 files changed, 195 insertions(+), 66 deletions(-)
create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList.xml
index 358f5cf1ed..d9cd7e812f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList.xml
@@ -94,6 +94,8 @@
<key> <string>hidden</string> </key>
<value>
<list>
+ <string>listbox_base_application_title_list</string>
+ <string>listbox_base_contribution_title_list</string>
<string>listbox_price</string>
<string>listbox_reference</string>
</list>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox.xml
index b0ce9f975e..230242fde5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox.xml
@@ -13,11 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>columns</string>
<string>editable_columns</string>
- <string>portal_types</string>
<string>selection_name</string>
- <string>title</string>
</list>
</value>
</item>
@@ -78,41 +75,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>reference</string>
- <string>Reference</string>
- </tuple>
- <tuple>
- <string>resource_title</string>
- <string>Service</string>
- </tuple>
- <tuple>
- <string>price</string>
- <string>Price</string>
- </tuple>
- <tuple>
- <string>base_application_title_list</string>
- <string>Base Applications</string>
- </tuple>
- <tuple>
- <string>base_contribution_title_list</string>
- <string>Base Contributions</string>
- </tuple>
- <tuple>
- <string>trade_phase_title</string>
- <string>Trade Phase</string>
- </tuple>
- </list>
- </value>
- </item>
<item>
<key> <string>editable_columns</string> </key>
<value>
@@ -130,35 +92,20 @@
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox</string> </value>
+ <value> <string>listbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value>
- <list>
- <tuple>
- <string>Trade Model Line</string>
- <string>Trade Model Line</string>
- </tuple>
- </list>
- </value>
+ <value> <string>TradeCondition_viewTradeModelLineList</string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
- <value> <string>trade_condition_view_trade_model_line_list_selection</string> </value>
+ <value> <string>delivery_view_trade_model_line_list_selection</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>
- <value> <string>Trade Model Lines</string> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
new file mode 100644
index 0000000000..65edb9d3e3
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_base_application_title_list</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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>listbox_base_application_title_list</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>TradeCondition_viewTradeModelLineList</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
new file mode 100644
index 0000000000..05be98f642
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_base_contribution_title_list</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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>listbox_base_contribution_title_list</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>TradeCondition_viewTradeModelLineList</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_price.xml
index d05aeb5e6b..bb2a36a2ec 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/listbox_price.xml
@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_percent</string> </value>
+ <value> <string>listbox_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
+ <value> <string>TradeCondition_viewTradeModelLineList</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/my_title.xml
index 318d6ff5dd..986c94c2cf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewTradeModelLineList/my_title.xml
@@ -12,9 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>editable</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -74,17 +72,13 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
+ <value> <string>TradeCondition_viewTradeModelLineList</string> </value>
</item>
<item>
<key> <string>target</string> </key>
--
2.30.9