Merged in Pasi's fixes for links in the public version of the IESG agenda pointing to access restricted pages.

- Legacy-Id: 1310
This commit is contained in:
Henrik Levkowetz 2009-02-06 10:37:14 +00:00
parent 60160068ca
commit 8023e79818
2 changed files with 26 additions and 3 deletions

View file

@ -48,8 +48,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<a href="{{ doc.obj.document.doclink }}">{{doc.obj.document.displayname}}</a>
{% if doc.obj.ballot.active %}
<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={{ doc.obj.draft_id }}">[Open Web Ballot]</a></td></tr>
{% if private %}
<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={{ doc.obj.draft_id }}">
{% else %}
<a href="/idtracker/ballot/{{ doc.obj.ballot_id}}/">
{% endif %}
[Open Web Ballot]</a>
{% endif %}
</td></tr>
{% if doc.obj.note %} {# note: note is not escaped #}
<tr><td></td><td></td><td>Note: {{ doc.obj.note }}</td></tr>
@ -57,7 +63,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% else %} {# ballot_set #}
<td>Multi-Document Ballot: <a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={{ doc.obj.draft_id }}">[Open Web Ballot]</a></td></tr>
<td>Multi-Document Ballot:
{% if doc.obj.ballot.active %}
{% if private %}
<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={{ doc.obj.draft_id }}">
{% else %}
<a href="/idtracker/ballot/{{ doc.obj.ballot_id }}/">
{% endif %}
[Open Web Ballot]</a>
{% endif %}
</td></tr>
{% for obj2 in doc.obj.ballot_set %}
<tr><td></td><td></td><td>{{ obj2.draft.title|escape }} ({{ obj2.draft.intended_status }})</td></tr>

View file

@ -40,7 +40,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<tr>
<td>{{wg.area|upper}}</td>
<td>{{ wg.obj.status_date|date:"M d"}}</td>
<td><a href="http://www.ietf.org/IESG/EVALUATIONS/{{wg.obj.group_acronym}}-charter.txt">{{ wg.obj.group_acronym.name|escape }} ({{wg.obj.group_acronym}})</a></td>
<td>
{% if private %}
<a href="http://www.ietf.org/IESG/EVALUATIONS/{{wg.obj.group_acronym}}-charter.txt">
{% endif %}
{{ wg.obj.group_acronym.name|escape }} ({{wg.obj.group_acronym}})
{% if private %}
</a>
{% endif %}
</td>
</tr>
{% if wg.obj.token_name %}
<tr><td></td><td>Token:</td><td>{{ wg.obj.token_name|escape }}</td></tr>