diff options
| author | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2011-04-07 18:13:09 (GMT) |
|---|---|---|
| committer | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2011-04-07 18:13:09 (GMT) |
| commit | 975b1111db79bcf63cf47bf72b1b44636dde4f18 (patch) | |
| tree | 9dfe274585bc6ff825f18799764881d2712f1912 /helsinki/program/templates | |
| parent | 758180007e1a1735b7e7fc871593400fb80054dd (diff) | |
| parent | 3c5bfc8fe50437e9a8f8b1a259639dc95c56f3d9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'helsinki/program/templates')
5 files changed, 11 insertions, 5 deletions
diff --git a/helsinki/program/templates/program/current_box.html b/helsinki/program/templates/program/current_box.html index 21713be..a2341d3 100644 --- a/helsinki/program/templates/program/current_box.html +++ b/helsinki/program/templates/program/current_box.html @@ -17,7 +17,7 @@ {% if current.note %} <div class="note-title">{{ current.note.title }}</div> {% else %} - {% if current.show.short_description != 'FIMXE' %} + {% if current.show.short_description != 'FIXME' %} <div class="short-description">{{ current.show.short_description }}</div> {% endif %} {% endif %} diff --git a/helsinki/program/templates/program/host_list.html b/helsinki/program/templates/program/host_list.html index 6497d35..5ab5c3f 100644 --- a/helsinki/program/templates/program/host_list.html +++ b/helsinki/program/templates/program/host_list.html @@ -6,7 +6,7 @@ <body> <div id="host-list"> -{% for host in hosts %} +{% for host in host_list %} <div class="host"> <a href="{% url host-detail host.id %}">{{ host.name }}</a> </div> diff --git a/helsinki/program/templates/program/recommendations.html b/helsinki/program/templates/program/recommendations.html index a8f5fde..c34d5e5 100644 --- a/helsinki/program/templates/program/recommendations.html +++ b/helsinki/program/templates/program/recommendations.html @@ -6,9 +6,10 @@ <body> <div id="recommendations"> -{% for recommendation in recommendations %} - <div class="recommendation"> - <div class="timeslot-start-end">{{ recommendation.timeslot.start|date:"d.m.Y H:i" }} - {{ recommendation.timeslot.end|date:"H:i" }}</div> + <div id="recommendations-title">Programmhinweise</div> +{% for recommendation in recommendation_list %} + <div class="recommendation {{ recommendation.show.broadcastformat.slug }}"> + <div class="timeslot-start-end">{{ recommendation.timeslot.start|date:"d.m. H:i" }}-{{ recommendation.timeslot.end|date:"H:i" }}</div> <div class="show-name"><a href="{% url show-detail recommendation.show.slug %}">{{ recommendation.show.name }}</a></div> {% if recommendation.show.short_description != 'FIXME' %} <div class="show-short-description">{{ recommendation.show.short_description }}</div> diff --git a/helsinki/program/templates/search/indexes/program/note_text.txt b/helsinki/program/templates/search/indexes/program/note_text.txt new file mode 100644 index 0000000..2421b4f --- /dev/null +++ b/helsinki/program/templates/search/indexes/program/note_text.txt @@ -0,0 +1,2 @@ +{{ object.title }} +{{ object.content }}
\ No newline at end of file diff --git a/helsinki/program/templates/search/indexes/program/show_text.txt b/helsinki/program/templates/search/indexes/program/show_text.txt new file mode 100644 index 0000000..f08b515 --- /dev/null +++ b/helsinki/program/templates/search/indexes/program/show_text.txt @@ -0,0 +1,3 @@ +{{ object.name }} +{{ object.description }} +{{ object.short_description }}
\ No newline at end of file |