[Erp5-report] r7452 - in /erp5/trunk/products/ERP5/bootstrap/erp5_html_style: SkinTemplateI...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue May 23 15:49:51 CEST 2006
Author: kevin
Date: Tue May 23 15:49:48 2006
New Revision: 7452
URL: http://svn.erp5.org?rev=7452&view=rev
Log:
Reduce report_view tag "soupness"
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_view.xml
erp5/trunk/products/ERP5/bootstrap/erp5_html_style/bt/change_log
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_view.xml?rev=7452&r1=7451&r2=7452&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_view.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_view.xml Tue May 23 15:49:48 2006
@@ -15,7 +15,16 @@
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
- <none/>
+ <dictionary>
+ <item>
+ <key> <string>kevin</string> </key>
+ <value>
+ <list>
+ <string>Owner</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -45,6 +54,18 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>kevin</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
@@ -78,18 +99,19 @@
global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
default_layout string:view_master;\n
layout_id layout_form/pt | default_layout;">\n
-<tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
+\n
+<tal:block metal:use-macro="python: getattr(here,layout_id).macros[\'master\']">\n
<tal:block metal:fill-slot="main">\n
<div class="Main">\n
- <span tal:define="groups python: form.get_groups(include_empty=1);\n
- field_errors python: request.get(\'field_errors\',{});\n
- dummy python: request.set(\'here\',here)">\n
- <table class="Border" width="100%" tal:condition="python:len(form.get_fields_in_group(groups[0])) > 0\n
+ <tal:block tal:define="groups python: form.get_groups(include_empty=1);\n
+ field_errors python: request.get(\'field_errors\',{});\n
+ dummy python: request.set(\'here\',here)">\n
+ <table class="Border" width="100%" tal:condition="python: len(form.get_fields_in_group(groups[0])) > 0\n
or len(form.get_fields_in_group(groups[1])) > 0">\n
<tr>\n
<td valign="top">\n
<table>\n
- <span tal:repeat="field python:form.get_fields_in_group(groups[0])">\n
+ <tal:block tal:repeat="field python:form.get_fields_in_group(groups[0])">\n
<tr tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
<td tal:content="structure field/title"\n
tal:condition="python: field_errors.has_key(field.id)\n
@@ -126,12 +148,12 @@
class="error">\n
</td>\n
</tr>\n
- </span>\n
+ </tal:block>\n
</table>\n
</td>\n
<td valign="top" tal:condition="python: len(groups)>1">\n
<table>\n
- <span tal:repeat="field python:form.get_fields_in_group(groups[1])">\n
+ <tal:block tal:repeat="field python:form.get_fields_in_group(groups[1])">\n
<tr tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
<td tal:content="structure field/title"\n
tal:condition="python: field_errors.has_key(field.id)\n
@@ -168,62 +190,58 @@
class="error">\n
</td>\n
</tr>\n
- </span>\n
+ </tal:block>\n
</table>\n
</td>\n
</tr>\n
</table>\n
- <span tal:condition="python: len(groups)>2">\n
- <table class="Border" tal:condition="python:len(form.get_fields_in_group(groups[2])) > 0">\n
- <td>\n
- <table>\n
- <span tal:repeat="field python:form.get_fields_in_group(groups[2])">\n
- <tr tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
- <td tal:content="structure field/title"\n
- tal:condition="python: field_errors.has_key(field.id)\n
- and not field.is_required()"\n
- i18n:translate="" i18n:domain="ui"\n
- class="error">\n
- </td>\n
- <td tal:content="structure field/title"\n
- tal:condition="python: (not field_errors.has_key(field.id))\n
- and not field.is_required()"\n
- i18n:translate="" i18n:domain="ui">\n
- </td>\n
- <td tal:content="structure field/title"\n
- tal:condition="python: field_errors.has_key(field.id)\n
- and field.is_required()"\n
- i18n:translate="" i18n:domain="ui"\n
- class="reqerror">\n
- </td>\n
- <td tal:content="structure field/title"\n
- tal:condition="python: (not field_errors.has_key(field.id))\n
- and field.is_required()"\n
- i18n:translate="" i18n:domain="ui"\n
- class="required">\n
- </td>\n
- <td tal:define="value python:request.get(field.id,None)">\n
- <tal:block tal:replace="structure python:field.render(value,request)"/>\n
- </td>\n
- </tr>\n
- <tr tal:condition="python: field_errors.has_key(field.id)">\n
- <td tal:content="python: field_errors[field.id].error_text"\n
- i18n:translate="" i18n:domain="ui"\n
- class="error">\n
- </td>\n
- </tr>\n
- </span>\n
- </table>\n
- </td>\n
- </table>\n
- </span>\n
- <span tal:condition="python: len(groups)>3">\n
- <span tal:repeat="field python:form.get_fields_in_group(groups[3])">\n
- <span tal:define="value python:request.get(field.id,None)"\n
- tal:replace="structure python:field.render(value,request)" />\n
- </span>\n
- </span>\n
- </span>\n
+\n
+ <table class="Border" tal:condition="python: len(groups) > 2 and len(form.get_fields_in_group(groups[2])) > 0">\n
+ <tal:block tal:repeat="field python:form.get_fields_in_group(groups[2])">\n
+ <tr tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
+ <td tal:content="structure field/title"\n
+ tal:condition="python: field_errors.has_key(field.id)\n
+ and not field.is_required()"\n
+ i18n:translate="" i18n:domain="ui"\n
+ class="error">\n
+ </td>\n
+ <td tal:content="structure field/title"\n
+ tal:condition="python: (not field_errors.has_key(field.id))\n
+ and not field.is_required()"\n
+ i18n:translate="" i18n:domain="ui">\n
+ </td>\n
+ <td tal:content="structure field/title"\n
+ tal:condition="python: field_errors.has_key(field.id)\n
+ and field.is_required()"\n
+ i18n:translate="" i18n:domain="ui"\n
+ class="reqerror">\n
+ </td>\n
+ <td tal:content="structure field/title"\n
+ tal:condition="python: (not field_errors.has_key(field.id))\n
+ and field.is_required()"\n
+ i18n:translate="" i18n:domain="ui"\n
+ class="required">\n
+ </td>\n
+ <td tal:define="value python:request.get(field.id,None)">\n
+ <tal:block tal:replace="structure python:field.render(value,request)"/>\n
+ </td>\n
+ </tr>\n
+ <tr tal:condition="python: field_errors.has_key(field.id)">\n
+ <td tal:content="python: field_errors[field.id].error_text"\n
+ i18n:translate="" i18n:domain="ui"\n
+ class="error">\n
+ </td>\n
+ </tr>\n
+ </tal:block>\n
+ </table>\n
+\n
+ <tal:block tal:condition="python: len(groups) > 3"\n
+ tal:repeat="field python: form.get_fields_in_group(groups[3])">\n
+ <tal:block tal:replace="structure python: field.render(request.get(field.id, None), request)"/>\n
+ </tal:block>\n
+\n
+ </tal:block>\n
+\n
<tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
<tal:block tal:repeat="report_item python:report_method()">\n
<tal:block tal:define="here python:report_item.getObject(portal_object);\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_html_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_html_style/bt/change_log?rev=7452&r1=7451&r2=7452&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_html_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_html_style/bt/change_log Tue May 23 15:49:48 2006
@@ -1,3 +1,6 @@
+2006-05-23 Kevin
+* Reduce report_view tag "soupness".
+
2006-05-22 Vincent
* Add "developper mode" buttons.
More information about the Erp5-report
mailing list