2006-06-28 Kevin

* Fix default string.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8342 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_content.xml

@@ -314,19 +314,22 @@ Beware this only generates the HTML code, no CSS generation is done in this scri
 <div tal:repeat="axis python:(planning.main_axis,planning.secondary_axis)"\n
      tal:attributes="id python:axis.name">\n
  <!-- groups of the current axis-->\n
- <div tal:repeat="axis_group python:axis.axis_group"\n
-      tal:attributes="id python:axis_group.name;\n
+ <tal:block tal:repeat="axis_group python:axis.axis_group">\n
+\n
+   <div tal:attributes="id python:axis_group.name;\n
                       title python:axis_group.tooltip">\n
-   <!-- depth of the current group -->\n
-   <div tal:repeat="depth python:range(axis_group.depth)"\n
-        tal:attributes="id python: axis_group.name + \'_depth_\' + str(depth)">\n
-   </div>\n
     <!-- title of the current group-->\n
     <a tal:attributes="href python:axis_group.info_title.link;\n
                         id python:axis_group.name + \'_info\'"\n
         tal:content="python:axis_group.info_title.info">\n
     </a>\n
    </div>\n
+\n
+   <!-- depth of the current group -->\n
+   <div tal:repeat="depth python:range(axis_group.depth)"\n
+        tal:attributes="id python: axis_group.name + \'_depth_\' + str(depth)">\n
+   </div>\n
+ </tal:block>\n
 \n
 \n
   <tal:condition tal:condition="python:axis==planning.X">\n

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_coordinates.xml

@@ -282,8 +282,8 @@ for axis_group in structure.planning.main_axis.axis_group:\n
     # current axis is X axis\n
     axis_group_dict[\'width\'] = float(axis_group.axis_element_number) * main_axis_step\n
     axis_group_dict[\'margin-left\'] = float( axis_group.axis_element_start -1) * main_axis_step\n
-    axis_group_dict[\'height\'] = size_x_axis_height #- axis_group.depth * depth_height * 2\n
-    axis_group_dict[\'margin-top\'] = 0 #axis_group.depth * depth_height * 2\n
+    axis_group_dict[\'height\'] = size_x_axis_height - axis_group.depth * depth_height\n
+    axis_group_dict[\'margin-top\'] = axis_group.depth * depth_height\n
     axis_info_dict[\'margin-top\'] = axis_group.depth * depth_height\n
     axis_info_dict[\'margin-left\'] = 1\n
     # dotted line must be vertical\n
@@ -303,17 +303,18 @@ for axis_group in structure.planning.main_axis.axis_group:\n
       axis_depth_dict = None\n
       axis_depth_dict = {}\n
       axis_depth_dict[\'position\'] = \'absolute\'\n
-      #axis_depth_dict[\'border_style\'] = \'solid\'\n
-      #axis_depth_dict[\'border-color\'] = \'#53676e\'\n
-      #axis_depth_dict[\'border-right-width\']  = 0\n
-      #axis_depth_dict[\'border-left-width\']   = 0\n
+      axis_depth_dict[\'border_style\'] = \'solid\'\n
+      axis_depth_dict[\'border-color\'] = \'#53676e\'\n
+      #axis_depth_dict[\'border-right-width\']  = 1\n
+      #axis_depth_dict[\'border-left-width\']   = 1\n
       #axis_depth_dict[\'border-top-width\']    = 1\n
       #axis_depth_dict[\'border-bottom-width\'] = 0\n
+      axis_depth_dict[\'border-width\'] = 1\n
       axis_depth_dict[\'background\'] = \'#53676e\'\n
-      axis_depth_dict[\'margin-top\']  = (depth +1) * depth_height\n
-      axis_depth_dict[\'margin-left\'] = 0\n
+      axis_depth_dict[\'margin-top\']  = depth * depth_height\n
+      axis_depth_dict[\'margin-left\'] = axis_group_dict[\'margin-left\']\n
       axis_depth_dict[\'width\'] = axis_group_dict[\'width\']\n
-      axis_depth_dict[\'height\'] = 1\n
+      axis_depth_dict[\'height\'] = depth_height\n
 \n
       # adding current depth line info to properties structure\n
       properties_structure[\'info\'][axis_group.name + \'_depth_\' + str(depth)] = axis_depth_dict\n
@@ -357,8 +358,8 @@ for axis_group in structure.planning.main_axis.axis_group:\n
 \n
   else:\n
     # current axis is Y axis\n
-    axis_group_dict[\'margin-left\'] = 0 #axis_group.depth * depth_width * 2\n
-    axis_group_dict[\'width\'] = size_y_axis_width #- axis_group.depth * depth_width * 2\n
+    axis_group_dict[\'margin-left\'] = axis_group.depth * depth_width\n
+    axis_group_dict[\'width\'] = size_y_axis_width - axis_group.depth * depth_width\n
     axis_group_dict[\'margin-top\'] = float( axis_group.axis_element_start - 1) * main_axis_step\n
     axis_group_dict[\'height\'] = float(axis_group.axis_element_number) * main_axis_step\n
     #axis_group_dict[\'text-align\'] = \'center\'\n
@@ -390,17 +391,17 @@ for axis_group in structure.planning.main_axis.axis_group:\n
       axis_depth_dict = None\n
       axis_depth_dict = {}\n
       axis_depth_dict[\'position\'] = \'absolute\'\n
-      #axis_depth_dict[\'border_style\'] = \'solid\'\n
-      #axis_depth_dict[\'border-color\'] = \'#53676e\'\n
+      axis_depth_dict[\'border_style\'] = \'solid\'\n
+      axis_depth_dict[\'border-color\'] = \'#53676e\'\n
       #axis_depth_dict[\'border-right-width\']  = 0\n
       #axis_depth_dict[\'border-left-width\']   = 1\n
       #axis_depth_dict[\'border-top-width\']    = 0\n
       #axis_depth_dict[\'border-bottom-width\'] = 0\n
-      #axis_depth_dict[\'border-width\'] = 2\n
+      axis_depth_dict[\'border-width\'] = 1\n
       axis_depth_dict[\'background\'] = \'#53676e\'\n
-      axis_depth_dict[\'margin-top\']  = 1\n
-      axis_depth_dict[\'margin-left\'] = (depth +1) * depth_width\n
-      axis_depth_dict[\'width\'] = 1\n
+      axis_depth_dict[\'margin-top\']  = axis_group_dict[\'margin-top\']\n
+      axis_depth_dict[\'margin-left\'] = depth * depth_width\n
+      axis_depth_dict[\'width\'] = depth_width\n
       axis_depth_dict[\'height\'] = axis_group_dict[\'height\']\n
 \n
       # adding current depth line info to properties structure\n