[Erp5-report] r9276 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplate...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Aug 21 13:38:50 CEST 2006
Author: chris
Date: Mon Aug 21 13:38:43 2006
New Revision: 9276
URL: http://svn.erp5.org?rev=9276&view=rev
Log:
2006-08-21 Chris
* Made form_render code a lot lighter with same final result using a loop
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml Mon Aug 21 13:38:43 2006
@@ -361,7 +361,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
*/\n
\n
-input, textarea, select, button, body, div, span {\n
+input, textarea, select, button, body, div, span, fieldset {\n
font-family: <dtml-var font_family>;\n
font-size: <dtml-var font_size>;\n
margin: 0;\n
@@ -381,11 +381,11 @@
border: 0;\n
}\n
\n
-body, div, span {\n
+body, div, span, fieldset {\n
color: <dtml-var font_color>;\n
}\n
\n
-div, span {\n
+div, span, fieldset {\n
background-color: inherit;\n
}\n
\n
@@ -418,6 +418,7 @@
text-decoration: underline;\n
}\n
\n
+p.clear,\n
h6.clear {\n
height: 0;\n
margin: 0;\n
@@ -505,21 +506,80 @@
\n
.content .field {\n
position: relative;\n
+ clear: left;\n
}\n
\n
.content .figure {\n
text-align: right;\n
}\n
\n
-.content .left {\n
- min-width: 50%;\n
+.group_title {\n
+ display: none;\n
+}\n
+\n
+div.left,\n
+fieldset.left {\n
+ width: 50%;\n
clear: left;\n
float: left;\n
-}\n
-\n
-.content .right {\n
+ border: 0;\n
+ height: 100%;\n
+ border-style: solid;\n
+ border-width: 0;\n
+/* border-top-width: 1px;\n
+ border-left-width: 1px;\n
+ border-bottom-width: 1px;\n
+ border-right-width: 0;*/\n
+ border-color: <dtml-var document_border_color>;\n
+ padding-top: 5px;\n
+ padding-bottom: 2px;\n
+ padding-left: 8px;\n
+ margin-right: -9px;\n
+}\n
+\n
+div.right,\n
+fieldset.right {\n
float: left;\n
width: 50%;\n
+ border: 0;\n
+ margin-left: -1px;\n
+ height: 100%;\n
+ border-style: solid;\n
+ border-width: 0;\n
+/* border-top-width: 1px;\n
+ border-left-width: 0;\n
+ border-bottom-width: 1px;\n
+ border-right-width: 1px;*/\n
+ border-color: <dtml-var document_border_color>;\n
+ padding-top: 5px;\n
+ padding-bottom: 2px;\n
+}\n
+\n
+div.center,\n
+fieldset.center {\n
+ margin-top: 5px;\n
+ margin-bottom: 5px;\n
+ padding-bottom: 5px;\n
+ padding-top: 5px;\n
+ border-style: solid;\n
+ border-color: <dtml-var document_border_color>;\n
+ border-width: 1px;\n
+}\n
+\n
+.document .content .top_group {\n
+ border-width: 1px;\n
+ border-style: solid;\n
+ padding: 5px;\n
+ margin-bottom: 5px;\n
+}\n
+\n
+\n
+fieldset.bottom {\n
+ border-width: 0;\n
+}\n
+\n
+fieldset.bottom .field label {\n
+ display: none;\n
}\n
\n
.content .field {\n
@@ -844,14 +904,6 @@
padding: 5px;\n
}\n
\n
-.document .content .top_group,\n
-.document .content .center {\n
- border-width: 1px;\n
- border-style: solid;\n
- padding: 5px;\n
- margin-bottom: 5px;\n
-}\n
-\n
/* LISTBOX */\n
/* FIXME:\n
- listbox uses lots of IDs, but there can be more than one listbox in a page !\n
@@ -891,6 +943,7 @@
.ListContent {\n
color: #000;\n
background-color: <dtml-var document_background_color>;\n
+ padding-left: 1px;\n
}\n
\n
.ListContent table {\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml Mon Aug 21 13:38:43 2006
@@ -36,7 +36,9 @@
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>/*\n
+ <value> <string encoding="cdata"><![CDATA[
+
+/*\n
Copyright (c) 20xx-2006 Nexedi SARL and Contributors. All Rights Reserved.\n
\n
This program is Free Software; you can redistribute it and/or\n
@@ -57,7 +59,22 @@
form.action = act;\n
form.submit();\n
}\n
-</string> </value>
+\n
+function fixLeftRightHeight(){\n
+ var lh=document.getElementById(\'fieldset_left\').offsetHeight;\n
+ var rh=document.getElementById(\'fieldset_right\').offsetHeight;\n
+ document.getElementById(\'fieldset_left\').style.height=(lh>rh)? lh+"px" : rh+"px";\n
+ document.getElementById(\'fieldset_right\').style.height=(lh>rh)? lh+"px" : rh+"px";\n
+ document.getElementById(\'fieldset_left\').style.borderTop = \'1px solid #3D7474\'\n
+ document.getElementById(\'fieldset_left\').style.borderLeft = \'1px solid #3D7474\'\n
+ document.getElementById(\'fieldset_left\').style.borderBottom = \'1px solid #3D7474\'\n
+ document.getElementById(\'fieldset_right\').style.borderTop = \'1px solid #3D7474\'\n
+ document.getElementById(\'fieldset_right\').style.borderRight = \'1px solid #3D7474\'\n
+ document.getElementById(\'fieldset_right\').style.borderBottom = \'1px solid #3D7474\'\n
+}\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml Mon Aug 21 13:38:43 2006
@@ -95,45 +95,19 @@
<tal:block metal:define-macro="master">\n
<tal:block tal:define="field_errors python: request.get(\'field_errors\',{});\n
dummy python: request.set(\'here\', here);\n
- left_group python: form.get_fields_in_group(\'left\');\n
- right_group python: form.get_fields_in_group(\'right\');\n
- center_group python: form.get_fields_in_group(\'center\');\n
- bottom_group python: form.get_fields_in_group(\'bottom\');">\n
+ groups python: form.get_groups();">\n
<tal:block tal:define="template python: here.developper_shortcut_render">\n
<tal:block metal:use-macro="template/macros/form" />\n
</tal:block>\n
- <div tal:condition="python: len(left_group) > 0 or len(right_group) > 0"\n
- class="top_group">\n
- <div tal:condition="python: len(left_group) > 0"\n
- class="left">\n
- <tal:block tal:repeat="field left_group">\n
- <tal:block metal:use-macro="here/field_render/macros/field_render" />\n
+ <tal:block tal:repeat="group groups">\n
+\t <fieldset tal:attributes="class group; id python: \'fieldset_\'+group" tal:condition="python: group.find(\'hidden\') < 0 and len(form.get_fields_in_group(group)) > 0">\n
+ <legend tal:content="group" class="group_title"/>\n
+ <tal:block tal:repeat="field python:form.get_fields_in_group(group)">\n
+ <tal:block metal:use-macro="here/field_render/macros/field_render"/>\n
</tal:block>\n
- </div>\n
- <div tal:condition="python: len(right_group) > 0"\n
- class="right">\n
- <tal:block tal:repeat="field right_group">\n
- <tal:block metal:use-macro="here/field_render/macros/field_render" />\n
- </tal:block>\n
- </div>\n
- <h6 class="clear"> </h6>\n
- </div>\n
- <div tal:condition="python: len(center_group) > 0"\n
- class="center">\n
- <tal:block tal:repeat="field center_group">\n
- <tal:block metal:use-macro="here/field_render/macros/field_render" />\n
- </tal:block>\n
- </div>\n
- <div tal:condition="python: len(bottom_group) > 0"\n
- class="bottom">\n
- <tal:block tal:repeat="field bottom_group">\n
- <tal:block tal:define="template python: here.developper_shortcut_render">\n
- <tal:block metal:use-macro="template/macros/field" />\n
- </tal:block>\n
- <tal:block tal:define="value python:request.get(field.id, None)"\n
- tal:replace="structure python:field.render(value, request)" />\n
- </tal:block>\n
- </div>\n
+ </fieldset>\n
+ <p tal:condition="python: group.find(\'right\') >= 0" class="clear"> </p>\n
+ </tal:block>\n
</tal:block>\n
</tal:block>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Mon Aug 21 13:38:43 2006
@@ -137,7 +137,7 @@
type="text/javascript"></script>\n
</tal:block>\n
</head>\n
- <body>\n
+ <body onload="fixLeftRightHeight()">\n
<!-- <tal:block tal:replace="structure request"/> -->\n
<form id="main_form"\n
tal:attributes="enctype form/enctype | nothing;\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Mon Aug 21 13:38:43 2006
@@ -1,3 +1,6 @@
+2006-08-21 Chris
+* Made form_render code a lot lighter with same final result using a loop
+
2006-08-02 Romain
* Add documentation_view to fix Inspector with xhtml_style.
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Mon Aug 21 13:38:43 2006
@@ -1,1 +1,1 @@
-81
+83
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version Mon Aug 21 13:38:43 2006
@@ -1,1 +1,1 @@
-1.1
+1.2
More information about the Erp5-report
mailing list