From 3b3526c360876f4d98d39edda102deb567bf9519 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Wed, 17 Sep 2008 09:15:21 +0000
Subject: [PATCH] Report & domain listbox icons should not be disabled
explicitly in gadget mode. Respective gadget form's listbox settings should
be adjusted instead.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23667 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_xhtml_style/ListBox_asHTML.xml | 28 ++++---------------
.../bootstrap/erp5_xhtml_style/bt/revision | 2 +-
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
index 23cc08f017..40922ebcf5 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -41,12 +35,6 @@
</object>
</value>
</item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
@@ -84,7 +72,7 @@
name string:${field_id}_list_selection_name" />\n
<input tal:condition="md5_string" type="hidden" name="md5_object_uid_list" value="checksum" tal:attributes="value md5_string" />\n
\n
- <tal:block tal:condition="python:is_gadget_mode" >\n
+ <tal:block tal:condition="is_gadget_mode" >\n
<input tal:condition="python:form_id" \n
type="hidden" name="gadget_form_id"\n
tal:attributes="value form_id" />\n
@@ -101,7 +89,7 @@
<tal:block tal:define="expand python: 0">\n
<tal:block metal:define-macro="ListBoxContainer">\n
<tal:block tal:condition="expand">\n
- <table tal:condition="python: not is_gadget_mode and is_domain_tree_mode"\n
+ <table tal:condition="is_domain_tree_mode"\n
style="width: 100%;" cellpadding="0" cellspacing="0"\n
summary="This table contains the domain tree with the switch button"\n
tal:define="selected_domain_path here/getSelectedDomainPath">\n
@@ -307,7 +295,7 @@
summary="This table contains the listbox content">\n
<tr id="listbox_label_line" tal:attributes="id string:${field_id}_label_line;\n
class string:listbox_label_line">\n
- <td tal:condition="python: not is_gadget_mode and is_report_tree_mode"\n
+ <td tal:condition="is_report_tree_mode"\n
class="Data" style="width: 50px; text-align: left; vertical-align: middle">\n
<select name="report_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
@@ -320,7 +308,7 @@
</select>\n
</td>\n
<td class="AnchorColumn Data" tal:condition="show_anchor_column"> </td>\n
- <td tal:condition="python: not is_gadget_mode and show_select_column"\n
+ <td tal:condition="show_select_column"\n
class="Data" style="width: 50px; text-align: center; vertical-align: middle">\n
<input id="listbox_check_all" type="image"\n
name="checkAll:method" value="1"\n
@@ -378,7 +366,7 @@
<tr tal:condition="python: show_search_line or is_report_tree_mode"\n
id="listbox_search_line"\n
tal:attributes="id python: show_search_line and (\'%s_search_line\' % field_id) or (\'%s_report_depth_line\' % field_id)">\n
- <tal:block tal:condition="python: not is_gadget_mode and is_report_tree_mode">\n
+ <tal:block tal:condition="is_report_tree_mode">\n
<td class="Data" style="width: 50px; text-align: left; vertical-align: middle" colspan="1"\n
tal:attributes="colspan python: show_search_line and 1 or (len(here.getSelectedColumnList()) + show_select_column + show_anchor_column + 1)"\n
tal:define="index python: selection_index is not None and \'&selection_index=%s\' % selection_index or \'\';\n
@@ -508,12 +496,6 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <none/>
- </value>
- </item>
</dictionary>
</pickle>
</record>
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index e88ff725aa..0c7f592376 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-602
\ No newline at end of file
+604
\ No newline at end of file
--
2.30.9