diff options
| author | Johannes Raggam <raggam-nl@adm.at> | 2011-04-14 12:26:13 (GMT) |
|---|---|---|
| committer | Johannes Raggam <raggam-nl@adm.at> | 2011-04-14 12:26:13 (GMT) |
| commit | 41eca6ea975d8092ad9efea8b15a054086a0c4bc (patch) | |
| tree | e3526468c6919dee74cc11755dde39b1bf9b91aa | |
| parent | 61ce3547651e173db11a26ff67ca616ca0bc4aea (diff) | |
aligning show_list with day_schedule
| -rw-r--r-- | templates/program/day_schedule.html | 3 | ||||
| -rw-r--r-- | templates/program/show_list.html | 48 |
2 files changed, 24 insertions, 27 deletions
diff --git a/templates/program/day_schedule.html b/templates/program/day_schedule.html index 72c9560..88f743e 100644 --- a/templates/program/day_schedule.html +++ b/templates/program/day_schedule.html @@ -3,7 +3,6 @@ <title>Day schedule: {{ day|date:"l, d.m.Y" }}</title> <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" /> </head> - <body> <div id="calendar"></div> @@ -40,7 +39,7 @@ <span class="mf-{{ musicfocus.abbrev }}">{{ musicfocus.abbrev }}</span> {% endfor %} </div> - <div class="show"> + <div class="show-detail"> <h3 class="show-title"><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></h3> {% if timeslot.note %} <p class="note-title"><strong>Heute:</strong> {{ timeslot.note.title }}</p> diff --git a/templates/program/show_list.html b/templates/program/show_list.html index 6fe6525..2b0cb9c 100644 --- a/templates/program/show_list.html +++ b/templates/program/show_list.html @@ -19,39 +19,37 @@ </div> <div id="content-main" class="show-list"> -{% for show in show_list %} - <div class="show"> - <div class="abbrevs"> - {% for topic in show.showtopic.all %} - <span class="topic-abbrev">{{ topic.abbrev }}</span> - {% endfor %} - - {% for information in show.showinformation.all %} - <span class="information-abbrev">{{ information.abbrev }}</span> - {% endfor %} - - {% for focus in show.musicfocus.all %} - <span class="focus-abbrev">{{ focus.abbrev }}</span> - {% endfor %} - - <span class="broadcastformat-abbrev">{{ show.broadcastformat.abbrev }}</span> + <h1>Sendungen</h1> + + <div id="shows"> + {% for show in show_list %} + <div class="show bf-{{ show.broadcastformat.slug }}"> + <div class="show-abbrevs"> + {% for showinformation in show.showinformation.all %} + <span class="si-{{ showinformation.abbrev }}">{{ showinformation.abbrev }}</span> + {% endfor %} + {% for showtopic in show.showtopic.all %} + <span class="st-{{ showtopic.abbrev }}">{{ showtopic.abbrev }}</span> + {% endfor %} + {% for musicfocus in show.musicfocus.all %} + <span class="mf-{{ musicfocus.abbrev }}">{{ musicfocus.abbrev }}</span> + {% endfor %} </div> - - <div class="details"> - <div class="name"><a href="{% url show-detail show.slug %}">{{ show.name }}</a></div> - - <div class="programslots"> + <div class="show-detail"> + <h3 class="show-title"><a href="{% url show-detail show.slug %}">{{ show.name }}</a></h3> + <div class="show-programslots"> {% for slot in show.programslots.all %} - <div class="programslot">{{ slot }}</div> + <p class="show-programslot">{{ slot }}</p> {% endfor %} </div> - {% if show.short_description != 'FIXME' %} - <div class="short-description">{{ show.short_description }}</div> + <p class="show-description">{{ show.short_description }}</p> {% endif %} </div> </div> -{% endfor %} + {% endfor %} + </div> + </div> </body> |