Template updates:

- Use python, not template-language, to decide if the month is different.
- Don't use "odate" and add a space where appropriate.
- Use a datetime and time zone instead of hardcoding (ET).
  (let the model combine the date and the time)
 - Legacy-Id: 1158

Author: fenner

ietf/proceedings/models.py

@@ -409,6 +409,8 @@ class Switches(models.Model):
     val = models.IntegerField(null=True, blank=True)
     updated_date = models.DateField(null=True, blank=True)
     updated_time = models.TimeField(null=True, blank=True)
+    def updated(self):
+	return datetime.datetime.combine( self.updated_date, self.updated_time )
     def __str__(self):
 	return self.name
     class Meta:

ietf/templates/meeting/agenda.html

@@ -7,8 +7,8 @@
 
 <center> 
 <strong> Agenda of the {{ meeting_num|ordinal }} IETF Meeting </strong> <br/> 
-<strong>{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }} </strong><br />
-Updated as of {{ last_update_info.updated_date }} {{ last_update_info.updated_time }} (ET)
+<strong>{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date.month meeting_info.end_date.month %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }} </strong><br />
+Updated as of {{ last_update_info.updated|date:"F j, Y P (T)" }}
 </center> 
 
 (<a href="http://www3.ietf.org//meetings/agenda_{{meeting_num}}.txt"> Text Format of the Agenda </a>) <br />

ietf/templates/meeting/list.html

@@ -1,14 +1,16 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
 {% block title %} IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
-{% block content %}
+{% block head %}
 <link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
+{% endblock %}
+{% block content %}
 <center>
 <h2>IETF {{ meeting_num }} Meeting Materials</h2>
 {% if sub_began %}
 <h4>Submission began {{ begin_date|date:"F j, Y" }} </h4>
-<h4>Submission cutoff odate: {{ cut_off_date|date:"F j, Y" }}</h4>
-<h4>Corrections to submissions cutoff date:{{ cor_cut_off_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>
 {% endif %}
 Updated as of {% now "F j, Y, H:i:s (T)" %}
 <br><br>

ietf/templates/meeting/list_closed.html

@@ -1,13 +1,15 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
 {% block title %} IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
-{% block content %}
+{% block head %}
 <link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
+{% 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 odate: {{ cut_off_date|date:"F j, Y" }}</h4>
-<h4>Corrections to submissions cutoff date:{{ cor_cut_off_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>