Merge branch 'master' of github.com:nnrcschmdt/helsinki

2 files changed, 8 insertions, 1 deletions

diff --git a/templates/program/show_detail.html b/templates/program/show_detail.html
index 443a64a..ae1690a 100644
--- a/templates/program/show_detail.html
+++ b/templates/program/show_detail.html
@@ -11,11 +11,13 @@
   <div class="show-detail-header bf-{{show.broadcastformat.slug}}">
     <div class="show-details">
       <h1 id="name">{{ show.name }}</h1>
+    {% if show.id != 1 %}
       <p id="programslots">
       {% for slot in show.programslots.all %}
         <span class="programslot">{{ slot }}</span><br />
       {% endfor %}
       </p>
+    {% endif %}
     </div>
 
     <div class="show-categorization">
@@ -54,6 +56,11 @@
       {% endif %}
     </p>
 
+    <p>
+        {% for note in show.notes.all %}
+           <a href="{% url timeslot-detail note.timeslot.id %}" title="{{ note.title }}">{{ note.start|date:"d. M Y" }}</a>
+        {% endfor %}
+    </p>
 </div>
 
 </body>
diff --git a/templates/program/timeslot_detail.html b/templates/program/timeslot_detail.html
index 7955451..8b08f8b 100644
--- a/templates/program/timeslot_detail.html
+++ b/templates/program/timeslot_detail.html
@@ -7,7 +7,7 @@
 <div id="content-main" class="timeslot-detail">
 
   <div class="show-detail-header bf-{{timeslot.show.broadcastformat.slug}}">
-      <h1 id="name">{{ timeslot.show.name }}</h1>
+      <h1 id="name"><a href="{% url show-detail timeslot.show.slug %}">{{ timeslot.show.name }}</a></h1>
 
       <div class="show-abbrevs">
       {% for item in timeslot.show.showinformation.all %}