0001-misc-switch-form-buttons-to-button-markup-22438.patch

Frédéric Péters, 22 mars 2018 09:45

Voir les différences: en ligne côte à côte

Subject: [PATCH] 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      | 4 ++--
 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           | 2 +-
 .../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 ++--
 src/authentic2/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 +-
 src/authentic2_auth_saml/templates/authentic2_auth_saml/login.html  | 4 ++--
 .../templates/authentic2_idp_oidc/authorization.html                | 4 ++--
 tests/test_idp_saml2.py                                             | 3 +--
 25 files changed, 42 insertions(+), 43 deletions(-)

         <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>

     <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>

                 {% 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 %}
-...
         <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>

src/authentic2/manager/static/authentic2/manager/css/style.css
86	86	width: 30%;
87	87	}
88	88
89		.other_actions input[type=submit] {
	89	.other_actions button {
90	90	display: block;
91	91	margin: 5px;
92	92	width: 100%;
...	...
112	112	max-width: 50%;
113	113	}
114	114
115		.warning-box input[type=submit] {
	115	.warning-box button {
116	116	float: right;
117	117	}
118	118

               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();
-...
                   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);
-...
                     $('#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');
             });

             {% 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 %}

     {% 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 %}

     <table>
         {{ form.as_table }}
     </table>
     <input type="submit"/>
     <button>{% trans "Submit" %}</button>
     </div>

        {% endif %}
        <noscript>
          <div class="buttons-bar">
           <input type="submit" name="sendButton" value="{% trans 'Send' %}" />
           <button name="sendButton">{% trans 'Send' %}</button>
          </div>
       </noscript>
       </form>

       {% 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 %}

         {% 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 %}

       <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 %}

               {% 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 %}

     <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>

         <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>

     <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>

     {% 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>

         {% 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 %}

       {% csrf_token %}
       {{ form.as_p }}
       <input type="submit" value="{% trans 'Submit' %}" />
       <button class="submit-button">{% trans 'Submit' %}</button>
     </form>
     {% else %}

src/authentic2/templates/registration/password_reset_form.html
13	13	{% csrf_token %}
14	14	{{ form.as_p }}
15	15
16		<input type="submit" value="{% trans 'Submit' %}" />
	16	<button class="submit-button">{% trans 'Submit' %}</button>
17	17	</form>
18	18	{% endblock %}

src/authentic2/templates/registration/registration_completion_form.html
28	28	<form method="post">
29	29	{% csrf_token %}
30	30	{{ form.as_p }}
31		<input type="submit" value="{% trans 'Submit' %}" />
	31	<button class="submit-button">{% trans 'Submit' %}</button>
32	32	</form>
33	33	{% endblock %}

     <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 %}

     {% 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>

           </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 %}

             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, {
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-misc-switch-form-buttons-to-button-markup-22438.patch