From eaccfc949219b6ff50f8b95dc579e75b6515d52b Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 3 Apr 2009 20:03:54 +0000 Subject: [PATCH] * remove duplicates. * add namespace declarations. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26275 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ListBox_asSearchStyleHTML.xml | 5 +- .../ListBox_asStandardHTML.xml | 66 +------------------ .../ListBox_asTableStyleHTML.xml | 21 ++---- .../bootstrap/erp5_xhtml_style/bt/revision | 2 +- 4 files changed, 10 insertions(+), 84 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml index 38a0a9bea1..6857a6cd61 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml @@ -40,7 +40,10 @@ <value> <string encoding="cdata"><![CDATA[ <tal:block metal:define-macro="main"\n -tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n + xmlns:tal="http://xml.zope.org/namespaces/tal"\n + xmlns:metal="http://xml.zope.org/namespaces/metal"\n + xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n + tal:define="listbox_max_lines python: int(here.getMaxLineNumber());\n total_line python: int(here.total_size);\n current_page python: int(here.current_page) + 1;\n current_page_max python: listbox_max_lines * current_page;\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml index 818b3b6982..afdd0f8381 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml @@ -39,72 +39,10 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block\n +<tal:block metal:define-macro="main"\n xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n - <tal:block metal:define-macro="main">\n -\n - <tal:replace tal:content="nothing">\n - Because TAL cannot accept unbalanced tags, the support for a domain tree is realized by a macro.\n - The macro ListBoxContainer is a no-op, if not in domain tree mode. Otherwise, the macro constructs\n - a domain tree and extracts the body in an extra table.\n - </tal:replace>\n -\n - <tal:block tal:define="expand python: 0">\n - <tal:block metal:define-macro="ListBoxContainer">\n - <tal:block tal:condition="expand">\n - <table tal:condition="is_domain_tree_mode"\n - style="width: 100%;" cellpadding="0" cellspacing="0"\n - summary="This table contains the domain tree with the switch button"\n - tal:define="selected_domain_path here/getSelectedDomainPath">\n - <tr>\n - <td valign="top">\n - <select name="domain_root_url"\n - tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n - <tal:block tal:repeat="c here/getDomainRootList">\n - <option value="base_domain"\n - tal:define="path python: c[0]; title python: c[1]"\n - tal:attributes="selected python: path == selected_domain_path; value path"\n - tal:content="title"\n - i18n:translate="" i18n:domain="ui">Base Domain</option>\n - </tal:block>\n - </select>\n - <table id="listbox_domain_tree_table" cellpadding="0"\n - summary="This table contains the domain tree"\n - class="listbox_domain_tree_table"\n - tal:attributes="id string:${field_id}_domain_tree_table"\n - tal:define="report_tree_list python: here.makeReportTreeList(report_path = selected_domain_path, unfolded_list = selection.getDomainList(), is_report_opened = False);\n - total_depth python: max([report_tree.depth for report_tree in report_tree_list] + [-1])">\n - <tr tal:repeat="report_tree report_tree_list">\n - <tal:block tal:repeat="i python: range(report_tree.depth)">\n - <td width="12" nowrap="nowrap"> </td>\n - </tal:block>\n -\t\t <td colspan="1" style="text-align: left; vertical-align: top; white-space: nowrap;"\n - tal:attributes="colspan python: total_depth - report_tree.depth + 1">\n - <a href="method" class="tree_open"\n - tal:condition="report_tree/is_open"\n - tal:attributes="href string:foldDomain?domain_url=${report_tree/domain_url}&form_id=${form_id}&list_selection_name=${selection_name}&domain_depth:int=${report_tree/depth}">\n - <b tal:content="report_tree/obj/getTranslatedTitleOrId">Domain</b></a>\n - <a href="method" class="tree_closed"\n - tal:condition="not: report_tree/is_open"\n - tal:attributes="href string:unfoldDomain?domain_url=${report_tree/domain_url}&form_id=${form_id}&list_selection_name=${selection_name}&domain_depth:int=${report_tree/depth}">\n - <tal:block tal:content="report_tree/obj/getTranslatedTitleOrId">Domain</tal:block></a>\n - </td>\n - </tr>\n - </table>\n - </td>\n - <td style="vertical-align: top">\n - <tal:block metal:define-slot="ListBoxBody" />\n - </td>\n - </tr>\n - </table>\n - <tal:block tal:condition="not: is_domain_tree_mode">\n - <tal:block metal:define-slot="ListBoxBody" />\n - </tal:block>\n - </tal:block>\n - </tal:block>\n - </tal:block>\n \n <tal:block tal:define="expand python: 1">\n <tal:block metal:use-macro="template/macros/ListBoxContainer">\n @@ -445,8 +383,6 @@ </tal:block>\n </tal:block>\n <!-- ListBox ends here. -->\n - </tal:block>\n -\n </tal:block>\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml index c843478bc5..950c927938 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml @@ -39,7 +39,10 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block metal:define-macro="main">\n +<tal:block metal:define-macro="main"\n + xmlns:tal="http://xml.zope.org/namespaces/tal"\n + xmlns:metal="http://xml.zope.org/namespaces/metal"\n + xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n \n <!-- ListBox (table mode) starts here -->\n <input type="hidden" name="list_selection_name" value="default" tal:attributes="value selection_name" />\n @@ -63,22 +66,6 @@ type="hidden" name="list_start" \n tal:attributes="value here/getLineStart" />\n \n - <tal:replace tal:content="nothing">\n - Because TAL cannot accept unbalanced tags, the support for a domain tree is realized by a macro.\n - The macro ListBoxContainer is a no-op, if not in domain tree mode. Otherwise, the macro constructs\n - a domain tree and extracts the body in an extra table.\n - </tal:replace>\n -\n - <tal:block tal:define="expand python: 0">\n - <tal:block metal:define-macro="ListBoxContainer">\n - <tal:block tal:condition="expand">\n - <tal:block tal:condition="not: is_domain_tree_mode">\n - <tal:block metal:define-slot="ListBoxBody" />\n - </tal:block>\n - </tal:block>\n - </tal:block>\n - </tal:block>\n -\n <tal:block tal:define="expand python: 1;\n table_form_id request/current_form_id | form_id;\n Base_translateString python: real_context.Base_translateString;\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 8a2602231b..6e1d38407b 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -686 \ No newline at end of file +687 \ No newline at end of file -- 2.30.9