[Erp5-report] r10464 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Oct 2 10:41:01 CEST 2006


Author: vincent
Date: Mon Oct  2 10:40:47 2006
New Revision: 10464

URL: http://svn.erp5.org?rev=10464&view=rev
Log:
Fix listbox title and "logged in as" font size eing too small.
Fix border visible in dialog mode.
Fix border visible on login screen.
Fix dialogs not displaying left/righ groups next to each other (updated rendering code to follow updates to form_render).

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/form_dialog.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

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=10464&r1=10463&r2=10464&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 Oct  2 10:40:47 2006
@@ -614,6 +614,13 @@
   display: none;\n
 }\n
 \n
+.login fieldset,\n
+.dialog_box .left,\n
+.dialog_box .right,\n
+.dialog_box .center {\n
+  border-width: 0;\n
+}\n
+\n
 .content .field {\n
   padding-bottom: 5px;\n
 }\n
@@ -832,7 +839,6 @@
 \n
 #logged_in_as {\n
   float: right;\n
-  font-size: 90%;\n
 }\n
 \n
 #logged_in_as .logged_txt{\n
@@ -951,7 +957,9 @@
   padding-left: 10px;\n
 }\n
 \n
-.ListSummary * {\n
+.ListSummary #listbox_title,\n
+.ListSummary #listbox_record_number,\n
+.ListSummary #listbox_item_number {\n
   font-size: 90%;\n
 }\n
 \n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml?rev=10464&r1=10463&r2=10464&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml Mon Oct  2 10:40:47 2006
@@ -110,31 +110,26 @@
                     i18n:translate="" i18n:domain="ui">Go</span>\n
             </button>\n
           </div>\n
-          <div class="content">\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>\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
-              <p class="clear">&nbsp;</p>\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
-                <p class="clear"></p>\n
+          <div class="content"\n
+                      tal:define="group_list   python: [];\n
+                      dummy        python: group_list.extend([here.ERP5XhtmlStyle_getFormGroupTitleAndId(x) for x in form.get_groups(include_empty=0) if x != \'bottom\']);\n
+                      gid_list     python: \' \'.join([x[0] for x in group_list]);">\n
+            <tal:block tal:repeat="group group_list">\n
+              <tal:block tal:define="gid     python: group[0];\n
+                                    gtitle  python: group[1];\n
+                                    goid    python: group[2];">\n
+                <fieldset tal:condition="python: gid.find(\'hidden\') < 0"\n
+                  tal:attributes="class python: gid;\n
+                                  id    python: \'fieldset_\' + gid.replace(\' \', \'_\');">\n
+                  <legend tal:content="python: gtitle" class="group_title"/>\n
+                  <tal:block tal:repeat="field python: form.get_fields_in_group(goid)">\n
+                    <tal:block metal:use-macro="here/field_render/macros/field_render"/>\n
+                  </tal:block>\n
+                </fieldset>\n
+                <p tal:condition="python: gid.find(\'right\') >= 0 or (gid.find(\'left\') >= 0 and \'right\' not in gid_list)" class="clear"/>\n
               </tal:block>\n
-            </div>\n
-          <p class="clear"></p>\n
+            </tal:block>\n
+            <p class="clear"></p>\n
           </div>\n
         </div>\n
       </tal:block>\n

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=10464&r1=10463&r2=10464&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Mon Oct  2 10:40:47 2006
@@ -1,1 +1,1 @@
-235
+237




More information about the Erp5-report mailing list