Show action items in IESG agenda; updated some links in IESG agenda

 - Legacy-Id: 1860

Author: pasieronen

ietf/iesg/views.py

@@ -32,14 +32,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Create your views here.
-#from django.views.generic.date_based import archive_index
+import codecs
 from ietf.idtracker.models import IDInternal, InternetDraft,AreaGroup, Position
 from django.views.generic.list_detail import object_list
 from django.views.generic.simple import direct_to_template
 from django.http import Http404, HttpResponse
 from django.template import RequestContext, Context, loader
 from django.shortcuts import render_to_response
+from django.conf import settings
 from ietf.iesg.models import TelechatDates, TelechatAgendaItem, WGAction
 from ietf.idrfc.idrfc_wrapper import IdWrapper, RfcWrapper
 from ietf.idrfc.models import RfcIndex
@@ -162,7 +162,13 @@ def telechat_agenda(request, date=None):
     mgmt = agenda_management_issues(date)
     wgs = agenda_wg_actions(date)
     private = 'private' in request.REQUEST
-    return render_to_response('iesg/agenda.html', {'date':str(date), 'docs':docs,'mgmt':mgmt,'wgs':wgs, 'private':private}, context_instance=RequestContext(request) )
+    try:
+        f = codecs.open(settings.IESG_TASK_FILE, 'r', 'utf-8', 'replace')
+        action_items = f.read().strip()
+        f.close()
+    except IOError:
+        action_items = "(Error reading task.txt)"
+    return render_to_response('iesg/agenda.html', {'date':str(date), 'docs':docs,'mgmt':mgmt,'wgs':wgs, 'action_items':action_items,'private':private}, context_instance=RequestContext(request) )
 
 
 def telechat_agenda_documents_txt(request):

ietf/settings.py

@@ -167,6 +167,7 @@
 IPR_DOCUMENT_PATH = '/a/www/ietf-ftp/ietf/IPR/'
 # Path to Work Group Description Text Files
 IETFWG_DESCRIPTIONS_PATH = '/a/www/www6s/wg-descriptions/'
+IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt'
 
 # External page top and bottom, which gives a html page the current menubar
 # and footer used in the current web-page design

ietf/templates/iesg/agenda.html

@@ -43,6 +43,7 @@
 .agenda h4 { margin-left: 60px; margin-top: 0; margin-bottom: 0; }
 .agenda table { margin-left: 90px; margin-top:0em; margin-bottom: 1em;}
 .agenda #section2 p, #section3 p, #section4 p { margin-left:90px; margin-top: 0; margin-bottom:0; font-style:italic;}
+.agenda #section1 pre { margin-left: 60px; }
 .agenda blockquote { margin-left: 30px; width: 70ex;}
 .agenda #section3 blockquote { margin-left: 60px; }
 </style>
@@ -60,13 +61,15 @@ <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 %}<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 the past telechat</h3>
-
-   <h3>1.4 List of Remaining {% if private %}<a href="https://www.ietf.org/IESG/internal/task.txt">Action Items</a>{%else%}Action Items{%endif%} from Last Telechat</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 the past telechat</h3>
+   <h3>1.4 List of Remaining Action Items from Last Telechat</h3>
+<pre>
+{{ action_items }}
+</pre>
 </div>
 
 <h2>2. Protocol Actions</h2>

ietf/templates/iesg/agenda_wg.html

@@ -41,13 +41,9 @@
 <td>{{wg.area|upper}}</td>
 <td>{{ wg.obj.status_date|date:"M d"}}</td>
 <td>
-{% if private %}
-<a href="http://www.ietf.org/IESG/EVALUATIONS/{{wg.obj.group_acronym}}-charter.txt">
-{% endif %}
+<a href="http://www.ietf.org/iesg/evaluation/{{wg.obj.group_acronym}}-charter.txt">
 {{ wg.obj.group_acronym.name|escape }} ({{wg.obj.group_acronym}})
-{% if private %}
 </a>
-{% endif %}
 </td>
 </tr>
 {% if wg.obj.token_name %}