From ae05f19c05ac8b2ff1e8c6e133be36719cf25329 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Mon, 2 Oct 2006 08:40:47 +0000 Subject: [PATCH] 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). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10464 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_xhtml_style/erp5.css.xml | 12 +++++- .../erp5_xhtml_style/form_dialog.xml | 43 ++++++++----------- .../bootstrap/erp5_xhtml_style/bt/revision | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) 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 f1470db3f7..01ca1db1f6 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 @@ -614,6 +614,13 @@ fieldset.bottom .field label {\n 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 @@ fieldset.bottom .field label {\n \n #logged_in_as {\n float: right;\n - font-size: 90%;\n }\n \n #logged_in_as .logged_txt{\n @@ -951,7 +957,9 @@ fieldset.bottom .field label {\n 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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml index ca38227281..42739b8420 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml @@ -110,31 +110,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n 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"> </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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index c72784c8c5..f71beab75f 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -235 \ No newline at end of file +237 \ No newline at end of file -- 2.30.9