From 1f66a8c13211860f41db8c1848c6fc126bd4e1f3 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 24 Aug 2009 13:07:51 +0000
Subject: [PATCH] re-add tal:condition for cancel button that was removed in
 r28441 by mistake.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28593 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_xhtml_style/dialog_main.xml               | 2 +-
 product/ERP5/bootstrap/erp5_xhtml_style/bt/revision             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
index 9a08de6b8e..84785af27c 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
@@ -60,7 +60,7 @@
             <tal:block metal:define-slot="main" />\n
             <tal:block metal:define-slot="bottom" />\n
           </div>\n
-          <button \n
+          <button tal:condition="cancel_url|request/cancel_url|nothing"\n
                  value="Cancel Action" accesskey="C"\n
                  id="dialog_cancel_button" name="Base_cancel:method"\n
                  type="submit" class="bt-med">\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index e6cf7bc38f..ff8ae77e43 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-813
\ No newline at end of file
+814
\ No newline at end of file
-- 
2.30.9