Added a section to the meeting materials page for IAB sessions. Added a link bar at the top to make it easier to find sections like Training and IAB.

- Legacy-Id: 5636

ietf/meeting/urls.py

@@ -6,7 +6,7 @@ from django.views.generic.simple import redirect_to
 from ietf.meeting import views
 
 urlpatterns = patterns('',
-    (r'^(?P<meeting_num>\d+)/materials.html$', views.show_html_materials),
+    (r'^(?P<meeting_num>\d+)/materials.html$', views.materials),
     (r'^agenda/$', views.html_agenda),
     (r'^agenda(?:.html)?$', views.html_agenda),
     (r'^agenda-utc(?:.html)?$', views.html_agenda_utc),

ietf/meeting/views.py

@@ -37,7 +37,7 @@ from ietf.group.models import Group
 
 
 @decorator_from_middleware(GZipMiddleware)
-def show_html_materials(request, meeting_num=None):
+def materials(request, meeting_num=None):
     proceeding = get_object_or_404(Proceeding, meeting_num=meeting_num)
     begin_date = proceeding.sub_begin_date
     cut_off_date = proceeding.sub_cut_off_date
@@ -46,7 +46,7 @@ def show_html_materials(request, meeting_num=None):
     if settings.SERVER_MODE != 'production' and '_testoverride' in request.REQUEST:
         pass
     elif now > cor_cut_off_date:
-        return render_to_response("meeting/list_closed.html",{'meeting_num':meeting_num,'begin_date':begin_date, 'cut_off_date':cut_off_date, 'cor_cut_off_date':cor_cut_off_date}, context_instance=RequestContext(request))
+        return render_to_response("meeting/materials_upload_closed.html",{'meeting_num':meeting_num,'begin_date':begin_date, 'cut_off_date':cut_off_date, 'cor_cut_off_date':cor_cut_off_date}, context_instance=RequestContext(request))
     sub_began = 0
     if now > begin_date:
         sub_began = 1
@@ -55,12 +55,13 @@ def show_html_materials(request, meeting_num=None):
     ietf      = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu')
     irtf      = sessions.filter(group__parent__acronym = 'irtf')
     training  = sessions.filter(group__acronym='edu')
+    iab       = sessions.filter(group__parent__acronym = 'iab')
 
     cache_version = Document.objects.filter(session__meeting__number=meeting_num).aggregate(Max('time'))["time__max"]
     #
-    return render_to_response("meeting/list.html",
+    return render_to_response("meeting/materials.html",
                               {'meeting_num':meeting_num,
-                               'plenaries': plenaries, 'ietf':ietf, 'training':training, 'irtf': irtf,
+                               'plenaries': plenaries, 'ietf':ietf, 'training':training, 'irtf': irtf, 'iab':iab,
                                'begin_date':begin_date, 'cut_off_date':cut_off_date,
                                'cor_cut_off_date':cor_cut_off_date,'sub_began':sub_began,
                                'cache_version':cache_version},
@@ -68,7 +69,7 @@ def show_html_materials(request, meeting_num=None):
 
 def current_materials(request):
     meeting = OldMeeting.objects.exclude(number__startswith='interim-').order_by('-meeting_num')[0]
-    return HttpResponseRedirect( reverse(show_html_materials, args=[meeting.meeting_num]) )
+    return HttpResponseRedirect( reverse(materials, args=[meeting.meeting_num]) )
 
 def get_plenary_agenda(meeting_num, id):
     try:

ietf/templates/meeting/materials.html

@@ -19,47 +19,89 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
 <li><a href="/meeting/{{meeting_num}}/requests">Meeting Request/Conflict Table</a></li>
 </ul>
 
+<div class="ietf-divider"></div>
+<div style="padding: 1em 3em 0 3em;;">
+ {% if plenaries %}
+ <a href="#plenaries"><b>Plenaries</b></a> &nbsp;|&nbsp;
+ {% endif %}
+ {% if ietf %}
+    {% regroup ietf|dictsort:"group.parent.acronym" by group.parent.acronym as areas %}
+    {% for area in areas %}
+       {% if not forloop.first %}&nbsp;|&nbsp;{% endif %}
+       <a href="#{{area.grouper}}"><b>{{ area.grouper.upper }}</b></a>
+    {% endfor %}
+ {% endif %}
+ {% if training %}
+    &nbsp;|&nbsp; <a href="#training"><b>Training</b></a>
+ {% endif %}
+ {% if iab %}
+    &nbsp;|&nbsp; <a href="#iab-sessions"><b>IAB</b></a>
+ {% endif %}
+ {% if irtf %}
+    &nbsp;|&nbsp; <a href="#irtf"><b>IRTF</b></a>
+ {% endif %}
+
+
+
+
+
+</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 %}
 
 <!-- Plenaries -->
 {% if plenaries %}
+    <a name="plenaries"></a>
     <h2 class="ietf-divider">Plenaries</h2>
     {% for session in plenaries %}
-       {% include "meeting/list_group.html" %}
+       {% include "meeting/group_materials.html" %}
     {% endfor %}
 {% endif %}
 
 <!-- Working groups -->
 {% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
 {% for sessions in areas %}
+   <a name="{{sessions.list.0.group.parent.acronym}}"></a>
    <h2 class="ietf-divider">{{ sessions.grouper }}</h2>
    {% for session in sessions.list|dictsort:"group.acronym" %}
       {% ifchanged %}
-	 {% include "meeting/list_group.html" %}
+	 {% include "meeting/group_materials.html" %}
       {% endifchanged %}
    {% endfor %}
 {% endfor %}
 
 <!-- Training Sessions -->
 {% if training %}
+    <a name="training"></a>
     <h2 class="ietf-divider">Training</h2>
     {% for session in training %}
       {% ifchanged %}
-	 {% include "meeting/list_group.html" %}
+	 {% include "meeting/group_materials.html" %}
       {% endifchanged %}
     {% endfor %}
 {% endif %}
 <!-- End of Training Sessions -->
 
+<!-- IAB Sessions -->
+{% if iab %}
+    <a name="iab-sessions"></a>
+    <h2 class="ietf-divider">IAB</h2>
+    {% for session in iab %}
+      {% ifchanged %}
+	 {% include "meeting/group_materials.html" %}
+      {% endifchanged %}
+    {% endfor %}
+{% endif %}
+<!-- End of IAB Sessions -->
 
 <!-- IRTF Sessions -->
 {% if irtf %}
-<h2 class="ietf-divider">IRTF</h2>
+   <a name="irtf"></a>
+   <h2 class="ietf-divider">IRTF</h2>
     {% for session in irtf|dictsort:"group.acronym" %}
       {% ifchanged %}
-	 {% include "meeting/list_group.html" %}
+	 {% include "meeting/group_materials.html" %}
       {% endifchanged %}
     {% endfor %}
 {% endif %}