IESG telechat agenda: include "private" links also if logged in, link from document list

pasieronen · pasieronen · commit a4cc886f6016 · 2010-02-18T19:58:06.000Z
- Legacy-Id: 2000
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
@@ -1,5 +1,5 @@
 {% comment %}
-Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
 
 Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #}
 {% endcomment %}
-
+{% load ietf_filters %}
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -62,11 +62,11 @@ <h1>IESG Agenda</h1>
 <h2>1. Administrivia</h2>
 <div id="section1">
 
-   <h3>1.1 {% if private %}<a href="https://www.ietf.org/iesg/internal/rollcall.txt">Roll Call</a>{%else%}Roll Call{%endif%}</h3>
+   <h3>1.1 {% if private or user|in_group:"Area_Director,Secretariat" %}<a href="https://www.ietf.org/iesg/internal/rollcall.txt">Roll Call</a>{%else%}Roll Call{%endif%}</h3>
 
    <h3>1.2 Bash the Agenda</h3>
 
-   <h3>1.3 Approval of the {% if private %}<a href="https://www.ietf.org/iesg/internal/minutes.txt">Minutes</a>{%else%}Minutes{%endif%} of Past Telechats</h3>
+   <h3>1.3 Approval of the {% if private or user|in_group:"Area_Director,Secretariat" %}<a href="https://www.ietf.org/iesg/internal/minutes.txt">Minutes</a>{%else%}Minutes{%endif%} of Past Telechats</h3>
    <h3>1.4 List of Remaining Action Items from Last Telechat</h3>
 <pre>
 {{ action_items }}
@@ -87,7 +87,7 @@ <h3>1.4 List of Remaining Action Items from Last Telechat</h3>
 
 <h2>5. IAB News We Can Use</h2>
 
-<h2>{% if private %}<a href="https://datatracker.ietf.org/cgi-bin/display_news.cgi?template_type=3">6. Management Issues</a>{%else%}6. Management Issues{%endif%}</h2>
+<h2>{% if private or user|in_group:"Area_Director,Secretariat" %}<a href="https://datatracker.ietf.org/cgi-bin/display_news.cgi?template_type=3">6. Management Issues</a>{%else%}6. Management Issues{%endif%}</h2>
 <div id="section6">
 {% for m in mgmt %}
 <h3>6.{{forloop.counter}} {{m.title|escape}}</h3>
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
@@ -60,6 +60,10 @@ <h1>Documents on Future IESG Telechat Agendas</h1>
 
 <tr class="header telechat_date"><td colspan="5">IESG telechat {{t.date}}</td></tr>
 
+{% if forloop.first %}
+<tr class="header"><td colspan="5"><a href="/iesg/agenda/">Full IESG Agenda</a></td></tr>
+{% endif %}
+
 <tr class="header"><td colspan="5">2. Protocol Actions</td></tr>
 
 <tr class="header"><td colspan="5">2.1 WG Submissions</td></tr>
