Facelift the relatively trivial meeting pages

- Legacy-Id: 8942

ietf/meeting/views.py

@@ -369,12 +369,11 @@ def agenda(request, num=None, name=None, base=None, ext=None):
     meeting = get_meeting(num)
     schedule = get_schedule(meeting, name)
     if schedule == None:
-        return HttpResponse(render_to_string("meeting/no-"+base+ext,
-            {'meeting':meeting }, RequestContext(request)), content_type=mimetype[ext])
+        base = base.replace("-utc", "")
+        return render(request, "meeting/no-"+base+ext, {'meeting':meeting }, content_type=mimetype[ext])
 
     updated = meeting_updated(meeting)
-    return HttpResponse(render_to_string("meeting/"+base+ext,
-        {"schedule":schedule, "updated": updated}, RequestContext(request)), content_type=mimetype[ext])
+    return render(request, "meeting/"+base+ext, {"schedule":schedule, "updated": updated}, content_type=mimetype[ext])
 
 def read_agenda_file(num, doc):
     # XXXX FIXME: the path fragment in the code below should be moved to

ietf/templates/meeting/agenda.html

@@ -30,20 +30,7 @@ tr:first-child th.gap {
 <div class="row">
 	<div class="col-md-10">
 
-<h1>
-	IETF {{ schedule.meeting.number }} meeting agenda
-	{% if "-utc" in request.path %}
-		(UTC)
-	{% endif %}
-	<br>
-	<small>
-		{{ schedule.meeting.city }}, {{ schedule.meeting.date|date:"F j" }} -
-		{% if schedule.meeting.date.month != schedule.meeting.end_date.month %}
-			{{ schedule.meeting.end_date|date:"F " }}
-		{% endif %}
-		{{ schedule.meeting.end_date|date:"j, Y" }}
-	</small>
-</h1>
+          {% include "meeting/meeting_heading.html" with meeting=schedule.meeting %}
 
 <p class="label label-info">Updated {{ updated|date:"Y-m-d \a\t G:i:s (T)" }}</p>
 <p></p>

ietf/templates/meeting/materials_upload_closed.html

@@ -1,13 +1,17 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
+{% extends "ietf.html" %}
+
 {% block title %}IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
+
 {% block content %}
 <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>
+  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>
+<p>The IETF {{ meeting_num }} Preliminary &amp; Interim Materials page is now closed.</p>
+
+<p>You should be able to access the final version of IETF {{ meeting_num }} Proceedings via the <a href="https://www.ietf.org/meeting/proceedings.html">IETF Online Proceedings page</a>.</p>
 {% endblock %}

ietf/templates/meeting/meeting_heading.html

@@ -0,0 +1,12 @@
+{# assumes meeting is in context #}
+<h1>
+  IETF {{ meeting.number }} Meeting Agenda
+  <br>
+  <small>
+    {{ meeting.city }}, {{ meeting.date|date:"F j" }} -
+    {% if meeting.date.month != meeting.end_date.month %}
+      {{ meeting.end_date|date:"F " }}
+    {% endif %}
+    {{ meeting.end_date|date:"j, Y" }}
+  </small>
+</h1>

ietf/templates/meeting/no-agenda-utc.html

@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-{% load ietf_filters %}
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% load humanize %}
-{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
-
-{% block content %}
-<h1>IETF {{ meeting.number }} Meeting Agenda</h1>
-
-<p>{{ meeting.city }}, {{ meeting.date|date:"F j" }} &#8211; {% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}<br />
-</p>
-
-<h1>There is no Agenda available yet.</h1>
-
-{% endblock %}

ietf/templates/meeting/no-agenda.html

@@ -1,15 +1,11 @@
-{% extends "base.html" %}
-{% load ietf_filters %}
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% load humanize %}
+{% extends "ietf.html" %}
+
 {% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
 
 {% block content %}
-<h1>IETF {{ meeting.number }} Meeting Agenda</h1>
-
-<p>{{ meeting.city }}, {{ meeting.date|date:"F j" }} &#8211; {% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}<br />
-</p>
-
-<h1>There is no Agenda available yet.</h1>
+  {% include "meeting/meeting_heading.html" %}
 
+  <div class="jumbotron">
+    <p>There is no agenda available yet.</p>
+  </div>
 {% endblock %}

ietf/templates/meeting/private_agenda.html

@@ -1,7 +1,6 @@
-{% extends "base.html" %}
-{% load ietf_filters %}
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% load humanize %}
+{% extends "ietf.html" %}
+
+{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
 
 {% block morecss %}
 {% for area in area_list %}
@@ -9,22 +8,15 @@
 {% endfor %}
 {% endblock morecss %}
 
-{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
-{% load agenda_custom_tags %}
-
 {% block start_content_table %}{% endblock %}
 {% block end_content_table %}{% endblock %}
 
 {% block content %}
-
 <div id="read_only">
-<p>
-You do not have access this agenda. It belongs to {{ schedule.owner }}.
-</p>
-<p>
-<a href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}">List your meetings</a>.
-</p>
-<div class="wrapper custom_text_stuff">
-</div>
+  <p>You do not have access this agenda. It belongs to {{ schedule.owner }}.</p>
 
+  <p><a href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}">List your meetings</a>.</p>
+
+  <div class="wrapper custom_text_stuff"></div>
+</div>
 {% endblock %}

ietf/templates/meeting/session_details.html

@@ -1,25 +1,26 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
 
-{% block title %} {{meeting}} : {{acronym}} {% endblock %}
+{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
 
 {% block morecss %}
 .timeheader {font-size:120%;}
 {% endblock %}
 
 {% block content %}
-<h1> {{ meeting }} : {{ acronym }} : {{ time }} </h1>
+<h1>{{ meeting }} : {{ acronym }} : {{ time }} </h1>
+
 {% if session.name %}
-<h2> {{session.name}} </h2>
+<h2>{{ session.name }}</h2>
 {% endif %}
 
 {% if session.sessionpresentation_set.all.count %}
-<p>Materials:
-<ul>
-{% for pres in session.sessionpresentation_set.all %}
-<li><a href="{% url 'doc_view' name=pres.document.name rev=pres.rev%}">{{pres.document.name}}-{{pres.rev}}</a></li>
-{% endfor %}
-</ul>
-</p>
+  <p>Materials:</p>
+
+  <ul>
+    {% for pres in session.sessionpresentation_set.all %}
+      <li><a href="{% url 'doc_view' name=pres.document.name rev=pres.rev%}">{{ pres.document.name }}-{{ pres.rev }}</a></li>
+    {% endfor %}
+  </ul>
 {% endif %}
 
 {% endblock %}

ietf/templates/meeting/session_list.html

@@ -1,13 +1,13 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
 
-{% block title %} {{meeting}} : {{acronym}} {% endblock %}
+{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
 
 {% block content %}
-<h1> {{ meeting }} : {{acronym}} </h1>
+<h1>{{ meeting }} : {{ acronym }}</h1>
 
 <ul>
 {% for session in sessions %}
-  <li> <a href="{{forloop.counter}}">{{session}}</a></li>
+  <li> <a href="{{ forloop.counter }}/">{{session}}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}