[Erp5-report] r22569 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 18 18:47:30 CEST 2008
Author: rafael
Date: Fri Jul 18 18:47:30 2008
New Revision: 22569
URL: http://svn.erp5.org?rev=22569&view=rev
Log:
Updated the Business Template Installation UI.
- Changed Selection to a CheckBox
- Removed Unused Actions
Now the behavior is :
- do the action showed when clicked
- or (Do Nothing or Keep Original) when it is uncheck.
It supports multiple check or uncheck using shift.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox_choice.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog/listbox_choice.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml?rev=22569&r1=22568&r2=22569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml Fri Jul 18 18:47:30 2008
@@ -97,35 +97,22 @@
object_state, object_class = modified_object_list[object_id]\n
line = newTempBase(context, \'tmp_install_%s\' %(str(i)))\n
if object_state == \'New\':\n
- line.edit(object_id=object_id, object_state=object_state,\n
- object_class=object_class,\n
- choice_item_list=[[\'Install\', \'install\'],\n
- [\'Do Nothing\', \'nothing\']])\n
+ choice_item_list=[[\'Install\', \'install\']]\n
elif object_state == \'Modified\':\n
if object_class in no_backup_dict:\n
- line.edit(object_id=object_id, object_state=object_state,\n
- object_class=object_class,\n
- choice_item_list=[[\'Upgrade\', \'install\'],\n
- [\'Keep Original\', \'nothing\']])\n
+ choice_item_list=[[\'Upgrade\', \'install\']]\n
else:\n
- line.edit(object_id=object_id, object_state=object_state,\n
- object_class=object_class,\n
- choice_item_list=[[\'Backup And Upgrade\', \'backup\'],\n
- [\'Upgrade\', \'install\'],\n
- [\'Keep Original\', \'nothing\']])\n
+ choice_item_list=[[\'Backup And Upgrade\', \'backup\']]\n
elif object_state == \'Removed\':\n
if object_class in no_backup_dict:\n
- line.edit(object_id=object_id,\n
+ choice_item_list=[[\'Remove\', \'remove\']]\n
+ else:\n
+ choice_item_list=[[\'Backup And Remove\', \'save_and_remove\']]\n
+\n
+ line.edit(object_id=object_id,\n
object_state=object_state,\n
object_class=object_class,\n
- choice_item_list=[[\'Remove\', \'remove\'],\n
- [\'Keep Original\', \'nothing\']])\n
- else:\n
- line.edit(object_id=object_id, object_state=object_state,\n
- object_class=object_class,\n
- choice_item_list=[[\'Backup And Remove\', \'save_and_remove\'],\n
- [\'Remove\', \'remove\'],\n
- [\'Keep Original\', \'nothing\']])\n
+ choice_item_list=choice_item_list)\n
line.setUid(\'new_%s\' % object_id)\n
object_list.append(line)\n
i += 1 \n
@@ -202,6 +189,7 @@
<string>object_class</string>
<string>str</string>
<string>line</string>
+ <string>choice_item_list</string>
<string>_inplacevar_</string>
</tuple>
</value>
@@ -222,6 +210,12 @@
<value> <string>BusinessTemplate_getModifiedObject</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml?rev=22569&r1=22568&r2=22569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml Fri Jul 18 18:47:30 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ListBox</string>
- <string>ListBox</string>
- </tuple>
- <none/>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -334,6 +331,10 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>columns</string> </key>
<value>
<list>
@@ -537,11 +538,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox_choice.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox_choice.xml?rev=22569&r1=22568&r2=22569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox_choice.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox_choice.xml Fri Jul 18 18:47:30 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="MultiCheckBoxField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -68,18 +65,10 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<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>
</item>
@@ -88,14 +77,14 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
@@ -104,7 +93,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>
@@ -124,7 +113,9 @@
</item>
<item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -143,36 +134,28 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<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>
</item>
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
@@ -181,7 +164,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>
@@ -197,11 +180,13 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>shift_check_support</string> </value>
</item>
<item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -220,16 +205,8 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
- <value> <int>1</int> </value>
+ <value> <string>tabindex=1000 onclick="shiftCheck(event)"</string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
@@ -238,49 +215,32 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
- <string>install</string>
- <string>install</string>
- </tuple>
- <tuple>
- <string>btnew</string>
- <string>btnew</string>
- </tuple>
- <tuple>
- <string>nothing</string>
- <string>nothing</string>
- </tuple>
- <tuple>
- <string>btsave</string>
- <string>btsave</string>
- </tuple>
- <tuple>
- <string>remove</string>
- <string>remove</string>
- </tuple>
- </list>
- </value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>orientation</string> </key>
+ <value> <string>horizontal</string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
<key> <string>title</string> </key>
- <value> <string>Installation Choice</string> </value>
+ <value> <string>listbox_choice</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<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>
@@ -291,11 +251,24 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: cell.choice_item_list[0][1]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml?rev=22569&r1=22568&r2=22569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml Fri Jul 18 18:47:30 2008
@@ -96,8 +96,8 @@
<key> <string>hidden</string> </key>
<value>
<list>
+ <string>listbox_object_id</string>
<string>listbox_choice</string>
- <string>listbox_object_id</string>
</list>
</value>
</item>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog/listbox_choice.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog/listbox_choice.xml?rev=22569&r1=22568&r2=22569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog/listbox_choice.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog/listbox_choice.xml Fri Jul 18 18:47:30 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="MultiCheckBoxField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -68,18 +65,10 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<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>
</item>
@@ -88,14 +77,14 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
@@ -104,7 +93,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>
@@ -124,7 +113,9 @@
</item>
<item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -143,36 +134,28 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<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>
</item>
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
@@ -181,7 +164,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>
@@ -197,11 +180,13 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>bt_install_checkbox</string> </value>
</item>
<item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -220,16 +205,8 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
- <value> <int>1</int> </value>
+ <value> <string>tabindex=1000 onclick="clickage(event)"</string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
@@ -238,49 +215,32 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
- <string>install</string>
- <string>install</string>
- </tuple>
- <tuple>
- <string>btnew</string>
- <string>btnew</string>
- </tuple>
- <tuple>
- <string>nothing</string>
- <string>nothing</string>
- </tuple>
- <tuple>
- <string>btsave</string>
- <string>btsave</string>
- </tuple>
- <tuple>
- <string>remove</string>
- <string>remove</string>
- </tuple>
- </list>
- </value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>orientation</string> </key>
+ <value> <string>horizontal</string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
<key> <string>title</string> </key>
- <value> <string>Installation Choice</string> </value>
+ <value> <string>listbox_choice</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<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>
@@ -291,11 +251,24 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: cell.choice_item_list[0][1]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=22569&r1=22568&r2=22569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Jul 18 18:47:30 2008
@@ -1,1 +1,1 @@
-881
+882
More information about the Erp5-report
mailing list