[Erp5-report] r27616 - in /erp5/trunk/bt5/erp5_web_multiflex5_theme: SkinTemplateItem/porta...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Jun 16 17:47:14 CEST 2009 

Author: kazuhiko
Date: Tue Jun 16 17:47:13 2009
New Revision: 27616

URL: http://svn.erp5.org?rev=27616&view=rev
Log:
* 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.

Modified:
    erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml
    erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
    erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml
    erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml?rev=27616&r1=27615&r2=27616&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml [utf8] Tue Jun 16 17:47:13 2009
@@ -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 @@
   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
@@ -423,6 +439,10 @@
 \n
 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

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml?rev=27616&r1=27615&r2=27616&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml [utf8] Tue Jun 16 17:47:13 2009
@@ -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

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml?rev=27616&r1=27615&r2=27616&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml [utf8] Tue Jun 16 17:47:13 2009
@@ -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

Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision?rev=27616&r1=27615&r2=27616&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] Tue Jun 16 17:47:13 2009
@@ -1,1 +1,1 @@
-105
+106

More information about the Erp5-report mailing list