From f8200611cc29bac5bcf073248c686bbbc929d6cb Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Tue, 20 Jun 2006 13:32:27 +0000 Subject: [PATCH] 2006-06-20 Vincent Correct form button values when in a dialog. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8090 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/dialog.xml | 2 +- .../portal_skins/erp5_xhtml_style/form_view_dialog.xml | 8 +++++--- .../portal_skins/erp5_xhtml_style/main_template.xml | 2 +- bt5/erp5_xhtml_style/bt/change_log | 3 +++ bt5/erp5_xhtml_style/bt/maintainer_list | 1 + 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml index a5de56883e..058de32151 100644 --- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml +++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml @@ -73,7 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n <tal:block metal:define-macro="master">\n - <tal:block tal:define="dialog_type string:View">\n + <tal:block tal:define="dialog_type dialog_type | string:">\n <tal:block metal:use-macro="here/list_dialog_master/macros/master">\n <tal:block metal:fill-slot="main">\n <div class="dialog_box">\n diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml index a79ba5333b..968cbd5108 100644 --- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml +++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml @@ -72,9 +72,11 @@ along with this program; if not, write to the Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n -<tal:block metal:use-macro="here/dialog/macros/master">\n - <tal:block metal:fill-slot="main">\n - <tal:block metal:use-macro="here/form/macros/master" />\n +<tal:block tal:define="dialog_type string:View">\n + <tal:block metal:use-macro="here/dialog/macros/master">\n + <tal:block metal:fill-slot="main">\n + <tal:block metal:use-macro="here/form/macros/master" />\n + </tal:block>\n </tal:block>\n </tal:block> diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml index 8b224b33d3..1de8cd647e 100644 --- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml +++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml @@ -99,7 +99,7 @@ IDEAS:\n global selection_index request/selection_index | nothing;\n global selection_url python: selection_name and here.portal_selections.getSelectionListUrlFor(selection_name,REQUEST=request) or None;\n \n - global current_url python: dialog_id and url + \'/\' + dialog_id or None;\n + current_url python: dialog_id and \'%s/%s\' % (url, dialog_id) or None;\n global current_action python: current_url and here.ERP5Site_getCurrentAction(current_url, actions) or None;\n form_pickle request/form_pickle | nothing;\n form_signature request/form_signature | nothing;\n diff --git a/bt5/erp5_xhtml_style/bt/change_log b/bt5/erp5_xhtml_style/bt/change_log index 8709617865..9918b66254 100644 --- a/bt5/erp5_xhtml_style/bt/change_log +++ b/bt5/erp5_xhtml_style/bt/change_log @@ -1,3 +1,6 @@ +2006-06-20 Vincent +Correct form button values when in a dialog. + 2006-06-15 Vincent Initial commit. Valid XHTML1.0 Strict + CSS 2.0. \ No newline at end of file diff --git a/bt5/erp5_xhtml_style/bt/maintainer_list b/bt5/erp5_xhtml_style/bt/maintainer_list index e69de29bb2..4abf40ec86 100644 --- a/bt5/erp5_xhtml_style/bt/maintainer_list +++ b/bt5/erp5_xhtml_style/bt/maintainer_list @@ -0,0 +1 @@ +vincent \ No newline at end of file -- 2.30.9