diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml index c03dbbcc03f6f8cc9d6b67eba28685a479fad28b..022250dcab99eedd7c20802274976732bec90065 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml @@ -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 @@ for block_object in planning.content:\n if context.PlanningBox_isFrozenBlock(block=block_object):\n block_dict[\'border-width\'] = 0\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 + 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[\'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 @@ return properties_structure\n <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> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 1fde7522a771ec6f5d8c6237abe49bac75f547c8..2ae9f6c7cb0c0df9f4a24d37ce337efa56c061b7 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -434 \ No newline at end of file +441 \ No newline at end of file