tutorial schedule templating

pycon_project/apps/schedule/views.py

@@ -70,7 +70,7 @@ def schedule_tutorials(request):
                 "sessions": Session.objects.filter(slot=2).order_by("pk"),
             }
         }, 
-        "thrus": {
+        "thurs": {
             "morning": {
                 "slot": Slot.objects.get(id=3),
                 "sessions": Session.objects.filter(slot=3).order_by("pk"),

pycon_project/templates/schedule/_session.html

@@ -0,0 +1,15 @@
+<div class="session">
+    <div class="title">
+        <a href="{% url schedule_session session.pk %}">{{ session.title }}</a>
+    </div>
+    <div class="metadata">
+        {{ session.get_audience_level_display }}
+        {{ session.get_session_type_display }}
+        by
+        {{ session.speaker }}
+        {% if session.additional_speakers.all %}
+            with
+            {{ session.additional_speakers.all|join:", " }}
+        {% endif %}
+    </div>
+</div>

pycon_project/templates/schedule/index.html

@@ -10,7 +10,7 @@ <h1>Schedule</h1>
     </div>
 
     <ul>
+        <li><a href="{% url schedule_tutorials %}">Tutorial Schedule</a></li>
         <li><a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a></li>
-        <li><a href="{% url schedule_list_tutorials %}">List of Accepted Tutorials</a></li>
     </ul>
 {% endblock %}

pycon_project/templates/schedule/list_talks.html

@@ -15,7 +15,7 @@
 {% block subnav %}
     <a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
     |
-    <a href="{% url schedule_list_tutorials %}">List of Accepted Tutorials</a>
+    <a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
 {% endblock %}
 
 {% block body %}

pycon_project/templates/schedule/list_tutorials.html

@@ -15,7 +15,7 @@
 {% block subnav %}
     <a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
     |
-    <a href="{% url schedule_list_tutorials %}">List of Accepted Tutorials</a>
+    <a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
 {% endblock %}
 
 {% block body %}

pycon_project/templates/schedule/session_detail.html

@@ -2,23 +2,30 @@
 
 {% load timezone_filters %}
 
-{% block body %}
-<h1>{{ session.title }}</h1>
-
-<div class="session_types">{{ session.get_audience_level_display }} / {{ session.get_session_type_display }}</div>
-
-<div class="speakers">
-    {% for speaker in session.speakers %}
-    <a href="{% url speaker_profile speaker.id %}">{{ speaker }}</a>
-    {% if not forloop.last %}, {% endif %}{% endfor %}
-</div>
+{% block subnav %}
+    <a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
+    |
+    <a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
+{% endblock %}
 
-{% if session.slot %}
-    <div class="slot">{{ session.slot.start|localtime:timezone|date:"F jS" }} {{ session.slot.start|localtime:timezone|date:"P" }} &ndash; {{ session.slot.end|localtime:timezone|date:"P" }}</div>
-{% endif %}
-
-<div class="description">{{ session.description }}</div>
-
-<h3>Abstract</h3>
-<div class="abstract">{{ session.abstract_html|safe }}</div>
+{% block body %}
+    <h1>{{ session.title }}</h1>
+
+    <div class="session_types">{{ session.get_audience_level_display }} / {{ session.get_session_type_display }}</div>
+
+    <div class="speakers">
+        {% for speaker in session.speakers %}
+        <a href="{% url speaker_profile speaker.id %}">{{ speaker }}</a>
+        {% if not forloop.last %}, {% endif %}{% endfor %}
+    </div>
+
+    {% if session.slot %}
+        <div class="slot">{{ session.slot.start|localtime:timezone|date:"F jS" }} {{ session.slot.start|localtime:timezone|date:"P" }} &ndash; {{ session.slot.end|localtime:timezone|date:"P" }}</div>
+    {% endif %}
+
+    <div class="description">{{ session.description }}</div>
+
+    <h3>Abstract</h3>
+
+    <div class="abstract">{{ session.abstract_html|safe }}</div>
 {% endblock %}

pycon_project/templates/schedule/tmp_session_detail.html

@@ -68,7 +68,7 @@
 {% block subnav %}
     <a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
     |
-    <a href="{% url schedule_list_tutorials %}">List of Accepted Tutorials</a>
+    <a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
 {% endblock %}
 
 {% block body %}

pycon_project/templates/schedule/tutorials.html

@@ -0,0 +1,51 @@
+{% extends "schedule/base.html" %}
+
+{% block extra_head %}
+    <style>
+        .session {
+            margin-top: 10px;
+        }
+        .title {
+            font-size: 14pt;
+            font-weight: bold;
+        }
+    </style>
+{% endblock %}
+
+{% block subnav %}
+    <a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
+{% endblock %}
+
+{% block body %}
+    <h1>Tutorial Schedule</h1>
+
+    <h2>Wednesday, March 9th</h2>
+
+    <h3>Morning ({{ tutorials.wed.morning.slot.start|time }} &ndash; {{ tutorials.wed.morning.slot.end|time }})</h3>
+
+    {% for session in tutorials.wed.morning.sessions %}
+        {% include "schedule/_session.html" %}
+    {% endfor %}
+
+    <h3>Afternoon ({{ tutorials.wed.afternoon.slot.start|time }} &ndash; {{ tutorials.wed.afternoon.slot.end|time }})</h3>
+
+    {% for session in tutorials.wed.afternoon.sessions %}
+        {% include "schedule/_session.html" %}
+    {% endfor %}
+
+    <h2>Thursday, March 10th</h2>
+
+    <h3>Morning ({{ tutorials.thurs.morning.slot.start|time }} &ndash; {{ tutorials.thurs.morning.slot.end|time }})</h3>
+
+    {% for session in tutorials.thurs.morning.sessions %}
+        {% include "schedule/_session.html" %}
+    {% endfor %}
+
+    <h3>Afternoon ({{ tutorials.thurs.afternoon.slot.start|time }} &ndash; {{ tutorials.thurs.afternoon.slot.end|time }})</h3>
+
+    {% for session in tutorials.thurs.afternoon.sessions %}
+        {% include "schedule/_session.html" %}
+    {% endfor %}
+
+
+{% endblock %}