Use new look for meeting materials page

- Legacy-Id: 2010

ietf/meeting/views.py

@@ -2,7 +2,7 @@
 
 # Create your views here.
 #import models
-from django.shortcuts import render_to_response as render, get_object_or_404
+from django.shortcuts import render_to_response, get_object_or_404
 from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, MeetingVenue, IESGHistory, Proceeding, Switches
 from django.views.generic.list_detail import object_list
 from django.http import HttpResponseRedirect, HttpResponse, Http404
@@ -22,7 +22,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("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})
+        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))
     sub_began = 0
     if now > begin_date:
         sub_began = 1
@@ -96,10 +96,10 @@ def html_agenda(request, num=None):
         template = "meeting/m_agenda.html"
     else:
         template = "meeting/agenda.html"
-    return render(template,
+    return render_to_response(template,
             {"timeslots":timeslots, "update":update, "meeting":meeting, "venue":venue, "ads":ads,
                 "plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, },
-            RequestContext(request))
+            context_instance=RequestContext(request))
 
 def text_agenda(request, num=None):
     timeslots, update, meeting, venue, ads, plenaryw_agenda, plenaryt_agenda = agenda_info(num)

ietf/templates/meeting/list.html

@@ -1,14 +1,15 @@
+{% extends "idrfc/base.html" %}
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% extends "base.html" %}
-{% block title %} IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
-{% block head %}
-<link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
-{% endblock %}
-{% block css %}
-h2.divider { background:#2647A0; color:white; padding:0.5em 1em; };
-{% endblock %}
+{% block title %}IETF {{ meeting_num }} Preliminary &amp; Interim Materials{% endblock %}
+{% block morecss %}
+table.ietf-materials { width: 99%; border-bottom:1px solid #cbcbcb; nopadding: 0; margin: 0; vertical-align: top; border-collapse: collapse;}
+table.ietf-materials tr {vertical-align: top; }
+table.ietf-materials td { padding:0.5em 0; }
+{% endblock morecss %}
+
 {% block content %}
-<h1 style="align:center">IETF {{ meeting_num }} Meeting Materials</h1>
+<h1>IETF {{ meeting_num }} Meeting Materials</h1>
+
 {% if sub_began %}
 <p>Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}<br/>
 Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
@@ -18,7 +19,7 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
 
 {% regroup object_list|dictsort:"area" by area_name as areas %}
   {% for wgs in areas %}
-   <h2 class="divider">{{ wgs.grouper }}</h2>
+   <h2 class="ietf-divider">{{ wgs.grouper }}</h2>
     {% ifequal wgs.grouper "Plenary Sessions" %}
     {% for wg in wgs.list|dictsortreversed:"acronym" %}
       {% include "meeting/list_group.html" %}
@@ -29,35 +30,35 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
     {% endfor %}
   {% endifequal %}
   {% endfor %}
-<!--- Training Sessions --->
+<!-- Training Sessions -->
 {% if training_list %}
-<h2 class="divider">Training</h2>
+<h2 class="ietf-divider">Training</h2>
 {% for wg in training_list|dictsort:"acronym" %}
 
 <table cellpadding="0" cellspacing="0" border="0" width="99%" style="border-bottom:1px solid #cbcbcb;">
-<tr><a name="wg-{{ wg.acronym }}"></a>
-<td style="width:12em;"><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
+<tr>
+<td style="width:12em;"><a name="wg-{{ wg.acronym }}"></a><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
 {% for slide in wg.slides %}
 <a href="http://www3.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|escape }}</a><br/>
 {% endfor %}
 </td></tr></table>
 {% endfor %}  
 {% endif %}
-<!--- End of Training Sessions --->
-<!--- IRTF Sessions --->
+<!-- End of Training Sessions -->
+<!-- IRTF Sessions -->
 {% if irtf_list %}
-<h2 class="divider">IRTF</h2>
+<h2 class="ietf-divider">IRTF</h2>
 {% for wg in irtf_list|dictsort:"acronym_lower" %}
    {% include "meeting/list_group.html" %}
 {% endfor %}
 {% endif %}
-<!--- End of IRTF Sessions --->
-<!--- Interim Meetings --->
+<!-- End of IRTF Sessions -->
+<!-- Interim Meetings -->
 {% if interim_list %}
-<h2 class="divider">Interim Meetings</h2>
+<h2 class="ietf-divider">Interim Meetings</h2>
 {% for wg in interim_list|dictsort:"acronym" %}
   {% include "meeting/list_group.html" %}
 {% endfor %}
 {% endif %}
-<!--- End of Imterim Meetings --->
+<!-- End of Imterim Meetings -->
 {% endblock %}

ietf/templates/meeting/list_closed.html

@@ -1,19 +1,13 @@
+{% extends "idrfc/base.html" %}
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% extends "base.html" %}
-{% block title %} IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
-{% block head %}
-<link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
-{% endblock %}
+{% block title %}IETF {{ meeting_num }} Preliminary &amp; Interim Materials {% endblock %}
 {% block content %}
-<center>
-<h2>IETF {{ meeting_num }} Preliminary & Interim Materials</h2>
-<h4>Submission began {{ begin_date|date:"F j, Y" }} </h4>
-<h4>Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}</h4>
-<h4>Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }} </h4>
-</center>
-<br>
-<i>
-The IETF {{ meeting_num }} Preliminary & Interim Materials page is now closed.<br>
-You should be able to access the final version of IETF {{ meeting_num }} Proceedings via <a href="http://www.ietf.org/proceedings_directory.html">IETF Online Proceedings page</a>.<br>
-</i>
+<h1>IETF {{ meeting_num }} Preliminary &amp; Interim Materials</h1>
+
+<p>Submission began {{ begin_date|date:"F j, Y" }}<br/>
+Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}<br/>
+Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
+
+<p>The IETF {{ meeting_num }} Preliminary &amp; Interim Materials page is now closed.<br/>
+<p>You should be able to access the final version of IETF {{ meeting_num }} Proceedings via the <a href="http://www.ietf.org/meeting/proceedings.html">IETF Online Proceedings page</a>.</p>
 {% endblock %}

ietf/templates/meeting/list_group.html

@@ -1,6 +1,6 @@
-<table cellpadding="0" cellspacing="0" border="0" width="99%" style="border-bottom:1px solid #cbcbcb;">
-<tr><a name="wg-{{ wg.acronym }}"></a>
-<td style="width:12em;"><b>{% ifequal wg.acronym "plenaryw" %}Wednesday<br/>Plenary{%else%}{% ifequal wg.acronym "plenaryt" %}Thursday<br/>Plenary{%else%}{{ wg.acronym|upper }}{%endifequal%}{%endifequal%}
+<table class="ietf-materials">
+<tr>
+<td style="width:12em;"><a name="wg-{{ wg.acronym }}"></a><b>{% ifequal wg.acronym "plenaryw" %}Wednesday<br/>Plenary{%else%}{% ifequal wg.acronym "plenaryt" %}Thursday<br/>Plenary{%else%}{{ wg.acronym|upper }}{%endifequal%}{%endifequal%}
 {% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
 </td>
 <td>

static/css/base2.css

@@ -114,3 +114,4 @@ table.ballot_icon td.ballot_icon_my { border: 3px outset black;}
 
 .ietf-highlight-y { padding:0 2px;background:yellow;font-size:85%;}
 .ietf-highlight-r { padding:0 2px;background:#ffa0a0;font-size:85%;}
+.ietf-divider { background: #2647a0; color: white; font-size:116%; padding:0.5em 1em; }