From 11bf39ce68bf65746e07198ea9959505627d45c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 21 Mar 2018 17:51:12 +0100
Subject: [PATCH 1/2] misc: switch form buttons to <button> markup (#22438)

---
 .../auth2_auth/auth2_ssl/templates/auth/account_linking_ssl.html | 2 +-
 .../auth2_auth/auth2_ssl/templates/auth/login_form_ssl.html      | 4 ++--
 src/authentic2/auth2_auth/auth2_ssl/templates/ssl/profile.html   | 4 ++--
 src/authentic2/manager/static/authentic2/manager/css/style.css   | 9 +++++++--
 src/authentic2/manager/static/authentic2/manager/js/manager.js   | 6 +++---
 src/authentic2/manager/templates/authentic2/manager/form.html    | 4 ++--
 .../manager/templates/authentic2/manager/user_detail.html        | 4 +++-
 .../saml/templates/admin/saml/libertyprovider/add_from_url.html  | 2 +-
 src/authentic2/saml/templates/saml/post_form.html                | 2 +-
 src/authentic2/templates/authentic2/accounts_delete.html         | 4 ++--
 src/authentic2/templates/authentic2/accounts_edit.html           | 6 +++---
 src/authentic2/templates/authentic2/change_email.html            | 4 ++--
 src/authentic2/templates/authentic2/homepage.html                | 2 +-
 src/authentic2/templates/authentic2/login_password_form.html     | 4 ++--
 src/authentic2/templates/authentic2/logout_confirm.html          | 2 +-
 src/authentic2/templates/interaction/consent_attributes.html     | 6 +++---
 src/authentic2/templates/interaction/consent_federation.html     | 4 ++--
 src/authentic2/templates/registration/password_change_form.html  | 4 ++--
 .../templates/registration/password_reset_confirm.html           | 2 +-
 src/authentic2/templates/registration/password_reset_form.html   | 2 +-
 .../templates/registration/registration_completion_form.html     | 2 +-
 src/authentic2/templates/registration/registration_form.html     | 2 +-
 .../templates/authentic2_auth_saml/login.html                    | 4 ++--
 .../templates/authentic2_idp_oidc/authorization.html             | 4 ++--
 tests/test_idp_saml2.py                                          | 3 +--
 25 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/src/authentic2/auth2_auth/auth2_ssl/templates/auth/account_linking_ssl.html b/src/authentic2/auth2_auth/auth2_ssl/templates/auth/account_linking_ssl.html
index 0e945319..e8d3e5c9 100644
--- a/src/authentic2/auth2_auth/auth2_ssl/templates/auth/account_linking_ssl.html
+++ b/src/authentic2/auth2_auth/auth2_ssl/templates/auth/account_linking_ssl.html
@@ -35,7 +35,7 @@
     <input type="checkbox" name="do_creation" id="id_do_creation" />
   </p>
 
-  <input type="submit" value="{% trans 'Log in' %}" class="submit" />
+  <button class="submit-button">{% trans 'Log in' %}</button>
   <input type="hidden" name="next" value="{{ next_url }}" />
 </form>
 </div>
diff --git a/src/authentic2/auth2_auth/auth2_ssl/templates/auth/login_form_ssl.html b/src/authentic2/auth2_auth/auth2_ssl/templates/auth/login_form_ssl.html
index 069c9d4a..025f42db 100644
--- a/src/authentic2/auth2_auth/auth2_ssl/templates/auth/login_form_ssl.html
+++ b/src/authentic2/auth2_auth/auth2_ssl/templates/auth/login_form_ssl.html
@@ -6,9 +6,9 @@
 <form method="post" action="">
 {% csrf_token %}
 {{ form.as_p }}
-<input type="submit" name="{{ submit_name }}" value="{% trans "Log in" %}"/>
+<button class="submit-button" name="{{ submit_name }}">{% trans "Log in" %}</button>
 {% if cancel %}
-<input type="submit" name="cancel" value="{% trans 'Cancel' %}"/>
+<button class="cancel-button" name="cancel">{% trans 'Cancel' %}"</button>
 {% endif %}
 </form>
 </div>
diff --git a/src/authentic2/auth2_auth/auth2_ssl/templates/ssl/profile.html b/src/authentic2/auth2_auth/auth2_ssl/templates/ssl/profile.html
index fe7096e7..2608f69a 100644
--- a/src/authentic2/auth2_auth/auth2_ssl/templates/ssl/profile.html
+++ b/src/authentic2/auth2_auth/auth2_ssl/templates/ssl/profile.html
@@ -18,7 +18,7 @@
             {% endfor %}
           </dl>
         </p>
-        <input type="submit" class="submit-button a2-ssl-certificate-submit-button" value="{% trans "Delete" %}">
+        <button class="submit-button a2-ssl-certificate-submit-button">{% trans "Delete" %}</button>
       </form>
     </p>
   {% endfor %}
@@ -27,7 +27,7 @@
     <form action="{% url "user_signin_ssl" %}" method="get">
       <label for="id_del_cert">{% trans "Add a certificate?" %}</label>
       <input type="hidden" name="next" value="{% url "account_management" %}#a2-ssl-certificate-profile" />
-      <input type="submit" class="submit-button a2-ssl-certificate-submit-button" value="{% trans "Add" %}">
+      <button class="submit-button a2-ssl-certificate-submit-button">{% trans "Add" %}</button>
     </form>
   </p>
 </div>
diff --git a/src/authentic2/manager/static/authentic2/manager/css/style.css b/src/authentic2/manager/static/authentic2/manager/css/style.css
index b3e17418..10b98112 100644
--- a/src/authentic2/manager/static/authentic2/manager/css/style.css
+++ b/src/authentic2/manager/static/authentic2/manager/css/style.css
@@ -102,13 +102,18 @@ table.users tbody tr td:nth-child(2):hover {
   width: 30%;
 }
 
-.other_actions input[type=submit] {
+.other_actions button {
   display: block;
   margin: 5px;
   width: 100%;
   white-space: normal;
 }
 
+.other_actions .user-roles button {
+  display: inline-block;
+  width: auto;
+}
+
 li#roles a { background-image: url(icon-personnes.png); }
 li#roles a:hover { background-image: url(icon-personnes-hover.png); }
 
@@ -128,7 +133,7 @@ li#users a:hover { background-image: url(icon-user-hover.png); }
   max-width: 50%;
 }
 
-.warning-box input[type=submit] {
+.warning-box button {
   float: right;
 }
 
diff --git a/src/authentic2/manager/static/authentic2/manager/js/manager.js b/src/authentic2/manager/static/authentic2/manager/js/manager.js
index ffc9e387..808aa825 100644
--- a/src/authentic2/manager/static/authentic2/manager/js/manager.js
+++ b/src/authentic2/manager/static/authentic2/manager/js/manager.js
@@ -139,7 +139,7 @@
           return false;
         });
         /* confirmation on submit buttons */
-        $(document).on('click', 'input[type=submit]', function (e) {
+        $(document).on('click', 'button', function (e) {
           if ($(e.target).data('confirm')) {
             if (! confirm($(e.target).data('confirm'))) {
               e.preventDefault();
@@ -153,7 +153,7 @@
               window.location.href = $(e.target).data('url');
             }
           }
-        })
+        });
         $(document).on('change', '#id_generate_password', function (e) {
             if ($(e.target).is(':checked')) {
                 $('#id_send_mail').prop('disabled', true);
@@ -168,7 +168,7 @@
                 $('#id_password2').prop('disabled', false);
             }
         });
-        $(document).on('click.manager', 'table tr[data-url][rel=popup], button[rel=popup]', displayPopup);
+        $(document).on('click.manager', 'table tr[data-url][rel=popup]', displayPopup);
         $(document).on('click.manager', 'table tr[data-url]:not([rel=popup])', function (e) {
                 window.location.href = $(this).data('url');
         });
diff --git a/src/authentic2/manager/templates/authentic2/manager/form.html b/src/authentic2/manager/templates/authentic2/manager/form.html
index 812c56fd..83f7cda5 100644
--- a/src/authentic2/manager/templates/authentic2/manager/form.html
+++ b/src/authentic2/manager/templates/authentic2/manager/form.html
@@ -74,12 +74,12 @@
         {% if other_actions %}
             <strong>{% trans "Actions" %}</strong>
             {% for action in other_actions %}
-              <input type="submit" name="{{ action.name }}" value="{{ action.title }}"
+              <button name="{{ action.name }}"
                 {% if action.confirm %}data-confirm="{{ action.confirm }}"{% endif %}
                 {% if action.url_name %}data-url="{% url action.url_name pk=object.pk %}"{% endif %}
                 {% if action.url %}data-url="{{ action.url }}"{% endif %}
                 {% if action.popup %}rel="popup"{% endif %}
-              />
+                >{{ action.title }}</button>
             {% endfor %}
         {% endif %}
       {% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
index fe1fa426..a19b3026 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
@@ -31,7 +31,7 @@
 {% block afterform %}
   {% if object.passwordreset_set.exists %}
     <div class="warning-box">{% trans "User must change its password on next access to authentic" %}
-      <input type="submit" name="delete_password_reset" value="{% trans "Cancel this constraint" %}"/>
+      <button name="delete_password_reset">{% trans "Cancel this constraint" %}</button>
     </div>
   {% endif %}
 {% endblock %}
@@ -66,6 +66,7 @@
   {{ block.super }}
 
   {% if roles or can_change_roles %}
+  <div class="user-roles">
     <strong>{% trans "Roles" %}</strong>
     <ul>
       {% for role in object.roles_and_parents %}
@@ -78,6 +79,7 @@
     {% if can_change_roles %}
       <button onclick="window.location.href = '{% url "a2-manager-user-roles" pk=object.pk %}?search-ou={% firstof object.ou.pk default_ou.pk %}'; return false">{% trans "Modify" %}</button>
     {% endif %}
+  </div>
   {% endif %}
 
 
diff --git a/src/authentic2/saml/templates/admin/saml/libertyprovider/add_from_url.html b/src/authentic2/saml/templates/admin/saml/libertyprovider/add_from_url.html
index 37d8b237..54309f27 100644
--- a/src/authentic2/saml/templates/admin/saml/libertyprovider/add_from_url.html
+++ b/src/authentic2/saml/templates/admin/saml/libertyprovider/add_from_url.html
@@ -34,7 +34,7 @@
 <table>
     {{ form.as_table }}
 </table>
-<input type="submit"/>
+<button>{% trans "Submit" %}</button>
 
 
 </div>
diff --git a/src/authentic2/saml/templates/saml/post_form.html b/src/authentic2/saml/templates/saml/post_form.html
index 44d7bdc3..e1339a18 100644
--- a/src/authentic2/saml/templates/saml/post_form.html
+++ b/src/authentic2/saml/templates/saml/post_form.html
@@ -17,7 +17,7 @@
    {% endif %}
    <noscript>
      <div class="buttons-bar">
-      <input type="submit" name="sendButton" value="{% trans 'Send' %}" />
+      <button name="sendButton">{% trans 'Send' %}</button>
      </div>
   </noscript>
   </form>
diff --git a/src/authentic2/templates/authentic2/accounts_delete.html b/src/authentic2/templates/authentic2/accounts_delete.html
index 28e7d4c8..9767ae1d 100644
--- a/src/authentic2/templates/authentic2/accounts_delete.html
+++ b/src/authentic2/templates/authentic2/accounts_delete.html
@@ -17,7 +17,7 @@
   {% csrf_token %}
   <p>{% trans "Delete my account and all my personal datas ?" %}</p>
   {{ form.as_p }}
-  <input type="submit" name="submit" value="{% trans "Delete" %}"/>
-  <input type="submit" name="cancel" value="{% trans "Cancel" %}"/>
+  <button class="delete-button" name="submit">{% trans "Delete" %}</button>
+  <button class="cancel-button" name="cancel">{% trans "Cancel" %}</button>
 </form>
 {% endblock %}
diff --git a/src/authentic2/templates/authentic2/accounts_edit.html b/src/authentic2/templates/authentic2/accounts_edit.html
index 9d640b13..d2ec6be9 100644
--- a/src/authentic2/templates/authentic2/accounts_edit.html
+++ b/src/authentic2/templates/authentic2/accounts_edit.html
@@ -26,10 +26,10 @@
     {% csrf_token %}
     {{ form.as_p }}
     {% if form.instance and form.instance.id %}
-      <input type="submit" value="{% trans "Submit" %}"/>
-      <input type="submit" name="cancel" formnovalidate value="{% trans "Cancel" %}"/>
+      <button class="submit-button">{% trans "Submit" %}</button>
+      <button class="cancel-button" name="cancel" formnovalidate>{% trans "Cancel" %}</button>
     {% else %}
-      <input type="submit" value="{% trans "Create" %}"/>
+      <button class="submit-button">{% trans "Create" %}</button>
     {% endif %}
   </form>
 {% endblock %}
diff --git a/src/authentic2/templates/authentic2/change_email.html b/src/authentic2/templates/authentic2/change_email.html
index 8f50b1e7..ecdd09f4 100644
--- a/src/authentic2/templates/authentic2/change_email.html
+++ b/src/authentic2/templates/authentic2/change_email.html
@@ -17,7 +17,7 @@
   <form method="post">
     {% csrf_token %}
     {{ form.as_p }}
-    <input type="submit" value="{% trans "Validate" %}"/>
-    <input type="submit" name="cancel" formnovalidate value="{% trans "Cancel" %}"/>
+    <button class="submit-button">{% trans "Validate" %}</button>
+    <button class="cancel-button" name="cancel" formnovalidate>{% trans "Cancel" %}</button>
   </form>
 {% endblock %}
diff --git a/src/authentic2/templates/authentic2/homepage.html b/src/authentic2/templates/authentic2/homepage.html
index 4bfc99db..e4c89a44 100644
--- a/src/authentic2/templates/authentic2/homepage.html
+++ b/src/authentic2/templates/authentic2/homepage.html
@@ -31,7 +31,7 @@
           {% endfor %}
           {% endif %}
           <input type="hidden" name="next" value="/"/>
-          <input type="submit" class="submit-link" value="{{ action.0 }}">
+          <button class="submit-link">{{ action.0 }}</button>
         </form>
         {% endif %}
       {% endfor %}
diff --git a/src/authentic2/templates/authentic2/login_password_form.html b/src/authentic2/templates/authentic2/login_password_form.html
index 9d7953fd..2a535245 100644
--- a/src/authentic2/templates/authentic2/login_password_form.html
+++ b/src/authentic2/templates/authentic2/login_password_form.html
@@ -3,9 +3,9 @@
 <form method="post" action="">
 {% csrf_token %}
 {{ form.as_p }}
-<input type="submit" name="{{ submit_name }}" value="{% trans "Log in" %}"/>
+<button class="submit-button" name="{{ submit_name }}">{% trans "Log in" %}</button>
 {% if cancel %}
-<input type="submit" name="cancel" value="{% trans 'Cancel' %}"/>
+<button class="cancel-button" name="cancel">{% trans 'Cancel' %}</button>
 {% endif %}
 </form>
 </div>
diff --git a/src/authentic2/templates/authentic2/logout_confirm.html b/src/authentic2/templates/authentic2/logout_confirm.html
index 74468c37..ad208d2e 100644
--- a/src/authentic2/templates/authentic2/logout_confirm.html
+++ b/src/authentic2/templates/authentic2/logout_confirm.html
@@ -16,7 +16,7 @@
     <form method="post">
       {% csrf_token %}
       <input type="hidden" name="next" value="{{ next_url }}">
-      <input type="submit" name="submit" value="{% trans "Continue" %}">
+      <button name="submit">{% trans "Continue" %}</button>
       <a href="{{ next_url }}">{% trans "Cancel" %}</a>
     </form>
   </p>
diff --git a/src/authentic2/templates/interaction/consent_attributes.html b/src/authentic2/templates/interaction/consent_attributes.html
index c64054f2..b78795d6 100644
--- a/src/authentic2/templates/interaction/consent_attributes.html
+++ b/src/authentic2/templates/interaction/consent_attributes.html
@@ -28,11 +28,11 @@
 <input type="hidden" name="next" value="{{ next }}" />
 <input type="hidden" name="nonce" value="{{ nonce }}" />
 {% if allow_selection %}
-<input type="submit" name="accept" value="{% trans 'Send selected' %}"/>
+<button name="accept">{% trans 'Send selected' %}</button>
 {% else %}
-<input type="submit" name="accept" value="{% trans 'Send all' %}"/>
+<button name="accept">{% trans 'Send all' %}</button>
 {% endif %}
-<input type="submit" name="refuse" value="{% trans 'Refuse all' %}"/>
+<button name="refuse">{% trans 'Refuse all' %}</button>
 </form>
 </div>
 
diff --git a/src/authentic2/templates/interaction/consent_federation.html b/src/authentic2/templates/interaction/consent_federation.html
index f62f9a5f..17c6666f 100644
--- a/src/authentic2/templates/interaction/consent_federation.html
+++ b/src/authentic2/templates/interaction/consent_federation.html
@@ -20,8 +20,8 @@
 {% csrf_token %}
 <input type="hidden" name="next" value="{{ next }}" />
 <input type="hidden" name="nonce" value="{{ nonce }}" />
-<input type="submit" name="accept" value="{% trans 'Accept' %}"/>
-<input type="submit" name="refuse" value="{% trans 'Refuse' %}"/>
+<button name="accept">{% trans 'Accept' %}</button>
+<button name="refuse">{% trans 'Refuse' %}</button>
 </form>
 </div>
 
diff --git a/src/authentic2/templates/registration/password_change_form.html b/src/authentic2/templates/registration/password_change_form.html
index 9d97574d..0093e2ad 100644
--- a/src/authentic2/templates/registration/password_change_form.html
+++ b/src/authentic2/templates/registration/password_change_form.html
@@ -18,7 +18,7 @@
     {% endblocktrans %}</p>
     {% csrf_token %}
     {{ form.as_p }}
-    <input type="submit" value="{% trans 'Submit' %}" />
-    <input type="submit" name="cancel" formnovalidate value="{% trans "Cancel" %}"/>
+    <button class="submit-button">{% trans 'Submit' %}</button>
+    <button class="cancel-button" name="cancel" formnovalidate>{% trans "Cancel" %}</button>
   </form>
 {% endblock %}
diff --git a/src/authentic2/templates/registration/password_reset_confirm.html b/src/authentic2/templates/registration/password_reset_confirm.html
index 69c5d09b..b713d8fe 100644
--- a/src/authentic2/templates/registration/password_reset_confirm.html
+++ b/src/authentic2/templates/registration/password_reset_confirm.html
@@ -13,7 +13,7 @@
   {% csrf_token %}
   {{ form.as_p }}
 
-  <input type="submit" value="{% trans 'Submit' %}" />
+  <button class="submit-button">{% trans 'Submit' %}</button>
 </form>
 
 {% else %}
diff --git a/src/authentic2/templates/registration/password_reset_form.html b/src/authentic2/templates/registration/password_reset_form.html
index 7c7d2c12..7ddee74a 100644
--- a/src/authentic2/templates/registration/password_reset_form.html
+++ b/src/authentic2/templates/registration/password_reset_form.html
@@ -13,6 +13,6 @@
   {% csrf_token %}
   {{ form.as_p }}
 
-  <input type="submit" value="{% trans 'Submit' %}" />
+  <button class="submit-button">{% trans 'Submit' %}</button>
 </form>
 {% endblock %}
diff --git a/src/authentic2/templates/registration/registration_completion_form.html b/src/authentic2/templates/registration/registration_completion_form.html
index 95ce06ae..cd179aaa 100644
--- a/src/authentic2/templates/registration/registration_completion_form.html
+++ b/src/authentic2/templates/registration/registration_completion_form.html
@@ -28,6 +28,6 @@
       <form method="post">
         {% csrf_token %}
         {{ form.as_p }}
-        <input type="submit" value="{% trans 'Submit' %}" />
+        <button class="submit-button">{% trans 'Submit' %}</button>
       </form>
 {% endblock %}
diff --git a/src/authentic2/templates/registration/registration_form.html b/src/authentic2/templates/registration/registration_form.html
index 85a0f5a3..292cf023 100644
--- a/src/authentic2/templates/registration/registration_form.html
+++ b/src/authentic2/templates/registration/registration_form.html
@@ -18,7 +18,7 @@
 <form method="post">
   {% csrf_token %}
   {{ form.as_p }}
-  <input type="submit" value="{% trans 'Submit' %}" />
+  <button class="submit-button">{% trans 'Submit' %}</button>
 </form>
 
 {% for id, block in frontends.items %}
diff --git a/src/authentic2_auth_saml/templates/authentic2_auth_saml/login.html b/src/authentic2_auth_saml/templates/authentic2_auth_saml/login.html
index 286988bd..656c9aba 100644
--- a/src/authentic2_auth_saml/templates/authentic2_auth_saml/login.html
+++ b/src/authentic2_auth_saml/templates/authentic2_auth_saml/login.html
@@ -1,7 +1,7 @@
 {% load i18n %}<form method="post">
-    <input type="submit" name="{{ submit_name }}" value="{% trans "Login" %}"/>
+    <button class="submit-button" name="{{ submit_name }}">{% trans "Login" %}</button>
     {% if cancel %}
-        <input type="submit" name="cancel" value="{% trans 'Cancel' %}"/>
+        <button class="cancel-button" name="cancel">{% trans 'Cancel' %}</button>
     {% endif %}
 </form>
 
diff --git a/src/authentic2_idp_oidc/templates/authentic2_idp_oidc/authorization.html b/src/authentic2_idp_oidc/templates/authentic2_idp_oidc/authorization.html
index 849eb40b..9c82cbdd 100644
--- a/src/authentic2_idp_oidc/templates/authentic2_idp_oidc/authorization.html
+++ b/src/authentic2_idp_oidc/templates/authentic2_idp_oidc/authorization.html
@@ -16,7 +16,7 @@
       </ul>
     {% endif %}
     {% csrf_token %}
-    <input type="submit" name="accept" value="{% trans "Accept" %}">
-    <input type="submit" name="refuse" value="{% trans "Refuse" %}">
+    <button name="accept">{% trans "Accept" %}</button>
+    <button name="refuse">{% trans "Refuse" %}</button>
   </form>
 {% endblock %}
diff --git a/tests/test_idp_saml2.py b/tests/test_idp_saml2.py
index 481d50ce..4575121c 100644
--- a/tests/test_idp_saml2.py
+++ b/tests/test_idp_saml2.py
@@ -258,8 +258,7 @@ class SamlSSOTestCase(SamlBaseTestCase):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response['Content-Type'].split(';')[0], 'text/html')
-        self.assertInHTML(u'<input type="submit" name="cancel" '
-                          'value="%s"/>' % _('Cancel'), response.content,
+        self.assertInHTML(u'<button class="cancel-button" name="cancel">%s</button>' % _('Cancel'), response.content,
                           count=1)
         if cancel:
             response = client.post(url, {
-- 
2.16.3