From ac9e1b6c230165b849ad5a758d84c89cfdc1f9ee Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Tue, 9 Jan 2007 10:36:36 +0000 Subject: [PATCH] 2007-01-09 JPS - Support of order type. Better title of pages. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11955 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/sort_list_dialog.xml | 5 ++++- .../erp5_xhtml_style/template_erp5_xhtml_style.xml | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml index 91274c0c54..ded38703b2 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml @@ -99,7 +99,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <tal:block i18n:translate="" i18n:domain="ui">Sort</tal:block>\n <tal:block tal:replace="row_index" />\n </label>\n - <div class="input" tal:attributes="id string:sort_${row_index}">\n + <div class="input" tal:attributes="id string:sort_${row_index}"\n + tal:define="sort_type python:item[min(2, len(item))]">\n <select name="field_sort_on">\n <tal:block tal:repeat="option all_columns">\n <option tal:content="python:option[1]"\n @@ -109,6 +110,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </select>\n <tal:block tal:replace="structure python:form.sort_order.render(item[1], request)" />\n + <tal:block tal:replace="structure python:form.sort_type.render(sort_type, request)" />\n </div>\n <p class="clear"></p>\n </div>\n @@ -128,6 +130,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n i18n:translate="" i18n:domain="ui"></option>\n </select>\n <span tal:replace="structure python:form.sort_order.render(\'\', request)" />\n + <tal:block tal:replace="structure python:form.sort_type.render(\'\', request)" />\n </div>\n </tal:block>\n <p class="clear"></p>\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 563886f5a0..de61d7c257 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 @@ -94,7 +94,7 @@ IDEAS:\n <base tal:attributes="href python: \'%s/\' % (url, )"/>\n <meta name="generator" content="ERP5"/>\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n - <title tal:content="title | string:ERP5"/>\n + <title tal:content="python: \'%s | %s\' % (title, here.getPortalObject().getTitle() or here.getPortalObject().getId())"/>\n <tal:block tal:repeat="css css_list">\n <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n </tal:block>\n @@ -150,8 +150,7 @@ IDEAS:\n </body>\n </html>\n </tal:block>\n -</tal:block>\n - +</tal:block> ]]></string> </value> </item> -- 2.30.9