[Erp5-report] r28593 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Aug 24 15:07:51 2009
New Revision: 28593

URL: http://svn.erp5.org?rev=28593&view=rev
Log:
re-add tal:condition for cancel button that was removed in r28441 by mistake.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml?rev=28593&r1=28592&r2=28593&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml [utf8] Mon Aug 24 15:07:51 2009
@@ -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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=28593&r1=28592&r2=28593&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Mon Aug 24 15:07:51 2009
@@ -1,1 +1,1 @@
-813
+814