Clean up /doc/ page for charter slightly.

- Legacy-Id: 4264
This commit is contained in:
Ole Laursen 2012-04-05 16:37:31 +00:00
parent 7e501c93f9
commit 725ff12306
2 changed files with 15 additions and 18 deletions

View file

@ -42,6 +42,13 @@
{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
- <a href="{% url wg_change_state name=doc.group.acronym %}">Change state</a>
{% if chartering %}
- <a href="{% url wg_startstop_process name=doc.group.acronym option='abandon' %}">Abandon effort</a>
{% else %}
- <a href="{% url wg_startstop_process name=doc.group.acronym option='recharter' %}">Recharter</a>
{% endif %}
{% endif %}
</td>
</tr>
@ -74,29 +81,17 @@
</table>
<div class="actions">
{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
{% if chartering %}
{% if doc.group.state_id != "conclude" %}
<a href="{% url wg_submit name=doc.group.acronym %}">Edit charter text</a>
{% endif %}
<a href="{% url wg_startstop_process name=doc.group.acronym option='abandon' %}">Abandon effort</a>
{% else %}
<a href="{% url wg_startstop_process name=doc.group.acronym option='recharter' %}">Recharter</a>
{% endif %}
{% endif %}
<a href="/feed/wgcomments/{{ doc.group.acronym }}/">Atom feed</a>
<a href="/feed/wgchanges/{{ doc.group.acronym }}/">Atom feed</a>
</div>
</div>
<p>Other versions: <a href="{{ txt_url }}">plain text</a></p>
<h3>Charter {{ doc.name }}-{{ doc.rev }}</h3>
<h3>Charter {{ doc.name }}-{{ doc.rev }}
{% if user|has_role:"Area Director,Secretariat" and chartering and doc.group.state_id != "conclude" %}
<a class="edit" href="{% url wg_submit name=doc.group.acronym %}">Edit charter text</a>
{% endif %}
</h3>
<div class="markup_draft">
{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}

View file

@ -22,3 +22,5 @@
.writeup pre.editable { background-color: #efefff; min-height: 3em; }
.writeup a.edit { float: right; }
h3 a.edit { font-weight: normal; font-size: 13px; display: inline-block; margin-left: 0.5em;}