summaryrefslogtreecommitdiff
path: root/templates/program
diff options
context:
space:
mode:
authorErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2011-03-12 15:14:15 (GMT)
committerErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2011-03-12 15:14:15 (GMT)
commit3e1c4f43fb5ea31d729f92a1bc71b622c2531ab2 (patch)
tree756406f791b2ca8915e39701e534fa19a27b7539 /templates/program
parent235719f0621b5e36d877d76cfaf40cdb43033a6e (diff)
renamed model attributes to be more consistent, updated templates accordingly. added recommendations view and template.
Diffstat (limited to 'templates/program')
-rw-r--r--templates/program/host_detail.html13
-rw-r--r--templates/program/host_list.html5
-rw-r--r--templates/program/recommendations.html20
-rw-r--r--templates/program/show_detail.html22
-rw-r--r--templates/program/show_list.html79
-rw-r--r--templates/program/timeslot_detail.html16
6 files changed, 95 insertions, 60 deletions
diff --git a/templates/program/host_detail.html b/templates/program/host_detail.html
index a632a20..b780838 100644
--- a/templates/program/host_detail.html
+++ b/templates/program/host_detail.html
@@ -5,9 +5,16 @@
<body>
<div id="host-detail">
- {{ host.name }}
- {{ host.email }}
- {{ host.website }}
+ <div id="name">{{ host.name }}</div>
+
+ {% if host.email %}
+ <div id="email">{{ host.email }}</div>
+ {% endif %}
+
+ {% if host.website %}
+ <div id="website">{{ host.website }}</div>
+ {% endif %}
</div>
+
</body>
</html> \ No newline at end of file
diff --git a/templates/program/host_list.html b/templates/program/host_list.html
index fb19e47..ee67192 100644
--- a/templates/program/host_list.html
+++ b/templates/program/host_list.html
@@ -5,11 +5,12 @@
<body>
<div id="host-list">
- {% for host in host_list %}
+{% for host in host_list %}
<div class="host">
<a href="{% url host-detail host.id %}">{{ host.name }}</a>
</div>
- {% endfor %}
+{% endfor %}
</div>
+
</body>
</html> \ No newline at end of file
diff --git a/templates/program/recommendations.html b/templates/program/recommendations.html
new file mode 100644
index 0000000..499fe4e
--- /dev/null
+++ b/templates/program/recommendations.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+ <title>Recomendations</title>
+</head>
+<body>
+
+<div id="recommendations">
+{% for note in recommendation_list %}
+ <div class="show">
+ <div class="broadcast-format">{{ note.show.broadcastformat }}</div>
+ <div class="time-slot">{{ note.timeslot.start }}</div>
+ <div class="show-name"><a href="{% url show-detail note.show.slug %}">{{ note.show.name }}</a></div>
+ <div class="show-short-description">{{ note.show.short_description }}</div>
+ <div class="note-title"><a href="{% url timeslot-detail note.timeslot.id %}">{{ note.title }}</a></div>
+ </div>
+{% endfor %}
+</div>
+
+</body>
+</html> \ No newline at end of file
diff --git a/templates/program/show_detail.html b/templates/program/show_detail.html
index 4de24c5..e2216ff 100644
--- a/templates/program/show_detail.html
+++ b/templates/program/show_detail.html
@@ -10,25 +10,28 @@
<div id="name">{{ show.name }}</div>
<div id="abbrevs">
- {% for topic in show.show_topic.all %}
+ {% for topic in show.showtopic.all %}
<span class="topic-abbrev">{{ topic.abbrev }}</span>
{% endfor %}
- {% for information in show.show_information.all %}
+
+ {% for information in show.showinformation.all %}
<span class="information-abbrev">{{ information.abbrev }}</span>
{% endfor %}
- {% for focus in show.music_focus.all %}
+
+ {% for focus in show.musicfocus.all %}
<span class="focus-abbrev">{{ focus.abbrev }}</span>
{% endfor %}
- <span class="broadcast-format-abbrev">{{ show.broadcast_format.abbrev }}</span>
+
+ <span class="broadcastformat-abbrev">{{ show.broadcastformat.abbrev }}</span>
</div>
<div id="program-slots">
- {% for slot in show.program_slots.all %}
- <div class="program-slot">{{ slot }}</div>
+ {% for slot in show.programslots.all %}
+ <div class="programslot">{{ slot }}</div>
{% endfor %}
</div>
- <div id="broadcast-format">{{ show.broadcast_format.format }}</div>
+ <div id="broadcastformat">{{ show.broadcastformat.format }}</div>
<div id="hosts">
{% for host in show.hosts.all %}
@@ -37,18 +40,21 @@
</div>
<div id="short-description">{{ show.short_description }}</div>
+
<div id="description">{{ show.description }}</div>
+
{% if show.email %}
<div id="email"><a href="mailto:{{ show.email }}">{{ show.email }}</a></div>
{% endif %}
+
{% if show.website %}
<div id="website"><a href="{{ show.website }}">{{ show.website }}</a></div>
{% endif %}
+
{% if show.cba_series_id %}
<div id="cba-series-id"><a href="http://cba.fro.at/series/{{ show.cba_series_id }}">CBA</a></div>
{% endif %}
</div>
</body>
-
</html> \ No newline at end of file
diff --git a/templates/program/show_list.html b/templates/program/show_list.html
index 09bfa04..844395d 100644
--- a/templates/program/show_list.html
+++ b/templates/program/show_list.html
@@ -4,72 +4,69 @@
</head>
<body>
-<div id="show-topic-list">
- {% for topic in show_topic_list %}
- <div class="show-topic">
+<div id="showtopic-list">
+{% for topic in showtopic_list %}
+ <div class="showtopic">
<span class="abbrev">{{ topic.abbrev }}</span>
<span class="topic">{{ topic }}</span>
</div>
- {% endfor %}
+{% endfor %}
</div>
-<div id="show-information-list">
- {% for information in show_information_list %}
- <div class="show-information">
+<div id="showinformation-list">
+{% for information in showinformation_list %}
+ <div class="showinformation">
<span class="abbrev">{{ information.abbrev }}</span>
<span class="information">{{ information }}</span>
</div>
- {% endfor %}
+{% endfor %}
</div>
-<div id="music-focus-list">
- {% for focus in music_focus_list %}
- <div class="music-focus">
+<div id="musicfocus-list">
+{% for focus in musicfocus_list %}
+ <div class="musicfocus">
<span class="abbrev">{{ focus.abbrev }}</span>
<span class="focus">{{ focus }}</span>
</div>
- {% endfor %}
+{% endfor %}
</div>
<div id="show-list">
- {% for show in show_list %}
+{% for show in show_list %}
<div class="show">
<div class="abbrevs">
- {% for topic in show.show_topic.all %}
- <span class="topic-abbrev">{{ topic.abbrev }}</span>
- {% endfor %}
+ {% for topic in show.showtopic.all %}
+ <span class="topic-abbrev">{{ topic.abbrev }}</span>
+ {% endfor %}
- {% for information in show.show_information.all %}
- <span class="information-abbrev">{{ information.abbrev }}</span>
- {% endfor %}
+ {% for information in show.showinformation.all %}
+ <span class="information-abbrev">{{ information.abbrev }}</span>
+ {% endfor %}
- {% for focus in show.music_focus.all %}
- <span class="focus-abbrev">{{ focus.abbrev }}</span>
- {% endfor %}
+ {% for focus in show.musicfocus.all %}
+ <span class="focus-abbrev">{{ focus.abbrev }}</span>
+ {% endfor %}
- <span class="broadcast-format-abbrev">{{ show.broadcast_format.abbrev }}</span>
+ <span class="broadcastformat-abbrev">{{ show.broadcastformat.abbrev }}</span>
</div>
- <div class="name">
- <a href="{% url show-detail show.slug %} ">{{ show.name }}</a>
- </div>
- <div class="program-slots">
- {% for slot in show.program_slots.all %}
- <div class="program-slot">{{ slot }}</div>
- {% endfor %}
- </div>
- <div class="short-description">
- {{ show.short_description }}
+
+ <div class="name"><a href="{% url show-detail show.slug %} ">{{ show.name }}</a></div>
+
+ <div class="programslots">
+ {% for slot in show.programslots.all %}
+ <div class="programslot">{{ slot }}</div>
+ {% endfor %}
</div>
- </div>
- {% endfor %}
+
+ <div class="short-description">{{ show.short_description }}</div>
+ </div>
+{% endfor %}
</div>
-<div id="broadcast-format-list">
- {% for format in broadcast_format_list %}
- <div class="broadcast-format">
- {{ format }}
- </div>
- {% endfor %}
+<div id="broadcastformat-list">
+{% for format in broadcastformat_list %}
+ <div class="broadcastformat">{{ format }}</div>
+{% endfor %}
</div>
</body>
diff --git a/templates/program/timeslot_detail.html b/templates/program/timeslot_detail.html
index d589f0e..d8a677e 100644
--- a/templates/program/timeslot_detail.html
+++ b/templates/program/timeslot_detail.html
@@ -10,25 +10,28 @@
<div id="name">{{ timeslot.show.name }}</div>
<div id="abbrevs">
- {% for topic in timeslot.show.show_topic.all %}
+ {% for topic in timeslot.show.showtopic.all %}
<span class="topic-abbrev">{{ topic.abbrev }}</span>
{% endfor %}
- {% for information in timeslot.show.show_information.all %}
+
+ {% for information in timeslot.show.showinformation.all %}
<span class="information-abbrev">{{ information.abbrev }}</span>
{% endfor %}
- {% for focus in timeslot.show.music_focus.all %}
+
+ {% for focus in timeslot.show.musicfocus.all %}
<span class="focus-abbrev">{{ focus.abbrev }}</span>
{% endfor %}
- <span class="broadcast-format-abbrev">{{ timeslot.show.broadcast_format.abbrev }}</span>
+
+ <span class="broadcastformat-abbrev">{{ timeslot.show.broadcastformat.abbrev }}</span>
</div>
<div id="program-slots">
- {% for slot in timeslot.show.program_slots.all %}
+ {% for slot in timeslot.show.programslots.all %}
<div class="program-slot">{{ slot }}</div>
{% endfor %}
</div>
- <div id="broadcast-format">{{ timeslot.show.broadcast_format.format }}</div>
+ <div id="broadcastformat">{{ timeslot.show.broadcastformat.format }}</div>
<div id="hosts">
{% for host in timeslot.show.hosts.all %}
@@ -37,6 +40,7 @@
</div>
<div id="short-description">{{ timeslot.show.short_description }}</div>
+
<div id="description">{{ timeslot.show.description }}</div>
<div id="note">