Skip to content

erp5
erp5
Commit 8da8b7d7 authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

Remove debug statement. 

Factorise page template gathering for "global_definition".
Merge unnecesary nesting levels.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10688 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 763f98ab
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 23 deletions
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
View file @ 8da8b7d7
...@@ -78,7 +78,8 @@ IDEAS:\n ...@@ -78,7 +78,8 @@ IDEAS:\n
\n \n
<tal:block metal:define-macro="master">\n <tal:block metal:define-macro="master">\n
\n \n
<tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/>\n <tal:block tal:define="global_definitions_macros here/global_definitions/macros">\n
<tal:block metal:use-macro="global_definitions_macros/header_definitions"/>\n
\n \n
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n
\n \n
...@@ -92,16 +93,13 @@ IDEAS:\n ...@@ -92,16 +93,13 @@ IDEAS:\n
<link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
</tal:block>\n </tal:block>\n
\n \n
<tal:block metal:use-macro="here/global_definitions/macros/planning_box_definitions"/>\n <tal:block metal:use-macro="global_definitions_macros/planning_box_definitions"/>\n
\n \n
<tal:block tal:repeat="js js_list">\n <tal:block tal:repeat="js js_list">\n
<script tal:attributes="src js" type="text/javascript"></script>\n <script tal:attributes="src js" type="text/javascript"></script>\n
</tal:block>\n </tal:block>\n
\n
</head>\n </head>\n
\n
<body onload="fixLeftRightHeight()">\n <body onload="fixLeftRightHeight()">\n
<!-- <tal:block tal:replace="structure request"/> -->\n
<form id="main_form"\n <form id="main_form"\n
tal:attributes="enctype python: here.ERP5XhtmlStyle_getFormEnctype(form);\n tal:attributes="enctype python: here.ERP5XhtmlStyle_getFormEnctype(form);\n
action url;\n action url;\n
...@@ -111,7 +109,7 @@ IDEAS:\n ...@@ -111,7 +109,7 @@ IDEAS:\n
<input tal:condition="form_action | nothing"\n <input tal:condition="form_action | nothing"\n
id="hidden_button" type="submit" value="dummy"\n id="hidden_button" type="submit" value="dummy"\n
tal:attributes="name python: \'%s:method\' % (form_action, )" />\n tal:attributes="name python: \'%s:method\' % (form_action, )" />\n
<tal:block metal:use-macro="here/global_definitions/macros/http_definitions"/>\n <tal:block metal:use-macro="global_definitions_macros/http_definitions"/>\n
<div id="bars">\n <div id="bars">\n
<div id="main_bar">\n <div id="main_bar">\n
<span class="first">\n <span class="first">\n
...@@ -159,11 +157,10 @@ IDEAS:\n ...@@ -159,11 +157,10 @@ IDEAS:\n
tal:define="module_list here/ERP5Site_getModuleItemList;"\n tal:define="module_list here/ERP5Site_getModuleItemList;"\n
tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doModule\')">\n tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doModule\')">\n
<option selected="selected" value="" i18n:translate="" i18n:domain="ui">ERP5 Modules</option>\n <option selected="selected" value="" i18n:translate="" i18n:domain="ui">ERP5 Modules</option>\n
<tal:block tal:repeat="module module_list">\n <option tal:repeat="module module_list"\n
<option value="something"\n tal:attributes="value python: module[1]"\n
tal:attributes="value python: module[1]"\n tal:content="python: module[0]"\n
tal:content="python: module[0]"/>\n tal:omit-tag="nothing"/>\n
</tal:block>\n
</select>\n </select>\n
<button type="submit" name="Base_doModule:method" title="Select Module"\n <button type="submit" name="Base_doModule:method" title="Select Module"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
...@@ -179,11 +176,11 @@ IDEAS:\n ...@@ -179,11 +176,11 @@ IDEAS:\n
tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doLanguage\')">\n tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doLanguage\')">\n
<option value=""\n <option value=""\n
i18n:translate="" i18n:domain="ui">My language</option>\n i18n:translate="" i18n:domain="ui">My language</option>\n
<tal:block tal:repeat="language python: here.Localizer.get_languages_map()">\n <option tal:repeat="language python: here.Localizer.get_languages_map()"\n
<option tal:attributes="value language/id;\n tal:omit-tag="nothing"\n
selected python: language[\'selected\'] and \'selected\' or nothing;"\n tal:attributes="value language/id;\n
tal:content="python: here.Localizer.erp5_ui.gettext(language[\'title\'], lang=language[\'id\'])"></option>\n selected python: language[\'selected\'] and \'selected\' or nothing;"\n
</tal:block>\n tal:content="python: here.Localizer.erp5_ui.gettext(language[\'title\'], lang=language[\'id\'])" />\n
</select>\n </select>\n
<button type="submit" name="Base_doLanguage:method" title="Select Language"\n <button type="submit" name="Base_doLanguage:method" title="Select Language"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
...@@ -212,12 +209,8 @@ IDEAS:\n ...@@ -212,12 +209,8 @@ IDEAS:\n
<div id="status">\n <div id="status">\n
<div id="breadcrumb">\n <div id="breadcrumb">\n
<tal:block tal:repeat="item here/breadcrumbs">\n <tal:block tal:repeat="item here/breadcrumbs">\n
<tal:block tal:condition="python: repeat[\'item\'].index < 2">\n <a tal:condition="python: repeat[\'item\'].index < 2" tal:attributes="href item/url" tal:content="item/title" i18n:translate="" i18n:domain="ui"/>\n
<a tal:attributes="href item/url" tal:content="item/title" i18n:translate="" i18n:domain="ui"/>\n <a tal:condition="python: repeat[\'item\'].index >= 2" tal:attributes="href item/url" tal:content="item/title"/>\n
</tal:block>\n
<tal:block tal:condition="python: repeat[\'item\'].index >= 2">\n
<a tal:attributes="href item/url" tal:content="item/title"/>\n
</tal:block>\n
/\n /\n
</tal:block>\n </tal:block>\n
</div>\n </div>\n
...@@ -236,6 +229,7 @@ IDEAS:\n ...@@ -236,6 +229,7 @@ IDEAS:\n
</form>\n </form>\n
</body>\n </body>\n
</html>\n </html>\n
</tal:block>\n
</tal:block> </tal:block>
]]></string> </value> ]]></string> </value>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7