diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_content.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_content.xml index 14f79f0d601117a79e23fe54e0ed93f67040c700..584389b6d6fbec5c9572fac516cb19efa41984ab 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_content.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_content.xml @@ -79,51 +79,7 @@ PlaningBox. The process is based on the strucutre passed in parameter (i.e optio Beware this only generates the HTML code, no CSS generation is done in this script\n -->\n \n -\n -<tal:block tal:condition="python:struct.build_error_list != None"\n - tal:define="struct options/struct;\n - basic python:struct.basic;\n - address python:basic.here.getUrl()">\n - <input type="hidden" name="list_selection_name" value="PLanningView" tal:attributes="value python:basic.field.get_value(\'selection_name\')"/>\n -\n - <table>\n - <tr><td><h3><span tal:replace="structure python:struct.basic.field.get_value(\'title\')"/>\n - </h3></td>\n - <td>\n - <select name="report_root_url" onChange="submitAction(this.form,\'/setReportRoot\')"\n - tal:attributes="onChange string:submitAction(this.form,\'${address}/setReportRoot\')">\n - <tal:block tal:condition="python:basic.selection is None"\n - tal:define="global selection_report_path python:basic.report_root_list[0][0]"/>\n - <tal:block tal:condition="python:basic.selection is not None"\n - tal:define="global selection_report_path python:basic.selection.report_path"/>\n - <tal:block tal:repeat="report_root_element python:basic.report_root_list">\n - <tal:block tal:condition="python:report_root_element[0]==selection_report_path">\n - <b tal:replace="nothing">actual value is selected</b>\n - <option selected="selected" value="None"\n - tal:attributes="value python:report_root_element[0]"\n - tal:content="structure python:report_root_element[1]">_</option>\n - </tal:block>\n - <tal:block tal:condition="python:report_root_element[0]!=selection_report_path">\n - <b tal:replace="nothing">actual value is not selected</b>\n - <option value="None"\n - tal:attributes="value python:report_root_element[0]"\n - tal:content="structure python:report_root_element[1]">_</option>\n - </tal:block>\n - </tal:block>\n - </select>\n - </td>\n - </tr>\n - </table>\n -\n - <tal:block tal:repeat="error_message python:struct.build_error_list"\n - tal:content="python:str(error_message)">\n - </tal:block>\n -\n -</tal:block>\n -\n -\n -<tal:block tal:condition="python:struct.build_error_list == None"\n - tal:define="struct options/struct">\n +<tal:block tal:define="struct options/struct">\n <tal:block tal:define="basic python:struct.basic;\n planning python:struct.planning;\n address python:basic.here.getUrl()">\n @@ -413,8 +369,7 @@ Beware this only generates the HTML code, no CSS generation is done in this scri </div>\n \n <!-- planning content-->\n -<div class="planning_content"\n - tal:condition="python:struct.build_error_list == None">\n +<div class="planning_content">\n \n <!-- display main axis lines -->\n <tal:block tal:repeat="axis_group python:planning.main_axis.axis_group">\n @@ -499,7 +454,8 @@ Beware this only generates the HTML code, no CSS generation is done in this scri <!--/div-->\n </div>\n </tal:block>\n -</tal:block> +</tal:block>\n + ]]></string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_css.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_css.xml index e0f48767d5a3b52199e9653b25bd92c1afa80d21..44fb59c8570c2d379e2ed2f9f44618308094666a 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_css.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/planning_css.xml @@ -99,11 +99,6 @@ script (\'planning_css\') to have CSS compliant code, no HTML generation is\n done in this script.\n """\n \n -if structure.build_error_list != None:\n - # structure contains errors, do not need to do any further processing about\n - # CSS generation. Error display will be handled in html rendering.\n - return \'\'\n -\n \n properties_structure = context.planning_coordinates(structure)\n \n @@ -236,13 +231,13 @@ return "\\n" + "".join(returned_list)\n <tuple> <string>structure</string> <string>_getattr_</string> - <string>None</string> <string>context</string> <string>properties_structure</string> <string>block_string</string> <string>block_object_list</string> <string>_getiter_</string> <string>block_object_string</string> + <string>None</string> <string>block_dict</string> <string>block_sub_list</string> <string>_getitem_</string> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index be6c136492c29e96d1d42c240ce1fe2d5f9d302c..e41567feb87fd40d6e88e91674e66a77a5074304 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -383 \ No newline at end of file +384 \ No newline at end of file