[Erp5-report] r17736 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: rafael
Date: Thu Nov 22 05:59:17 2007
New Revision: 17736

URL: http://svn.erp5.org?rev=17736&view=rev
Log:
Modified planning_coordinates to show blocs height.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml?rev=17736&r1=17735&r2=17736&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml Thu Nov 22 05:59:17 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -604,8 +601,12 @@
   if context.PlanningBox_isFrozenBlock(block=block_object):\n
     block_dict[\'border-width\'] = 0\n
   \n
+  block_dict[\'height\'] = block_object.position_y.relative_range * size_planning_height\n
+  if block_object.parent_activity.height is not None:\n
+    block_dict[\'height\'] = block_dict[\'height\']*block_object.parent_activity.height\n
+\n
   block_dict[\'width\'] = block_object.position_x.relative_range * size_planning_width\n
-  block_dict[\'height\'] = block_object.position_y.relative_range * size_planning_height\n
+  #block_dict[\'height\'] = block_object.position_y.relative_range * size_planning_height\n
   block_dict[\'margin-left\'] = block_object.position_x.relative_begin * size_planning_width\n
   block_dict[\'margin-top\'] = block_object.position_y.relative_begin * size_planning_height\n
 \n
@@ -844,6 +845,7 @@
                             <string>bot_list</string>
                             <string>center</string>
                             <string>info_name</string>
+                            <string>_inplacevar_</string>
                             <string>top_id</string>
                             <string>bot_id</string>
                             <string>center_content_list</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=17736&r1=17735&r2=17736&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Thu Nov 22 05:59:17 2007
@@ -1,1 +1,1 @@
-434
+441