diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
index 4f1e840c60b1f609301db7bec0cb5b8542178abd..4e16476b4182e48e1634743baa4e4b81be53312a 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
@@ -618,24 +618,23 @@ fieldset.bottom .field label {\n
float: left;\n
}\n
\n
-.content .field .input a{\n
+.content .field .input a {\n
vertical-align: middle;\n
}\n
\n
-.content .field .required,\n
-.content .field .reqerror {\n
+.content .field.reqerror label,\n
+.content .field.required label,\n
+.content .field .error {\n
font-weight: bold;\n
}\n
\n
-\n
-.content .field label.invisible {\n
- display: None;\n
+.content .field .error {\n
+ background-color: inherit;\n
+ color: #f00;\n
}\n
\n
-.error,\n
-.content .field .reqerror {\n
- background-color: inherit;\n
- color: #F00;\n
+.content .field.invisible label {\n
+ display: None;\n
}\n
\n
.login .submit {\n
@@ -669,8 +668,8 @@ fieldset.bottom .field label {\n
\n
#status,\n
#master {\n
- padding-left: 0.5em;\n
- padding-right: 0.5em;\n
+ padding-left: .5em;\n
+ padding-right: .5em;\n
}\n
\n
/* Context bar */\n
@@ -828,7 +827,7 @@ fieldset.bottom .field label {\n
\n
#transition_message {\n
margin-left: 1em;\n
- color: #F00;\n
+ color: #f00;\n
background-color: inherit;\n
font-weight: bold;\n
}\n
@@ -841,12 +840,12 @@ fieldset.bottom .field label {\n
border-width: 1px;\n
border-style: solid;\n
border-color: <dtml-var dialog_border_color>;\n
- padding: 0.5em;\n
+ padding: .5em;\n
margin-bottom: 1em;\n
}\n
\n
.list_dialog {\n
- margin-bottom: 0.5em;\n
+ margin-bottom: .5em;\n
}\n
\n
.dialog_selector button .description {\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
index df4e730e00462d563001e3a825020924a7f6be26..70305aba16b4e52da73babfa6431518a1f2a3541 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
@@ -70,35 +70,30 @@ GNU General Public License for more details.\n
You should have received a copy of the GNU General Public License\n
along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
+--></tal:block>\n
\n
-MISSING\n
- (jp) - way to decide when to display and when not to display a label\n
- (jp) - is CSS really handled ?\n
--->\n
-</tal:block>\n
<tal:block metal:define-macro="field_render">\n
- <tal:block tal:define="value python:request.get(field.id, None);\n
- field_errors python: request.get(\'field_errors\',{})">\n
- <tal:block tal:define="html_render python: field.render_htmlgrid(value, request)">\n
- <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
- <div tal:repeat="html_tuple html_render" class="field"\n
- tal:attributes="title python: here.Localizer.translate(\'erp5_ui\', here.Base_getFieldDescription(field))">\n
- <label tal:attributes="class python: ({0: {0: None, 1: \'required\'},\n
- 1: {0: \'error\', 1: \'reqerror\'}}[field_errors.has_key(field.id)][field.is_required()] or \'\') + \' \' + (field.get_value(\'css_class\') or \'\')">\n
- <tal:block tal:content="structure python: html_tuple[0]"\n
- i18n:translate="" i18n:domain="ui" />\n
- <tal:block tal:define="template python: here.developper_shortcut_render">\n
- <tal:block metal:use-macro="template/macros/field" />\n
- </tal:block>\n
- </label>\n
- <div class="input" tal:content="structure python: html_tuple[1]"/>\n
- <span tal:condition="python: field_errors.has_key(field.id)"\n
- class="error"\n
- tal:content="python: field_errors[field.id].error_text"\n
- i18n:translate="" i18n:domain="ui"/>\n
- </div>\n
- </tal:block>\n
- </tal:block>\n
+ <tal:block tal:condition="python: field.meta_type != \'HiddenStringField\'"\n
+ tal:define="value python: request.get(field.id, None);\n
+ field_errors python: request.get(\'field_errors\', {});\n
+ html_render python: field.render_htmlgrid(value, request)">\n
+ <div tal:repeat="html_tuple html_render"\n
+ tal:attributes="title python: here.Localizer.translate(\'erp5_ui\', here.Base_getFieldDescription(field));\n
+ class python: \'field \' + ({0: {0: None , 1: \'required\'},\n
+ 1: {0: \'error\', 1: \'reqerror\'}}[field_errors.has_key(field.id)][field.is_required()] or \'\') + \' \' + (field.get_value(\'css_class\') or \'\')">\n
+ <label>\n
+ <tal:block tal:content="structure python: html_tuple[0]"\n
+ i18n:translate="" i18n:domain="ui"/>\n
+ <tal:block tal:define="template python: here.developper_shortcut_render">\n
+ <tal:block metal:use-macro="template/macros/field"/>\n
+ </tal:block>\n
+ </label>\n
+ <div class="input" tal:content="structure python: html_tuple[1]"/>\n
+ <span tal:condition="python: field_errors.has_key(field.id)"\n
+ class="error"\n
+ tal:content="python: field_errors[field.id].error_text"\n
+ i18n:translate="" i18n:domain="ui"/>\n
+ </div>\n
</tal:block>\n
</tal:block>
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
index c5a4a79fc0a4727b1167b079d9e4ba1d5923da0e..0056d084d2fda15c88b10f5b1b9180c6d9c41b60 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
@@ -1,3 +1,7 @@
+2006-09-07 Kevin
+* Render field CSS classes on the div.field instead on the label for better styling.
+* Fix JP "missing" statement.
+
2006-09-04 Kevin
* Don't render non-editable fields in span.
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 9da06a18339c312235ed2a16c054f2bb70981398..09df927592b612404c098496f5fe35d89418ba17 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-160
\ No newline at end of file
+166
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
index 752b663d729e03514950b4dbc550c21df5a957fc..4582474e930e8eed253ab147a75dc77b18eb42f8 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
@@ -1 +1 @@
-1.2.24
\ No newline at end of file
+1.2.25
\ No newline at end of file