From 41d1ca85e520a2f86936e81b798a3da444be9ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 1 Jan 2017 13:58:55 +0100
Subject: [PATCH] forms: use <button> instead of <input type="submit"/>
 (#14467)

---
 wcs/qommon/form.py            | 17 +++++++++++------
 wcs/qommon/static/js/popup.js |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index 5319451c..f44dfd02 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -53,6 +53,7 @@ except ImportError:
     magic = None
 
 import quixote
+import quixote.form.widget
 
 from quixote import get_publisher, get_request, get_response, get_session
 from quixote.http_request import Upload
@@ -193,12 +194,13 @@ def text_render_content(self):
 TextWidget.render_content = text_render_content
 
 
-def submit_render_content(self):
-    if self.name in ('cancel', 'previous', 'save-draft'):
-        self.attrs['formnovalidate'] = 'formnovalidate'
-    return super(self.__class__, self).render_content()
-SubmitWidget.render_content = submit_render_content
-
+class SubmitWidget(quixote.form.widget.SubmitWidget):
+    def render_content(self):
+        if self.name in ('cancel', 'previous', 'save-draft'):
+            self.attrs['formnovalidate'] = 'formnovalidate'
+        value = (self.label and htmlescape(self.label) or None)
+        return htmltag('button', name=self.name, value=value, **self.attrs) + \
+                self.label + htmltext('</button>')
 
 class ValidationError(ValueError):
     pass
@@ -306,6 +308,9 @@ class Form(QuixoteForm):
         if not self.captcha and not (get_session().won_captcha or get_session().user):
             self.captcha = CaptchaWidget('captcha', hint=hint)
 
+    def add_submit(self, name, value=None, **kwargs):
+        self.add(SubmitWidget, name, value, **kwargs)
+
     def add(self, widget_class, name, *args, **kwargs):
         if kwargs and not kwargs.has_key('render_br'):
             kwargs['render_br'] = False
diff --git a/wcs/qommon/static/js/popup.js b/wcs/qommon/static/js/popup.js
index 161f8959..2098948c 100644
--- a/wcs/qommon/static/js/popup.js
+++ b/wcs/qommon/static/js/popup.js
@@ -10,14 +10,14 @@ function displayPopup(event)
             var form = $(dialog).find('form');
             $(form).next('br').remove();
             $(dialog).find('.buttons').hide();
-            $(html).find('.buttons input').each(function(idx, elem) {
+            $(html).find('.buttons input, .buttons button').each(function(idx, elem) {
                 var button = Object();
                 button.text = $(elem).val();
                 var name = $(elem).prop('name');
                 if (name === 'cancel') {
                     button.click = function() { $(this).dialog('close'); return false; };
                 } else {
-                    button.click = function() { $(form).find('input[name='+name+']').click(); return false; };
+                    button.click = function() { $(form).find('[name='+name+']').click(); return false; };
                 }
                 if (name === 'submit') {
                     button['class'] = 'submit-button';
-- 
2.11.0