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

Fixup special init charter/recharter pages to make the process more self-explanatory.

Browse source 
- Legacy-Id: 4403
This commit is contained in:
Ole Laursen 2012-05-07 16:25:04 +00:00
parent 79b4c0843b
commit 2e4ceb5a55
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ietf/templates/wgcharter/change_state.html
View file

@ -20,7 +20,9 @@ form.change-state .actions {
{% block content %}
<h1>{{ title }}</h1>
{% if "Change state" in title %}<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>{% endif %}
{% if not option %}
<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>
{% endif %}
<form class="change-state" action="" method="post">
<table>
@ -60,9 +62,10 @@ form.change-state .actions {
{% endif %}
<tr>
<td colspan="2" class="actions">
{% if option %}
<input type="submit" value="Submit"/>
{% else %}
{% if option == "initcharter" or option == "recharter" %}
<input type="submit" value="Save and continue to submission of charter text"/>
{% endif %}
{% if not option or option == "abandon" %}
<a href="{% url doc_view name=doc.name %}">Back</a>
<input type="submit" value="Save and (possibly) notify Secretariat"/>
{% endif %}

4
ietf/wgcharter/views.py
View file

@ -141,10 +141,10 @@ def change_state(request, name, option=None):
init = dict()
elif option == "initcharter":
hide = ['charter_state']
init = dict(initial_time=1, message="%s has initiated chartering of the proposed WG %s (%s)" % (login.plain_name(), wg.name, wg.acronym))
init = dict(initial_time=1, message="%s has initiated chartering of the proposed WG %s (%s)." % (login.plain_name(), wg.name, wg.acronym))
elif option == "abandon":
hide = ['initial_time', 'charter_state']
init = dict(message="%s has abandoned the chartering effort on the WG %s (%s)" % (login.plain_name(), wg.name, wg.acronym))
init = dict(message="%s has abandoned the chartering effort on the WG %s (%s)." % (login.plain_name(), wg.name, wg.acronym))
else:
hide = ['initial_time']
s = charter.get_state()