fixed templates

3 files changed, 25 insertions, 19 deletions

diff --git a/program/templates/show_detail.html b/program/templates/show_detail.html
index 3ab80ed..7993287 100644
--- a/program/templates/show_detail.html
+++ b/program/templates/show_detail.html
@@ -24,14 +24,14 @@
 
         <div class="show-categorization">
             <p id="broadcastformat">{{ show.broadcastformat.format }}</p>
-            {% for item in show.showinformation.all %}
-                <span title="{{ item.information }}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+            {% for si in show.showinformation.all %}
+                <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
             {% endfor %}
-            {% for item in show.showtopic.all %}
-                <span title="{{ item.topic }}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+            {% for st in show.showtopic.all %}
+                <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
             {% endfor %}
-            {% for item in show.musicfocus.all %}
-                <span title="{{ item.focus }}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+            {% for mf in show.musicfocus.all %}
+                <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
             {% endfor %}
         </div>
 
diff --git a/program/templates/show_list.html b/program/templates/show_list.html
index 136930d..62594e9 100644
--- a/program/templates/show_list.html
+++ b/program/templates/show_list.html
@@ -10,7 +10,7 @@
 </div>
 <div id="filter-topic">
     <dl id="filter-header" class="portlet">
-        <dt class="portletHeader"><span>Filter<span></dt>
+        <dt class="portletHeader"><span>Filter</span></dt>
     </dl>
     {% musicfocus %}
     {% showinformation %}
@@ -24,25 +24,25 @@
         {% for show in show_list %}
             <div class="show bf-{{ show.broadcastformat.slug }}">
                 <div class="show-abbrevs">
-                    {% for item in show.showinformation.all %}
-                        <span title="{{ item.information }}"
-                              class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+                    {% for si in show.showinformation.all %}
+                        <span title="{{ si.information }}"
+                              class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
                     {% endfor %}
-                    {% for item in show.showtopic.all %}
-                        <span title="{{ item.topic }}"
-                              class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+                    {% for st in show.showtopic.all %}
+                        <span title="{{ st.topic }}"
+                              class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
                     {% endfor %}
-                    {% for item in show.musicfocus.all %}
-                        <span title="{{ item.focus }}"
-                              class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+                    {% for mf in show.musicfocus.all %}
+                        <span title="{{ mf.focus }}"
+                              class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
                     {% endfor %}
                 </div>
                 <div class="show-detail">
                     <h3 class="show-title"><a href="{% url "show-detail" show.slug %}">{{ show.name }}</a></h3>
                     <ul class="show-programslots">
-                        {% for slot in show.programslots.all %}
-                            {% if slot.has_active_timeslot %}
-                                <li class="show-programslot">{{ slot }}</li>
+                        {% for programslot in show.programslots.all %}
+                            {% if programslot.is_active %}
+                                <li class="show-programslot">{{ programslot }}</li>
                             {% endif %}
                         {% endfor %}
                     </ul>
diff --git a/program/templates/timeslot_detail.html b/program/templates/timeslot_detail.html
index c899c32..a3b62af 100644
--- a/program/templates/timeslot_detail.html
+++ b/program/templates/timeslot_detail.html
@@ -55,7 +55,13 @@
         {% endif %}
     </p>
 
+    {% load comments %}
 
+    <div class="comments">
+    {% render_comment_list for timeslot %}
+
+    {% render_comment_form for timeslot %}
+    </div>
 </div>
 
 </body>