Summary: Fix some inconsistencies regarding whether to use

{% buttons %} or <div class="buttonlist"> for form buttons
 - Legacy-Id: 8992
This commit is contained in:
Ole Laursen 2015-02-05 14:44:08 +00:00
parent 78e3a620ce
commit 1d2883a9a2
9 changed files with 28 additions and 28 deletions

View file

@ -9,8 +9,8 @@
{% 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>
@ -18,6 +18,6 @@
<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 %}

View file

@ -13,10 +13,10 @@
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 %}

View file

@ -45,11 +45,10 @@
<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 %}

View file

@ -8,10 +8,11 @@
<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 %}

View file

@ -12,10 +12,10 @@
<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 %}

View file

@ -15,10 +15,10 @@
<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 %}

View file

@ -15,10 +15,10 @@
<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 %}

View file

@ -67,10 +67,10 @@ Upon submission:
<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>

View file

@ -15,10 +15,10 @@
{% 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 %}