Summary: Fix some inconsistencies regarding whether to use

{% buttons %} or <div class="buttonlist"> for form buttons
 - Legacy-Id: 8992

Author: OleLaursen

ietf/templates/doc/ballot/approve_ballot.html

@@ -9,15 +9,15 @@ <h1>Approve ballot<br><small>{{ doc }}</small></h1>
 	{% csrf_token %}
 	<pre>{{ announcement }}</pre>
 
-	<div class="buttonlist">
-		{% if action == "to_announcement_list" %}
+        {% buttons %}
+                {% if action == "to_announcement_list" %}
 			<button class="btn btn-warning" type="submit">Notify RFC Editor, send announcement & close ballot</button>
 		{% elif action == "to_rfc_editor" %}
 			<button class="btn btn-warning" type="submit">Email RFC Editor & close ballot</button>
 		{% elif action == "do_not_publish" %}
 			<button class="btn btn-warning" type="submit">Email RFC Editor (DNP) & close ballot"/>
 		{% endif %}
 		<a class="btn btn-default pull-right" href="{% url "doc_ballot_approvaltext" name=doc.name %}">Back</a>
-	</div>
+        {% endbuttons %}
 </form>
 {% endblock %}

ietf/templates/doc/ballot/clear_ballot.html

@@ -13,10 +13,10 @@ <h1>Clear ballot<br><small>{{ doc }}</small></h1>
 		This will clear all ballot positions and discuss entries.
 	</p>
 
-	<div class="buttonlist">
-		<button type="submit" class="btn btn-danger">Clear</button>
+        {% buttons %}
+                <button type="submit" class="btn btn-danger">Clear</button>
 		<a class="btn btn-default pull-right" href="{{ back_url }}ballot/">Back</a>
-	</div>
+        {% endbuttons %}
 </form>
 
 {% endblock %}

ietf/templates/doc/ballot/send_ballot_comment.html

@@ -45,11 +45,10 @@ <h1>Send ballot position for {{ ad }}</h1>
 		<pre>{{ body|wrap_text }}</pre>
 	</div>
 
-	<div class="buttonlist">
-		<input type="submit" class="btn btn-danger" value="Send">
+        {% buttons %}
+                <button type="submit" class="btn btn-danger">Send</button>
 		<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
-	</div>
-
+        {% endbuttons %}
 </form>
 
 {% endblock %}

ietf/templates/doc/charter/approve.html

@@ -8,10 +8,11 @@ <h1>Approve {{ charter.canonical_name }}-{{ charter.rev }}</h1>
 <form role="form" method="post">
 	{% csrf_token %}
 	<pre>{{ announcement }}</pre>
-	<div class="buttonlist">
-		<button type="submit" class="btn btn-primary">Send announcement, close ballot & update revision</button>
-	    <a class="btn btn-default" href="{% url "charter_edit_announcement" name=charter.canonical_name ann="action" %}?next=approve">Edit/regenerate announcement</a>
-        <a class="btn btn-default pull-right" href="{% url "doc_view" name=charter.name %}">Back</a>
-    </div>
+
+        {% buttons %}
+          <button type="submit" class="btn btn-primary">Send announcement, close ballot & update revision</button>
+          <a class="btn btn-default" href="{% url "charter_edit_announcement" name=charter.canonical_name ann="action" %}?next=approve">Edit/regenerate announcement</a>
+          <a class="btn btn-default pull-right" href="{% url "doc_view" name=charter.name %}">Back</a>
+        {% endbuttons %}
 </form>
 {% endblock %}

ietf/templates/doc/draft/request_resurrect.html

@@ -12,10 +12,10 @@ <h1>Request resurrection<br><small>{{ doc }}</small></h1>
 <form role="form" method="post">
 	{% csrf_token %}
 
-	<div class="buttonlist">
-		<input class="btn btn-primary" type="submit" value="Request resurrection">
+        {% buttons %}
+                <input class="btn btn-primary" type="submit" value="Request resurrection">
 		<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
-	</div>
+        {% endbuttons %}
 </form>
 
 {% endblock %}

ietf/templates/doc/draft/resurrect.html

@@ -15,10 +15,10 @@ <h1>Resurrect<br><small>{{ doc }}</small></h1>
 <form role="form" method="post">
 	{% csrf_token %}
 
-	<div class="buttonlist">
-		<input class="btn btn-primary" type="submit" value="Resurrect">
+        {% buttons %}
+                <input class="btn btn-primary" type="submit" value="Resurrect">
 		<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
-	</div>
+        {% endbuttons %}
 </form>
 
 {% endblock %}

ietf/templates/doc/status_change/edit_relations.html

@@ -15,10 +15,10 @@ <h1>Edit RFCs affected by status change</h1>
 		<div class="alert alert-danger">{{ form.non_field_errors }}</div>
 	{% endif %}
 
-	<div class="buttonlist">
+        {% buttons %}
                 <button type="submit" class="btn btn-primary">Save</button>
 		<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
-	</div>
+        {% endbuttons %}
 </form>
 {% endblock %}
 

ietf/templates/doc/submit_to_iesg.html

@@ -67,10 +67,10 @@ <h1>Publication request<br><small>{{doc.name}}-{{doc.rev}}</small></h1>
 
 <form role="form" method="post">
 	{% csrf_token %}
-	<div class="buttonlist">
+        {% buttons %}
 		<input type="submit" class="btn btn-warning" name="confirm" value="Request publication">
 		<input type="submit" class="btn btn-default pull-right" name="cancel" value="Back">
-	</div>
+        {% endbuttons %}
 </form>
 
 

ietf/templates/submit/cancel_preapproval.html

@@ -15,10 +15,10 @@ <h2>Cancel pre-approval</h2>
 	{% csrf_token %}
 	<input type="hidden" name="action" value="cancel">
 
-	<div class="buttonlist">
-		<button type="submit" class="btn btn-danger">Cancel pre-approval</button>
+        {% buttons %}
+                <button type="submit" class="btn btn-danger">Cancel pre-approval</button>
 		<a class="btn btn-default pull-right" href="{% url "submit_approvals" %}#preapprovals">Back</a>
-	</div>
+        {% endbuttons %}
 </form>
 
 {% endblock %}