summaryrefslogtreecommitdiff
path: root/templates/program
diff options
context:
space:
mode:
authorJohannes Raggam <raggam-nl@adm.at>2011-07-07 14:15:26 (GMT)
committerJohannes Raggam <raggam-nl@adm.at>2011-07-07 14:15:26 (GMT)
commit7fedd9d25afc2267c23121770d7aef17e9141f0d (patch)
tree13b6455d004067b8e365fde9a2f9f1ad30a5e6fa /templates/program
parentb8192f77d559684825af175dd31ce18c6c38096c (diff)
parentf77ca392735c58e12f3fa5e4f7badf4c6e13f7ae (diff)
Merge branch 'master' of github.com:nnrcschmdt/helsinki
Diffstat (limited to 'templates/program')
-rw-r--r--templates/program/show_detail.html7
-rw-r--r--templates/program/timeslot_detail.html2
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 %}