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 2d65885883172f7b4563f4fd6f4c95048d9726c6..82777e17e71cb699cd57c3ef68987d4ff1f896d3 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 @@ -63,28 +63,28 @@ sitename_width python:here.getLayoutProperty(\'layout_sitename_width\', 300);\n 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 + header_background_image python:\'%s/%s?format=png\' % (site_url, header_background_image);\n site_logo python:here.getLayoutProperty(\'layout_site_logo\', \n \'mf54_image/bg_logo.gif\');\n - site_logo python:\'%s/%s\' % (site_url, site_logo);\n + site_logo python:\'%s/%s?format=png\' % (site_url, site_logo);\n page_top_background_image python:here.getLayoutProperty(\'layout_page_top_background_image\', \n \'mf54_image/bg_corner_page_top.gif\');\n - page_top_background_image python:\'%s/%s\' % (site_url, page_top_background_image);\n + page_top_background_image python:\'%s/%s?format=png\' % (site_url, page_top_background_image);\n page_bottom_background_image python:here.getLayoutProperty(\'layout_page_bottom_background_image\', \n \'mf54_image/bg_corner_page_bottom.gif\');\n - page_bottom_background_image python:\'%s/%s\' % (site_url, page_bottom_background_image);\n + page_bottom_background_image python:\'%s/%s?format=png\' % (site_url, page_bottom_background_image);\n content_bottom_background_image python:here.getLayoutProperty(\'layout_content_bottom_background_image\', \n \'mf54_image/bg_corner_content_%s1col_bottom.gif\' % ((not has_right_column and \'nosidebar_\') or \'\'));\n - content_bottom_background_image python:\'%s/%s\' % (site_url, content_bottom_background_image);\n + content_bottom_background_image python:\'%s/%s?format=png\' % (site_url, content_bottom_background_image);\n content_top_background_image python:here.getLayoutProperty(\'layout_content_top_background_image\', \n \'mf54_image/bg_corner_content_%s1col_top.gif\' % ((not has_right_column and \'nosidebar_\') or \'\'));\n - content_top_background_image python:\'%s/%s\' % (site_url, content_top_background_image);\n + content_top_background_image python:\'%s/%s?format=png\' % (site_url, content_top_background_image);\n subcontent_top_background_image python:here.getLayoutProperty(\'layout_subcontent_top_background_image\',\n \'mf54_image/bg_corner_subcontent_top.gif\');\n - subcontent_top_background_image python:\'%s/%s\' % (site_url, subcontent_top_background_image);\n + subcontent_top_background_image python:\'%s/%s?format=png\' % (site_url, subcontent_top_background_image);\n subcontent_bottom_background_image python:here.getLayoutProperty(\'layout_subcontent_bottom_background_image\',\n \'mf54_image/bg_corner_subcontent_bottom.gif\');\n - subcontent_bottom_background_image python:\'%s/%s\' % (site_url, subcontent_bottom_background_image);\n + subcontent_bottom_background_image python:\'%s/%s?format=png\' % (site_url, subcontent_bottom_background_image);\n ">\n \n /****************************************************************/\n @@ -334,6 +334,7 @@ div.subcontent-box.headbox1noicon h2.noicon {background:none;}\n /******************************************/\n .navbar ul li.login {float:right}\n \n +\n </tal:block> ]]></unicode> </value> 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 45947ccee92796ec2a75c006caf81a25d79b09e0..152c45e0ecf7da1882a844007384814fa0a69403 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 @@ -103,7 +103,7 @@ \'%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 + [\'%s/%s/Base_download\' % (portal_path, section.getLayoutProperty(\'layout_additional_css\'))] or []);\n global js_list python:[\n ]">\n <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n @@ -199,8 +199,7 @@ </tal:block>\n </tal:block>\n </body>\n -</html>\n - +</html> ]]></unicode> </value> </item> diff --git a/bt5/erp5_web_multiflex5_theme/bt/revision b/bt5/erp5_web_multiflex5_theme/bt/revision index fb351815657b5e2d423f156c000b624c3a74b73d..8e24a69a053265b21f1ba4d1c8429aa2c0dffa67 100644 --- a/bt5/erp5_web_multiflex5_theme/bt/revision +++ b/bt5/erp5_web_multiflex5_theme/bt/revision @@ -1 +1 @@ -197 \ No newline at end of file +198 \ No newline at end of file