altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [9792] from jmh@joelhalpern.com:

Browse source 
Remove misleading back buttons from document metadata modification pages.  Fixes #1671.
 - Legacy-Id: 9814
Note: SVN reference [9792] has been migrated to Git commit 416cc5bf0b
This commit is contained in:
Henrik Levkowetz 2015-07-19 10:45:05 +00:00
parent eb522faa25 416cc5bf0b
commit a97792e92f
10 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/templates/doc/ballot/approvaltext.html
View file

@ -9,7 +9,7 @@
{% block content %}
{% origin %}
<h1>Approval announcement writeup<br><small>{{ doc }}</small></h1>
<h1>Approval announcement writeup<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
{% bootstrap_messages %}
@ -23,7 +23,6 @@
{% if user|has_role:"Secretariat" and can_announce %}
<a class="btn btn-default" href="{% url "doc_approve_ballot" name=doc.name %}">Approve ballot</a>
{% endif %}
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
{% endbuttons %}
</form>

3
ietf/templates/doc/ballot/approve_ballot.html
View file

@ -8,7 +8,7 @@
{% block content %}
{% origin %}
<h1>Approve ballot<br><small>{{ doc }}</small></h1>
<h1>Approve ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
<form method="post">
{% csrf_token %}
@ -22,7 +22,6 @@
{% 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>
{% endbuttons %}
</form>
{% endblock %}

3
ietf/templates/doc/ballot/ballot_issued.html
View file

@ -6,7 +6,7 @@
{% block content %}
{% origin %}
<h1>Ballot issued<br><small>{{ doc }}</small></h1>
<h1>Ballot issued<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
<p>Ballot has been sent out.</p>
@ -16,5 +16,4 @@
<p>The document is not on any telechat agenda.</p>
{% endif %}
<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
{% endblock %}

3
ietf/templates/doc/ballot/clear_ballot.html
View file

@ -6,7 +6,7 @@
{% block content %}
{% origin %}
<h1>Clear ballot<br><small>{{ doc }}</small></h1>
<h1>Clear ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
<form method="post">
{% csrf_token %}
@ -18,7 +18,6 @@
{% buttons %}
<button type="submit" class="btn btn-danger">Clear</button>
<a class="btn btn-default pull-right" href="{{ back_url }}ballot/">Back</a>
{% endbuttons %}
</form>

3
ietf/templates/doc/ballot/defer_ballot.html
View file

@ -8,7 +8,7 @@
{% block content %}
{% origin %}
<h1>Defer ballot<br><small>{{ doc }}</small></h1>
<h1>Defer ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
<form method="post">
{% csrf_token %}
@ -19,7 +19,6 @@
</p>
{% buttons %}
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
<button type="submit" class="btn btn-danger">Defer ballot</button>
{% endbuttons %}
</form>

5
ietf/templates/doc/ballot/edit_position.html
View file

@ -3,11 +3,11 @@
{% load origin %}
{% load bootstrap3 %}
{% block title %}Change position for {{ ad.plain_name }} on {{ doc }}{% endblock %}
{% block title %}Change position for {{ ad.plain_name }}{% endblock %}
{% block content %}
{% origin %}
<h1>Change position for {{ ad.plain_name }}<br><small>{{ doc }}</small></h1>
<h1>Change position for {{ ad.plain_name }} regarding <br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
{% bootstrap_messages %}
@ -44,7 +44,6 @@
<input type="submit" class="btn btn-danger" name="Defer" value="Defer ballot">
{% endif %}
{% endif %}
<a class="btn btn-default pull-right" href="{{ doc.get_absolute_url }}">Back</a>
{% endbuttons %}
</form>
{% endblock %}

3
ietf/templates/doc/ballot/lastcalltext.html
View file

@ -9,7 +9,7 @@
{% block content %}
{% origin %}
<h1>Last call text<br><small>{{ doc }}</small></h1>
<h1>Last call text<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
{% bootstrap_messages %}
@ -32,7 +32,6 @@
{% if user|has_role:"Secretariat" and can_make_last_call %}
<a class="btn btn-danger" href="{% url "doc_make_last_call" name=doc.name %}">Issue last call</a>
{% endif %}
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
{% endbuttons %}
</form>

3
ietf/templates/doc/ballot/send_ballot_comment.html
View file

@ -10,7 +10,7 @@
{% block content %}
{% origin %}
<h1>Send ballot position for {{ ad }}</h1>
<h1>Send ballot position for {{ ad }} on <a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></h1>
<form method="post">
{% csrf_token %}
@ -61,7 +61,6 @@
{% buttons %}
<button type="submit" class="btn btn-danger">Send</button>
<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
{% endbuttons %}
</form>

3
ietf/templates/doc/ballot/undefer_ballot.html
View file

@ -8,7 +8,7 @@
{% block content %}
{% origin %}
<h1>Undefer ballot<br><small>{{ doc }}</small></h1>
<h1>Undefer ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
<form class="undefer" method="post">
{% csrf_token %}
@ -19,7 +19,6 @@
</p>
{% buttons %}
<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
<button class="btn btn-danger" type="submit">Undefer ballot</button>
{% endbuttons %}
</form>

3
ietf/templates/doc/ballot/writeupnotes.html
View file

@ -9,7 +9,7 @@
{% block content %}
{% origin %}
<h1>Ballot writeup and notes<br><small>{{ doc }}</small></h1>
<h1>Ballot writeup and notes<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
{% bootstrap_messages %}
@ -24,7 +24,6 @@
{% buttons %}
<button type="submit" class="btn btn-primary" name="save_ballot_writeup" value="Save Ballot Writeup">Save</button>
<button type="submit" class="btn btn-warning" name="issue_ballot" value="Save and Issue Ballot">Save & {% if ballot_issued %}re-{% endif %}issue ballot</button>
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
{% endbuttons %}
</form>