Skip to content

Commit 416cc5b

Browse files
committed
Remove misleading back buttons from document metadata modification pages. Fixes ietf-tools#1671. Commit ready for merge.
- Legacy-Id: 9792
1 parent cfe7442 commit 416cc5b

10 files changed

Lines changed: 11 additions & 21 deletions

ietf/templates/doc/ballot/approvaltext.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
{% block content %}
1111
{% origin %}
12-
<h1>Approval announcement writeup<br><small>{{ doc }}</small></h1>
12+
<h1>Approval announcement writeup<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1313

1414
{% bootstrap_messages %}
1515

@@ -23,7 +23,6 @@ <h1>Approval announcement writeup<br><small>{{ doc }}</small></h1>
2323
{% if user|has_role:"Secretariat" and can_announce %}
2424
<a class="btn btn-default" href="{% url "doc_approve_ballot" name=doc.name %}">Approve ballot</a>
2525
{% endif %}
26-
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
2726
{% endbuttons %}
2827
</form>
2928

ietf/templates/doc/ballot/approve_ballot.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{% block content %}
1010
{% origin %}
11-
<h1>Approve ballot<br><small>{{ doc }}</small></h1>
11+
<h1>Approve ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1212

1313
<form role="form" method="post">
1414
{% csrf_token %}
@@ -22,7 +22,6 @@ <h1>Approve ballot<br><small>{{ doc }}</small></h1>
2222
{% elif action == "do_not_publish" %}
2323
<button class="btn btn-warning" type="submit">Email RFC Editor (DNP) & close ballot"/>
2424
{% endif %}
25-
<a class="btn btn-default pull-right" href="{% url "doc_ballot_approvaltext" name=doc.name %}">Back</a>
2625
{% endbuttons %}
2726
</form>
2827
{% endblock %}

ietf/templates/doc/ballot/ballot_issued.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{% block content %}
88
{% origin %}
9-
<h1>Ballot issued<br><small>{{ doc }}</small></h1>
9+
<h1>Ballot issued<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1010

1111
<p>Ballot has been sent out.</p>
1212

@@ -16,5 +16,4 @@ <h1>Ballot issued<br><small>{{ doc }}</small></h1>
1616
<p>The document is not on any telechat agenda.</p>
1717
{% endif %}
1818

19-
<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
2019
{% endblock %}

ietf/templates/doc/ballot/clear_ballot.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{% block content %}
88
{% origin %}
9-
<h1>Clear ballot<br><small>{{ doc }}</small></h1>
9+
<h1>Clear ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1010

1111
<form role="form" method="post">
1212
{% csrf_token %}
@@ -18,7 +18,6 @@ <h1>Clear ballot<br><small>{{ doc }}</small></h1>
1818

1919
{% buttons %}
2020
<button type="submit" class="btn btn-danger">Clear</button>
21-
<a class="btn btn-default pull-right" href="{{ back_url }}ballot/">Back</a>
2221
{% endbuttons %}
2322
</form>
2423

ietf/templates/doc/ballot/defer_ballot.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{% block content %}
1010
{% origin %}
11-
<h1>Defer ballot<br><small>{{ doc }}</small></h1>
11+
<h1>Defer ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1212

1313
<form role="form" method="post">
1414
{% csrf_token %}
@@ -19,7 +19,6 @@ <h1>Defer ballot<br><small>{{ doc }}</small></h1>
1919
</p>
2020

2121
{% buttons %}
22-
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
2322
<button type="submit" class="btn btn-danger">Defer ballot</button>
2423
{% endbuttons %}
2524
</form>

ietf/templates/doc/ballot/edit_position.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
{% load origin %}
44
{% load bootstrap3 %}
55

6-
{% block title %}Change position for {{ ad.plain_name }} on {{ doc }}{% endblock %}
6+
{% block title %}Change position for {{ ad.plain_name }}{% endblock %}
77

88
{% block content %}
99
{% origin %}
10-
<h1>Change position for {{ ad.plain_name }}<br><small>{{ doc }}</small></h1>
10+
<h1>Change position for {{ ad.plain_name }} regarding <br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1111

1212
{% bootstrap_messages %}
1313

@@ -44,7 +44,6 @@ <h1>Change position for {{ ad.plain_name }}<br><small>{{ doc }}</small></h1>
4444
<input type="submit" class="btn btn-danger" name="Defer" value="Defer ballot">
4545
{% endif %}
4646
{% endif %}
47-
<a class="btn btn-default pull-right" href="{{ doc.get_absolute_url }}">Back</a>
4847
{% endbuttons %}
4948
</form>
5049
{% endblock %}

ietf/templates/doc/ballot/lastcalltext.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
{% block content %}
1111
{% origin %}
12-
<h1>Last call text<br><small>{{ doc }}</small></h1>
12+
<h1>Last call text<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1313

1414
{% bootstrap_messages %}
1515

@@ -32,7 +32,6 @@ <h1>Last call text<br><small>{{ doc }}</small></h1>
3232
{% if user|has_role:"Secretariat" and can_make_last_call %}
3333
<a class="btn btn-danger" href="{% url "doc_make_last_call" name=doc.name %}">Issue last call</a>
3434
{% endif %}
35-
<a class="btn btn-default pull-right" href="{% url "doc_view" name=doc.name %}">Back</a>
3635
{% endbuttons %}
3736
</form>
3837

ietf/templates/doc/ballot/send_ballot_comment.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
{% block content %}
1212
{% origin %}
13-
<h1>Send ballot position for {{ ad }}</h1>
13+
<h1>Send ballot position for {{ ad }} on <a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></h1>
1414

1515
<form role="form" method="post">
1616
{% csrf_token %}
@@ -61,7 +61,6 @@ <h1>Send ballot position for {{ ad }}</h1>
6161

6262
{% buttons %}
6363
<button type="submit" class="btn btn-danger">Send</button>
64-
<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
6564
{% endbuttons %}
6665
</form>
6766

ietf/templates/doc/ballot/undefer_ballot.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{% block content %}
1010
{% origin %}
11-
<h1>Undefer ballot<br><small>{{ doc }}</small></h1>
11+
<h1>Undefer ballot<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1212

1313
<form role="form" class="undefer" method="post">
1414
{% csrf_token %}
@@ -19,7 +19,6 @@ <h1>Undefer ballot<br><small>{{ doc }}</small></h1>
1919
</p>
2020

2121
{% buttons %}
22-
<a class="btn btn-default pull-right" href="{{ back_url }}">Back</a>
2322
<button class="btn btn-danger" type="submit">Undefer ballot</button>
2423
{% endbuttons %}
2524
</form>

ietf/templates/doc/ballot/writeupnotes.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{% block content %}
1010
{% origin %}
1111

12-
<h1>Ballot writeup and notes<br><small>{{ doc }}</small></h1>
12+
<h1>Ballot writeup and notes<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
1313

1414
{% bootstrap_messages %}
1515

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

0 commit comments

Comments
 (0)