Merged from rcross: Add Introduction header to proceedings. Add Ackno…

…wlegements to the meeting model. Add a view for acknowlegements. Commit ready for merge.

 - Legacy-Id: 11770

ietf/meeting/models.py

@@ -89,6 +89,7 @@ class Meeting(models.Model):
     agenda     = models.ForeignKey('Schedule',null=True,blank=True, related_name='+')
     session_request_lock_message = models.CharField(blank=True,max_length=255) # locked if not empty
     proceedings_final = models.BooleanField(default=False, help_text=u"Are the proceedings for this meeting complete?")
+    acknowledgements = models.TextField(blank=True, help_text="Acknowledgements for use in meeting proceedings.  Use ReStructuredText markup.")
 
     def __unicode__(self):
         if self.type_id == "ietf":

ietf/meeting/tests_views.py

@@ -263,6 +263,13 @@ def test_proceedings(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
+    def test_proceedings_acknowledgements(self):
+        meeting = make_meeting_test_data()
+        url = urlreverse('ietf.meeting.views.proceedings_acknowledgements',kwargs={'num':meeting.number})
+        login_testing_unauthorized(self,"secretary",url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
     def test_feed(self):
         meeting = make_meeting_test_data()
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()

ietf/meeting/urls.py

@@ -69,6 +69,7 @@
     url(r'^materials(?:.html)?/?$', views.materials),
     url(r'^proceedings(?:.html)?/?$', views.proceedings),
     url(r'^proceedings(?:.html)?/finalize/?$', views.finalize_proceedings),
+    url(r'^proceedings/acknowledgements/$', views.proceedings_acknowledgements),
 ]
 
 urlpatterns = [

ietf/meeting/views.py

@@ -1555,7 +1555,6 @@ def proceedings(request, num=None):
         'cache_version': cache_version,
     })
 
-
 @role_required('Secretariat')
 def finalize_proceedings(request, num=None):
 
@@ -1570,3 +1569,10 @@ def finalize_proceedings(request, num=None):
 
     return render(request, "meeting/finalize.html", {'meeting':meeting,})
 
+@role_required('Secretariat')
+def proceedings_acknowledgements(request, num=None):
+
+    meeting = get_meeting(num)
+    return render(request, "meeting/proceedings_acknowledgements.html", {
+        'meeting': meeting,
+    })

ietf/templates/meeting/proceedings.html

@@ -34,7 +34,15 @@ <h1>IETF {{ meeting.number }} {% if not meeting.proceedings_final %}Draft{% endi
 
       {# cache for 15 minutes, as long as there's no proceedings activity. takes 4-8 seconds to generate. #}
       {% load cache %}
-      {% cache 900 ietf_meeting_materials meeting.number cache_version %}
+      {% cache 900 ietf_meeting_proceedings meeting.number cache_version %}
+
+      <h2 class="anchor-target" id="introduction">Introduction</h2>
+      <div>
+        <a href="{% url 'ietf.meeting.views.proceedings_acknowledgements' num=meeting.number %}">Acknowledgements</a><br>
+        <a href="#">IETF Overview</a><br>
+        <a href="#">Progress Report</a><br>
+        <a href="#">Attendees</a><br>
+      </div> 
 
         {% with "True" as show_agenda %}
           <!-- Plenaries -->
@@ -163,6 +171,7 @@ <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</sm
 
     <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
       <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <li><a href="#introduction">Introduction</a></li>
         {% if plenaries %}
           <li><a href="#plenaries">Plenaries</a></li>
         {% endif %}

ietf/templates/meeting/proceedings_acknowledgements.html

@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin markup_tags %}
+
+{% block title %}IETF {{ meeting.number }} Proceedings {% endblock %}
+
+{% block content %}
+  {% origin %}
+  <h1><a href="{% url 'ietf.meeting.views.proceedings' num=meeting.number %}">IETF {{ meeting.number }} Proceedings</a></h1>
+  <h2>Acknowledgements</h2>
+
+  {{ meeting.acknowledgements | apply_markup:"restructuredtext" }}
+
+{% endblock %}