Fix buildbot errors, 28, 29, 30

 - Legacy-Id: 534

Author: Michael Lee

ietf/meeting/views.py

@@ -15,6 +15,9 @@ def show_html_materials(request, meeting_num=None):
     now = datetime.date.today()
     if 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})
+    sub_began = 0
+    if now > begin_date:
+        sub_began = 1
     # List of WG sessions and Plenary sessions
     queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4), Q(irtf__isnull=True) | Q(irtf=0))
     queryset_irtf = WgMeetingSession.objects.filter(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4, irtf__gt=0)
@@ -27,7 +30,7 @@ def show_html_materials(request, meeting_num=None):
         if item.group_acronym_id < -2:
             if item.slides():
                 queryset_training.append(item)
-    return object_list(request,queryset=queryset_list, template_name="meeting/list.html",allow_empty=True, extra_context={'meeting_num':meeting_num,'irtf_list':queryset_irtf, 'interim_list':queryset_interim, 'training_list':queryset_training, 'begin_date':begin_date, 'cut_off_date':cut_off_date, 'cor_cut_off_date':cor_cut_off_date})
+    return object_list(request,queryset=queryset_list, template_name="meeting/list.html",allow_empty=True, extra_context={'meeting_num':meeting_num,'irtf_list':queryset_irtf, 'interim_list':queryset_interim, 'training_list':queryset_training, 'begin_date':begin_date, 'cut_off_date':cut_off_date, 'cor_cut_off_date':cor_cut_off_date,'sub_began':sub_began})
 
 def show_html_agenda(request, meeting_num=None, html_or_txt=None):
     queryset_list=MeetingTime.objects.filter(meeting=meeting_num).exclude(day_id=0).order_by("day_id","time_desc")

ietf/proceedings/models.py

@@ -72,6 +72,20 @@ def isWG(self):
                     return False
             except IETFWG.DoesNotExist:
                 return False
+    def group_type_str(self):
+        if self.irtf:
+              return ""
+        else:
+            try:
+                g_type_id = IETFWG.objects.get(pk=self.group_acronym_id).group_type_id 
+                if g_type_id == 1:
+                    return "WG"
+                elif g_type_id == 3:
+                    return "BOF"
+                else:
+                    return ""
+            except IETFWG.DoesNotExist:
+                return ""
 
 class Meeting(models.Model):
     meeting_num = models.IntegerField(primary_key=True)

ietf/templates/mailinglists/nwg_wizard_base.html

@@ -13,8 +13,8 @@
 
 {% block content %}
 <blockquote>
-<img src="/images/nwg/mail_title_submission.gif" border="0"><br>
-<img src="/images/nwg/t_un1.gif" border="0">
+<img src="https://datatracker.ietf.org/images/nwg/mail_title_submission.gif" border="0"><br>
+<img src="https://datatracker.ietf.org/images/nwg/t_un1.gif" border="0">
 <!-- form step {{ step }} -->
 <br>
 {% block nwgcontent %}

ietf/templates/mailinglists/nwg_wizard_step0.html

@@ -7,7 +7,7 @@ <h4>Please use this Web tool to add a new entry to the <a href="/mailinglists/no
 </p><p>
 <h2>Step 1</h2>
 <h3>Please select one:</h3>
-<form action="." method="POST">
+<form action="." method="POST" name="aform">
 {{ form.add_edit_fields.0 }}<br>
 {{ form.add_edit_fields.1 }}{{ form.list_id }}<br>
 {{ form.add_edit_fields.2 }}{{ form.list_id_delete }}<br>

ietf/templates/meeting/agenda.html

@@ -7,10 +7,10 @@
 <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 {% now "F j, Y" %}<br />
+Updated As of {% now "F j, Y, P (T)" %}<br />
 </center> 
 
-<a href="http://www3.ietf.org//meetings/agenda_{{meeting_num}}.txt"> Text Format of the Agenda </a> <br />
+(<a href="http://www3.ietf.org//meetings/agenda_{{meeting_num}}.txt"> Text Format of the Agenda </a>) <br />
 <P>
 *** Click on an acronym of the group to get a charter page *** <br />
 *** Click on a name of the group to get a meeting agenda *** <br />
@@ -53,7 +53,7 @@
           {% else %}
              <table border="0" cellspacing="0" cellpadding="0" width="800">
              {% for session in item.sessions|dictsort:"area" %}
-	        <tr><td width="200">{{ session.room_id.room_name }}</td><td width="50">{{ session.area|upper }}</td><td width="100">{% if session.isWG %}<a href="http://www.ietf.org/html.charters/{{ session.acronym|lower }}-charter.html">{{ session.acronym|lower }}</a>{% else %}{{ session.acronym|lower }}{% endif %}</td><td>{% if session.agenda_file %}<a href="http://www3.ietf.org/proceedings/{{ session.agenda_file }}">{{ session.acronym_name }}</a>{% else %}{{ session.acronym_name }}{% endif %}{% if session.special_agenda_note %} <b>- {{ session.special_agenda_note|upper }}</b>{% endif %}</td></tr>
+	        <tr><td width="200">{{ session.room_id.room_name }}</td><td width="50">{{ session.area|upper }}</td><td width="100">{% if session.isWG %}<a href="http://www.ietf.org/html.charters/{{ session.acronym|lower }}-charter.html">{{ session.acronym|lower }}</a>{% else %}{{ session.acronym|lower }}{% endif %}</td><td>{% if session.agenda_file %}<a href="http://www3.ietf.org/proceedings/{{ session.agenda_file }}">{{ session.acronym_name }} {{ session.group_type_str }}</a>{% else %}{{ session.acronym_name }}{% endif %}{% if session.special_agenda_note %} <b>- {{ session.special_agenda_note|upper }}</b>{% endif %}</td></tr>
              {% endfor %}
              </table>
           {% endifequal %}

ietf/templates/meeting/agenda.txt

@@ -10,7 +10,7 @@ xml:lang="en-US"><head><title>Agenda of the {{ meeting_num|ordinal }} IETF Meeti
 {% filter center:72 %}Agenda of the {{ meeting_num|ordinal }} IETF Meeting{% endfilter %}
 {% filter center:72 %}{{ 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" }}{% endfilter %}
 
-Updated As of : {% now "F j, Y" %}
+Updated As of : {% now "F j, Y P (T)" %}
 
 {{ meeting_info.start_date|date:"l"|upper }}, {{ meeting_info.start_date|date:"F j, Y" }}
 {{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }}
@@ -48,7 +48,7 @@ Updated As of : {% now "F j, Y" %}
 </pre>
 {% else %}
 <pre>{% for session in item.sessions|dictsort:"area" %}
-{{ session.room_id.room_name|ljust:20 }} {{ session.area|upper|ljust:5 }} {{ session.acronym|lower|ljust:10 }} {{ session.acronym_name }}{% if session.special_agenda_note %} - {{ session.special_agenda_note|upper }}{% endif %}{% endfor %}</pre>
+{{ session.room_id.room_name|ljust:20 }} {{ session.area|upper|ljust:5 }} {{ session.acronym|lower|ljust:10 }} {{ session.acronym_name }} {{ session.group_type_str }}{% if session.special_agenda_note %} - {{ session.special_agenda_note|upper }}{% endif %}{% endfor %}</pre>
           {% endifequal %}
       {% endifequal %}
    {% endfor %}

ietf/templates/meeting/list.html

@@ -3,12 +3,13 @@
 {% block content %}
 <link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
 <center>
-<h2>IETF {{ meeting_num }} Preliminary & Interim Materials</h2>
+<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>
-<br>
-Updated as of {% now "r" %}
+{% endif %}
+Updated as of {% now "F j, Y, P (T)" %}
 <br><br>
 
 {% regroup object_list|dictsort:"area" by area_name as areas %}
@@ -22,7 +23,7 @@ <h4>Corrections to submissions cutoff date:{{ cor_cut_off_date|date:"F j, Y" }}
     {% for wg in wgs.list|dictsort:"acronym" %}
       <table cellpadding="0" cellspacing="0" border="2" width="80%">
         <tr><a name="wg-{{ wg.acronym }}"></a>
-          <td align="center" bgcolor="#DDFFDD" width="20%"><b>{{ wg.acronym|upper }}</b><br>
+          <td align="center" bgcolor="#DDFFDD" width="20%"><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br>
           {% if wg.agenda_file %}<a href="http://www3..ietf.org/proceedings/{{ wg.agenda_file }}">[Agenda]</a>{% endif %}{% if wg.minute_file %} <a href="http://www3.ietf.org/proceedings/{{ wg.minute_file }}">[Minutes]</a>{% endif %}</td>
           <td><table border="1" width="100%">
 {% include "meeting/submission_status_snippet.html" %}
@@ -38,6 +39,7 @@ <h4>Corrections to submissions cutoff date:{{ cor_cut_off_date|date:"F j, Y" }}
     {% endfor %}
   {% endfor %}
 <!--- Training Sessions --->
+{% if training_list %}
   <table cellpadding="0" cellspacing="0" border="2" width="80%">
     <tr>
       <td colspan=2 bgcolor="#0911DC" valign="center"><font color="#FFFFFF"><center><br><h3><img src="https://www.ietf.org/images/ib2.gif" width="100%" height=21><br>Training</h3></center></font>
@@ -55,8 +57,10 @@ <h4>Corrections to submissions cutoff date:{{ cor_cut_off_date|date:"F j, Y" }}
       </tr>
     </table>
 {% endfor %}  
+{% endif %}
 <!--- End of Training Sessions --->
 <!--- IRTF Sessions --->
+{% if irtf_list %}
   <table cellpadding="0" cellspacing="0" border="2" width="80%">
     <tr>
       <td colspan=2 bgcolor="#0911DC" valign="center"><font color="#FFFFFF"><center><br><h3><img src="https://www.ietf.org/images/ib2.gif" width="100%" height=21><br>IRTF</h3></center></font>
@@ -79,8 +83,10 @@ <h4>Corrections to submissions cutoff date:{{ cor_cut_off_date|date:"F j, Y" }}
       </tr>
     </table>
 {% endfor %}
+{% endif %}
 <!--- End of IRTF Sessions --->
 <!--- Interim Meetings --->
+{% if interim_list %}
   <table cellpadding="0" cellspacing="0" border="2" width="80%">
     <tr>
       <td colspan=2 bgcolor="#0911DC" valign="center"><font color="#FFFFFF"><center><br><h3><img src="https://www.ietf.org/images/ib2.gif" width="100%" height=21><br>Interim Meetings</h3></center></font>
@@ -100,6 +106,7 @@ <h4>Corrections to submissions cutoff date:{{ cor_cut_off_date|date:"F j, Y" }}
       </tr>
     </table>
 {% endfor %}
+{% endif %}
 <!--- End of Imterim Meetings --->
 </center>
 {% endblock %}