diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml index 74c148584d21fc71ce349226f1f413d8f8f07d6d..0b88daf0392a1855c98eb1aefe8d6e609e0e9bd1 100644 --- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml +++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml @@ -52,6 +52,7 @@ \n <tal:block define="\n site_url python:here.getWebSiteValue().absolute_url();\n + has_right_column python:bool(here.getLayoutProperty(\'layout_right_column\', False));\n body_color python:here.getLayoutProperty(\'layout_body_color\', \'rgb(240,240,240)\');\n primary_color python:here.getLayoutProperty(\'layout_primary_color\', \'rgb(200,200,200)\');\n secondary_color python:here.getLayoutProperty(\'layout_secondary_color\', \'rgb(225,225,225)\');\n @@ -63,11 +64,10 @@ header_background_image python:here.getLayoutProperty(\'layout_header_background_image\', \n \'mf54_image/bg_header.jpg\');\n header_background_image python:\'%s/%s\' % (site_url, header_background_image);\n - right_column python:here.getLayoutProperty(\'layout_right_column\', False);\n right_column_width python:here.getLayoutProperty(\'layout_right_column_width\', 270);\n right_column_padding python:here.getLayoutProperty(\'layout_right_column_padding\', 12);\n - main_content_width python:main_width - right_column_padding - right_column_width;\n - content_icon_width python:(not right_column) * (right_column_width + right_column_padding);\n + main_content_width python:main_width - (right_column_padding + right_column_width) * ((has_right_column or 0) and 1);\n + content_icon_width python:(not has_right_column) * (right_column_width + right_column_padding);\n ">\n \n /****************************************************************/\n @@ -376,6 +376,22 @@ fieldset.editable.bottom div.input {\n font-weight: bold;\n }\n \n +button.sort_button {\n + background-color: inherit;\n + color: inherit;\n + border-width: 0;\n + cursor: pointer;\n + margin: 0;\n + padding: 0;\n +}\n +\n +button.sort_button span {\n + color: inherit;\n + text-decoration: underline;\n + font-size: 62.5% !important;\n + font-weight: bold;\n +}\n +\n /* Edit tabs styling.\n ** Edit tabs are another part of admin stuffs and\n ** should respect other admin design convention\n @@ -425,6 +441,10 @@ div.input select, div.input textarea {\n border: 1px solid #999;\n }\n \n +#fieldset_bottom > div.field > div.input > textarea {\n + width:<tal:block tal:replace="python:main_content_width-2"/>px;\n +}\n +\n div.bottom_actions button {\n float: left;\n }\n diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml index 53d3a0c6e5622d6e2eced0751c683f1177f47168..73ed11d34a130ade0323d7dece57c75c0238d058 100644 --- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml +++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml @@ -55,7 +55,6 @@ container_width python:here.getLayoutProperty(\'layout_container_width\', 978);\n border_width python:here.getLayoutProperty(\'layout_border_width\', 10);\n main_width python:container_width - 2 * border_width;\n - right_column python:here.getLayoutProperty(\'layout_right_column\', False);\n right_column_width python:here.getLayoutProperty(\'layout_right_column_width\', 270);\n right_column_padding python:here.getLayoutProperty(\'layout_right_column_padding\', 12);\n main_content_width python:main_width - (right_column_padding + right_column_width) * ((has_right_column or 0) and 1);\n diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml index 977eb4bdd44c5662d09a70d18dc3f0e7eeb01efe..a2090cd2b75e9d32c08fed6b7e81a8bc5f52b274 100644 --- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml +++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml @@ -99,8 +99,8 @@ global header_title python:\'%s | %s\' % (here.getTitleOrId(), website.getTitleOrId());\n global css_list_template python:[\n \'%s/mf54_reset.css\' % portal_path,\n - \'%s/mf54_grid.css\' % portal_path,\n - \'%s/mf54_content.css\' % portal_path,\n + \'%s/mf54_grid.css\' % section_url,\n + \'%s/mf54_content.css\' % section_url,\n ] + (section.getLayoutProperty(\'layout_additional_css\', None) and\n [\'%s/%s\' % (portal_path, section.getLayoutProperty(\'layout_additional_css\'))] or []);\n global js_list python:[\n diff --git a/bt5/erp5_web_multiflex5_theme/bt/revision b/bt5/erp5_web_multiflex5_theme/bt/revision index ffda4e73f09ccf34ad373cedb584812e9a8a4b72..3fbd193e4a2dea8bb1d580e5bab0e1e586ee8686 100644 --- a/bt5/erp5_web_multiflex5_theme/bt/revision +++ b/bt5/erp5_web_multiflex5_theme/bt/revision @@ -1 +1 @@ -105 \ No newline at end of file +106 \ No newline at end of file