Add new field meeting.acknowledgements and corresponding page in meeting proceedings. Commit ready for merge.

- Legacy-Id: 11765

ietf/meeting/models.py

@@ -80,6 +80,7 @@ class Meeting(models.Model):
     agenda_note = models.TextField(blank=True, help_text="Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.")
     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
+    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

@@ -1146,3 +1146,18 @@ class FloorPlanTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         
+
+class ProceedingsTests(TestCase):
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+    
+    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)
+    

ietf/meeting/urls.py

@@ -67,6 +67,7 @@ type_ietf_only_patterns_id_optional = [
     url(r'^room-view(?:.html)?/?$', views.room_view),
     url(r'^materials(?:.html)?/?$', views.materials),
     url(r'^proceedings(?:.html)?/?$', views.proceedings),
+    url(r'^proceedings/acknowledgements/$', views.proceedings_acknowledgements),
 ]
 
 urlpatterns = [

ietf/meeting/views.py

@@ -1468,3 +1468,11 @@ def proceedings(request, num=None):
         'submission_started': now > begin_date,
         'cache_version': cache_version,
     })
+
+@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

@@ -23,6 +23,14 @@
           <b>This page is under construction</b> 	
       </p>
 
+      <h2 class="anchor-target" id="introduction">Introduction</h2>
+      <div class="list-group">
+        <a class="list-group-item" href="{% url 'ietf.meeting.views.proceedings_acknowledgements' num=meeting_num %}">Acknowledgements</a>
+        <a class="list-group-item" href="#">IETF Overview</a>
+        <a class="list-group-item" href="#">Progress Report</a>
+        <a class="list-group-item" href="#">Attendees</a>
+      </div>
+      
       {# 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_num cache_version %}
@@ -154,6 +162,7 @@
 
     <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 %}