Skip to content

Commit f87a937

Browse files
rjsparksrjsparks
committed
Splitting the ballot writeups into three pages
 - Legacy-Id: 2412
1 parent 71e513d commit f87a937

5 files changed

Lines changed: 126 additions & 4 deletions

File tree

‎rjs/ietf/templates/idrfc/ballot_approvaltext.html‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}Approval announcement writeup for {{ doc }}{% endblock %}
4+
5+
{% block morecss %}
6+
form #id_approval_text {
7+
width: 700px;
8+
height: 600px;
9+
}
10+
{% endblock %}
11+
12+
{% block content %}
13+
<h1>Approval announcement writeup for {{ doc }}</h1>
14+
15+
<form action="" method="POST">
16+
17+
<p>Sent after approval.</p>
18+
19+
{{ approval_text_form.approval_text }}
20+
21+
<div class="actions">
22+
<a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
23+
<input type="submit" name="save_approval_text" value="Save Approval Announcement Text" />
24+
<input type="submit" name="regenerate_approval_text" value="Regenerate Approval Announcement Text" />
25+
</div>
26+
</form>
27+
28+
{% load ietf_filters %}
29+
{% if user|in_group:"Secretariat" %}
30+
<p>
31+
{% if can_announce %}
32+
<a href="{% url doc_approve_ballot name=doc.filename %}">Approve ballot</a>
33+
{% endif %}
34+
</p>
35+
{% endif %}
36+
{% endblock%}

‎rjs/ietf/templates/idrfc/ballot_lastcalltext.html‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}Last Call text for {{ doc }}{% endblock %}
4+
5+
{% block morecss %}
6+
form #id_last_call_text {
7+
width: 700px;
8+
height: 600px;
9+
}
10+
{% endblock %}
11+
12+
{% block content %}
13+
<h1>Last Call text for {{ doc }}</h1>
14+
15+
<form action="" method="POST">
16+
17+
<p>{{ last_call_form.last_call_text.errors }}</p>
18+
19+
{{ last_call_form.last_call_text }}
20+
21+
<p>{{ last_call_form.last_call_text.errors }}</p>
22+
23+
{% if can_request_last_call and need_intended_status %}
24+
<p>You need to select intended status of {{ need_intended_status }} and regenerate last call text to request last call.</p>
25+
{% endif %}
26+
27+
<div class="actions">
28+
<a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
29+
<input type="submit" name="save_last_call_text" value="Save Last Call Text" />
30+
<input type="submit" name="regenerate_last_call_text" value="Regenerate Last Call Text" />
31+
{% if can_request_last_call and not need_intended_status %}
32+
<input style="margin-left: 8px" type="submit" name="send_last_call_request" value="Save and Request Last Call" />
33+
{% endif %}
34+
</div>
35+
</form>
36+
37+
{% load ietf_filters %}
38+
{% if user|in_group:"Secretariat" %}
39+
<p>
40+
{% if can_make_last_call %}
41+
<a href="{% url doc_make_last_call name=doc.filename %}">Make Last Call</a>
42+
{% endif %}
43+
44+
</p>
45+
{% endif %}
46+
{% endblock%}

‎rjs/ietf/templates/idrfc/ballot_writeupnotes.html‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}Ballot writeup and notes for {{ doc }}{% endblock %}
4+
5+
{% block morecss %}
6+
form #id_ballot_writeup {
7+
width: 700px;
8+
height: 600px;
9+
}
10+
{% endblock %}
11+
12+
{% block content %}
13+
<h1>Ballot writeup and notes for {{ doc }}</h1>
14+
15+
16+
<form action="" method="POST">
17+
18+
<p>(Technical Summary, Working Group Summary, Document Quality,
19+
Personnel, RFC Editor Note, IRTF Note, IESG Note, IANA Note)</p>
20+
21+
<p>This text will be appended to all announcements and messages to
22+
the IRTF or RFC Editor.</p>
23+
24+
{{ ballot_writeup_form.ballot_writeup }}
25+
26+
<div class="actions">
27+
<a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
28+
<input type="submit" name="save_ballot_writeup" value="Save Ballot Writeup" />
29+
<input style="margin-left: 8px" type="submit" name="issue_ballot" value="Save and {% if ballot.ballot_issued %}Re-{% endif %}Issue Ballot" />
30+
</div>
31+
</form>
32+
33+
34+
{% endblock%}

‎rjs/ietf/templates/idrfc/doc_main.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ <h1>{% block doc_h1 %}{% endblock %}</h1>
9595
<span id="doc_edit_state_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_change_state name=doc.draft_name %}">Change state</a></span></span>
9696

9797
<span id="doc_edit_info_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_edit_info name=doc.draft_name %}">Edit</a></span></span>
98-
{% if not doc.ietf_process_has_iesg_ballot %}
99-
<span id="doc_edit_info_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_ballot_writeups name=doc.draft_name %}">Ballot Writeups</a></span></span>
100-
{% endif %}
10198
{% else %}
10299
<span id="doc_add_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_edit_info name=doc.draft_name %}">Add</a></span></span>
103100
{% endif %}

‎rjs/ietf/templates/idrfc/doc_main_id.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,20 @@
7676
{% endblock doc_metatable %}
7777

7878
{% block doc_metalinks %}
79-
<a href="mailto:{{doc.draft_name}}@tools.ietf.org?subject=Mail%20regarding%20{{doc.draft_name}}" rel="nofollow">Email Authors</a>
79+
<div>
80+
<a href="mailto:{{doc.draft_name}}@tools.ietf.org?subject=Mail%20regarding%20{{doc.draft_name}}" rel="nofollow">Email Authors</a>
8081
| <a href="/ipr/search/?option=document_search&amp;id_document_tag={{doc.tracker_id}}" rel="nofollow">IPR Disclosures</a>
8182
| <a href="http://www.fenron.net/~fenner/ietf/deps/index.cgi?dep={{doc.draft_name}}" rel="nofollow">Dependencies to this draft</a>
8283
| <a href="http://tools.ietf.org/idnits?url=http://tools.ietf.org/id/{{doc.draft_name_and_revision}}.txt" rel="nofollow" target="_blank">Check nits</a>
8384
{% if doc.in_ietf_process %}| <a href="/feed/comments/{% if info.is_rfc %}rfc{{doc.rfc_number}}{% else %}{{doc.draft_name}}{% endif %}/">Comments feed</a>{% endif %}
85+
</div>
86+
{% if user|in_group:"Area_Director,Secretariat" %}
87+
<div>
88+
<a href="{% url doc_ballot_lastcall name=doc.draft_name %}">Last Call Text</a>
89+
| <a href="{% url doc_ballot_writeupnotes name=doc.draft_name %}">Ballot Text</a>
90+
| <a href="{% url doc_ballot_approvaltext name=doc.draft_name %}">Announcement Text</a>
91+
</div>
92+
{% endif %}
8493
{% endblock %}
8594

8695
{% block doc_text1 %}

0 commit comments

Comments
 (0)