From d8e4f166303a8abdda621f34459aa96eb5554da0 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <thomas@nexedi.com>
Date: Tue, 4 Jul 2006 14:09:51 +0000
Subject: [PATCH] 2006-07-04 Thomas * added support for checkboxes in
 planningBox configuration * supports planningBox edition enabled / disabled

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8310 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_xhtml_style/planning_coordinates.xml    | 16 ++++------------
 .../template_erp5_xhtml_style.xml                | 10 +++++++---
 2 files changed, 11 insertions(+), 15 deletions(-)

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 95fc45571b..33c5ed600d 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
@@ -123,15 +123,7 @@ size_planning_height = structure.basic.field.get_value(\'size_planning_height\')
 size_y_axis_width = structure.basic.field.get_value(\'size_y_axis_width\')\n
 size_y_axis_space = structure.basic.field.get_value(\'size_y_axis_space\')\n
 y_axis_position = structure.basic.field.get_value(\'y_axis_position\')\n
-if y_axis_position == \'right\':\n
-  y_axis_position = 1\n
-else:\n
-  y_axis_position = 0\n
 x_axis_position = structure.basic.field.get_value(\'x_axis_position\')\n
-if x_axis_position == \'top\':\n
-  x_axis_position = 1\n
-else:\n
-  x_axis_position = 0\n
 \n
 \n
 properties_structure = {}\n
@@ -202,7 +194,7 @@ for axis in (structure.planning.Y, structure.planning.X):\n
     # positionning it\n
     axis_dict[\'width\'] = size_planning_width\n
     axis_dict[\'height\'] = size_x_axis_height\n
-    if x_axis_position:\n
+    if not x_axis_position:\n
       axis_dict[\'margin-top\'] = size_header_height\n
     else:\n
       axis_dict[\'margin-top\'] = size_header_height + size_planning_height + size_x_axis_space\n
@@ -230,7 +222,7 @@ for axis in (structure.planning.Y, structure.planning.X):\n
     # positionning it\n
     axis_dict[\'width\'] = size_y_axis_width\n
     axis_dict[\'height\'] = size_planning_height\n
-    if x_axis_position:\n
+    if not x_axis_position:\n
       axis_dict[\'margin-top\'] = size_header_height + size_x_axis_height + size_x_axis_space\n
     else:\n
       axis_dict[\'margin-top\'] = size_header_height\n
@@ -575,7 +567,7 @@ if y_axis_position:\n
   content_dict[\'margin-left\'] = size_border_width_left\n
 else:\n
   content_dict[\'margin-left\'] = size_border_width_left + size_y_axis_width + size_y_axis_space\n
-if x_axis_position:\n
+if not x_axis_position:\n
   content_dict[\'margin-top\'] = size_header_height + size_x_axis_height + size_x_axis_space\n
 else:\n
   content_dict[\'margin-top\'] = size_header_height\n
@@ -721,7 +713,7 @@ for block_object in structure.planning.content:\n
         #block_info_dict[\'margin-left\'] = 0\n
         block_info_dict[\'width\'] = block_dict[\'width\']\n
         block_info_dict[\'margin-top\'] = block_dict[\'height\']\n
-    \n
+\n
       properties_structure[\'info\'][block_object.name + \'_\' + info_name] = block_info_dict\n
     """\n
 \n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
index b8a84b5f25..ee9767dd6c 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
@@ -131,14 +131,18 @@ IDEAS:\n
             type="text/css"\n
             rel="stylesheet" />\n
     </tal:block>\n
-    \n
+\n
     <tal:block tal:condition="form/pt | nothing">\n
       <tal:block tal:define="planning_box python: here.ERP5Site_getPlanningBox(form)">\n
         <tal:block tal:condition="python: planning_box">\n
-          <tal:block tal:define="dummy python:js_list.append(\'%s/wz_dragdrop.js\' % (here.portal_url.getPortalPath(), ));" />\n
+\n
           <style tal:content="structure python: planning_box.render_css(None,REQUEST=request)"\n
                  tal:attributes="type python:\'text/css\'">\n
           </style>\n
+\n
+          <tal:block tal:condition="python: planning_box.get_value(\'js_enabled\')">\n
+            <tal:block tal:define="dummy python:js_list.append(\'%s/wz_dragdrop.js\' % (here.portal_url.getPortalPath(), ));" />\n
+          </tal:block>\n
         </tal:block>\n
       </tal:block>\n
     </tal:block>\n
@@ -279,7 +283,7 @@ IDEAS:\n
         </div>\n
         <div id="logged_in_as">\n
           <tal:block tal:condition="not: here/portal_membership/isAnonymousUser">\n
-\t    <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>\n
+            <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>\n
             <tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()" />\n
           </tal:block>\n
         </div>\n
-- 
2.30.9