Commit a902f84a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* fix mf54_content.css so as to calculate main width correctly.

* mf54_grid.css and mf54_content.css should begin with section instead of site because several width configurations can differ depending on right_column existence.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27616 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 275598f3
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
\n \n
<tal:block define="\n <tal:block define="\n
site_url python:here.getWebSiteValue().absolute_url();\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 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 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 secondary_color python:here.getLayoutProperty(\'layout_secondary_color\', \'rgb(225,225,225)\');\n
...@@ -63,11 +64,10 @@ ...@@ -63,11 +64,10 @@
header_background_image python:here.getLayoutProperty(\'layout_header_background_image\', \n header_background_image python:here.getLayoutProperty(\'layout_header_background_image\', \n
\'mf54_image/bg_header.jpg\');\n \'mf54_image/bg_header.jpg\');\n
header_background_image python:\'%s/%s\' % (site_url, header_background_image);\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_width python:here.getLayoutProperty(\'layout_right_column_width\', 270);\n
right_column_padding python:here.getLayoutProperty(\'layout_right_column_padding\', 12);\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 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 right_column) * (right_column_width + right_column_padding);\n content_icon_width python:(not has_right_column) * (right_column_width + right_column_padding);\n
">\n ">\n
\n \n
/****************************************************************/\n /****************************************************************/\n
...@@ -376,6 +376,22 @@ fieldset.editable.bottom div.input {\n ...@@ -376,6 +376,22 @@ fieldset.editable.bottom div.input {\n
font-weight: bold;\n font-weight: bold;\n
}\n }\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 styling.\n
** Edit tabs are another part of admin stuffs and\n ** Edit tabs are another part of admin stuffs and\n
** should respect other admin design convention\n ** should respect other admin design convention\n
...@@ -425,6 +441,10 @@ div.input select, div.input textarea {\n ...@@ -425,6 +441,10 @@ div.input select, div.input textarea {\n
border: 1px solid #999;\n border: 1px solid #999;\n
}\n }\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 div.bottom_actions button {\n
float: left;\n float: left;\n
}\n }\n
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
container_width python:here.getLayoutProperty(\'layout_container_width\', 978);\n container_width python:here.getLayoutProperty(\'layout_container_width\', 978);\n
border_width python:here.getLayoutProperty(\'layout_border_width\', 10);\n border_width python:here.getLayoutProperty(\'layout_border_width\', 10);\n
main_width python:container_width - 2 * border_width;\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_width python:here.getLayoutProperty(\'layout_right_column_width\', 270);\n
right_column_padding python:here.getLayoutProperty(\'layout_right_column_padding\', 12);\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 main_content_width python:main_width - (right_column_padding + right_column_width) * ((has_right_column or 0) and 1);\n
......
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
global header_title python:\'%s | %s\' % (here.getTitleOrId(), website.getTitleOrId());\n global header_title python:\'%s | %s\' % (here.getTitleOrId(), website.getTitleOrId());\n
global css_list_template python:[\n global css_list_template python:[\n
\'%s/mf54_reset.css\' % portal_path,\n \'%s/mf54_reset.css\' % portal_path,\n
\'%s/mf54_grid.css\' % portal_path,\n \'%s/mf54_grid.css\' % section_url,\n
\'%s/mf54_content.css\' % portal_path,\n \'%s/mf54_content.css\' % section_url,\n
] + (section.getLayoutProperty(\'layout_additional_css\', None) and\n ] + (section.getLayoutProperty(\'layout_additional_css\', None) and\n
[\'%s/%s\' % (portal_path, section.getLayoutProperty(\'layout_additional_css\'))] or []);\n [\'%s/%s\' % (portal_path, section.getLayoutProperty(\'layout_additional_css\'))] or []);\n
global js_list python:[\n global js_list python:[\n
......
105 106
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment