From 2aaaf95a32f2e2d2ca1127d39b068f6d6a862aa6 Mon Sep 17 00:00:00 2001 From: Johannes Raggam <raggam-nl@adm.at> Date: Sun, 17 Jul 2011 17:03:49 +0200 Subject: timeslot opts diff --git a/templates/program/boxes/recommendations.html b/templates/program/boxes/recommendations.html index 2b443c1..2b92a70 100644 --- a/templates/program/boxes/recommendations.html +++ b/templates/program/boxes/recommendations.html @@ -19,7 +19,9 @@ {{ item.timeslot.start|date:"d.m. H:i" }} - {{ item.timeslot.end|date:"H:i" }}<br /> - <h3><a href="{% url show-detail item.show.slug %}">{{ item.show.name }}</a></h3> + <h3> + <a href="{% url timeslot-detail item.timeslot.id %}">{{ item.show.name }}</a> + </h3> <p class="note-title"> {{ item.title }}<br /> <a href="{% url timeslot-detail item.timeslot.id %}">[weiter]</a> diff --git a/templates/program/timeslot_detail.html b/templates/program/timeslot_detail.html index ead061b..172255c 100644 --- a/templates/program/timeslot_detail.html +++ b/templates/program/timeslot_detail.html @@ -7,7 +7,13 @@ <div id="content-main" class="timeslot-detail"> <div class="show-detail-header bf-{{timeslot.show.broadcastformat.slug}}"> - <h1 id="name"><a href="{% url show-detail timeslot.show.slug %}">{{ timeslot.show.name }}</a></h1> + <h1 id="name"> + <a href="{% url show-detail timeslot.show.slug %}">{{ timeslot.show.name }}</a> + </h1> + {% if timeslot.note %} + <h2>{{ timeslot.note.title }}</h2> + {% endif %} + <strong>Sendung am {{ timeslot.start|date:"d.m. H:i" }} bis {{ timeslot.end|date:"H:i" }}</strong> <div class="show-abbrevs"> {% for item in timeslot.show.showinformation.all %} @@ -25,7 +31,6 @@ </div> {% if timeslot.note %} - <h2>{{ timeslot.note.title }}</h2> <p class="timeslot-note">{{ timeslot.note.content|safe }}</p> {% endif %} -- cgit v0.10.2