optimizations

author: Johannes Raggam <raggam-nl@adm.at> 2011-04-08 21:12:00 (GMT)
committer: Johannes Raggam <raggam-nl@adm.at> 2011-04-08 21:12:00 (GMT)
commit: de060aca81bf86472d37b8fc157e2984ec8ce791 (patch)
tree: 13a042e6eb6eed1f3fbd42ed7117f91727ab87b9 /helsinki/program
parent: 41d65a62e0d9ebb6e64661ac9ac014d5aa71c85c (diff)
7 files changed, 57 insertions, 43 deletions
diff --git a/helsinki/program/templates/program/bcformats_box.html b/helsinki/program/templates/program/bcformats_box.html
new file mode 100644
index 0000000..3067805
--- /dev/null
+++ b/helsinki/program/templates/program/bcformats_box.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>Broadcast Formats</title>
+  <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
+</head>
+<body>
+  {% if broadcastformats %}
+  <dl id="bcformats" class="portlet program-bcformats">
+    <dt class="portletHeader"><span>Legende<span></dt>
+    {% for broadcastformat in broadcastformats %}
+    <dd class="portletItem bcformat bcformat-{{ broadcastformat.slug }}">
+        <a href="?broadcastformat={{ broadcastformat.slug }}">{{ broadcastformat.format }}</a>
+    </dd>
+    {% endfor %}
+  </dl>
+  {% endif %}
+</body>
+</html>
diff --git a/helsinki/program/templates/program/day_schedule.html b/helsinki/program/templates/program/day_schedule.html
index 3e7d4bc..9208e50 100644
--- a/helsinki/program/templates/program/day_schedule.html
+++ b/helsinki/program/templates/program/day_schedule.html
@@ -8,42 +8,32 @@
 
 <div id="calendar"></div>
 
-<div id="recommendations">
-    <div id="recommendations-title">Programmhinweise</div>
-    {% for recommendation in recommendations %}
-    <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>
-        <div class="note-title"><a href="{%  url timeslot-detail recommendation.timeslot.id %}">{{ recommendation.title }}</a></div>
-    </div>
-    {% endfor %}
-</div>
+<div id="content-main">
+    <h2>Tagesansicht</h2>
+    <h1 id="date">{{ day|date:"l, d.m.Y" }}</h1>
 
-<div id="day-schedule">
-    <div id="title">Tagesansicht</div>
-    <div id="date">{{ day|date:"l, d.m.Y" }}</div>
     <div id="timeslots">
     {% for timeslot in timeslots %}
-    <div class="timeslot {{ timeslot.show.broadcastformat }}">
+    <div class="timeslot bcformat-{{ timeslot.show.broadcastformat.slug }}">
         <div class="start">{{ timeslot.start|date:"H:i" }}</div>
-        <div class="show-abbrevs">&nbsp;
+        <div class="show-abbrevs">
         {% for showinformation in timeslot.show.showinformation.all %}
-            {{ showinformation.abbrev }}
+            <span class="si-{{ showinformation.abbrev }}">{{ showinformation.abbrev }}</span>
         {% endfor %}
         {% for showtopic in timeslot.show.showtopic.all %}
-            {{ showtopic.abbrev }}
+            <span class="st-{{ showtopic.abbrev }}">{{ showtopic.abbrev }}</span>
         {% endfor %}
         {% for musicfocus in timeslot.show.musicfocus.all %}
-            {{ musicfocus.abbrev }}
+            <span class="{{ musicfocus.abbrev }}">{{ musicfocus.abbrev }}</span>
         {% endfor %}
         </div>
         <div class="show">
-            <div class="name"><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></div>
+            <h3 class="name"><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></h3>
             {% if timeslot.note %}
-            <div class="note-title">Heute: {{ timeslot.note.title }}</div>
+            <p class="note-title"><strong>Heute:</strong> {{ timeslot.note.title }}</p>
             {% else %}
                 {% if timeslot.show.short_description != 'FIXME' %}
-            <div class="short-description">{{ timeslot.show.short_description }}</div>
+            <p class="short-description">{{ timeslot.show.short_description }}</p>
                 {% endif %}
             {% endif %}
         </div>
@@ -52,14 +42,6 @@
     </div>
 </div>
 
-<div id="broadcastformats">
-    <div id="broadcastformats-title">Legende</div>
-    {% for broadcastformat in broadcastformats %}
-    <div class="{{ broadcastformat.slug }}">
-        <a href="?broadcastformat={{ broadcastformat.slug }}">{{ broadcastformat.format }}</a>
-    </div>
-    {% endfor %}
-</div>
 
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/helsinki/program/templates/program/show_detail.html b/helsinki/program/templates/program/show_detail.html
index 9cd2d8e..e2ae528 100644
--- a/helsinki/program/templates/program/show_detail.html
+++ b/helsinki/program/templates/program/show_detail.html
@@ -7,7 +7,12 @@
 <div id="calendar"></div>
 
 <div id="show-detail">
-    <div id="name">{{ show.name }}</div>
+
+    <h1 id="name">{{ show.name }}</h1>
+
+    {% if show.short_description != 'FIXME' %}
+    <div id="short-description" class="documentDescription">{{ show.short_description }}</div>
+    {% endif %}
 
     <div id="abbrevs">
     {% for topic in show.showtopic.all %}
@@ -39,9 +44,6 @@
     {% endfor %}
     </div>
 
-    {% if show.short_description != 'FIXME' %}
-    <div id="short-description">{{ show.short_description }}</div>
-    {% endif %}
 
     <div id="description">{{ show.description|safe }}</div>
 
@@ -59,4 +61,4 @@
 </div>
 
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/helsinki/program/templates/program/timeslot_detail.html b/helsinki/program/templates/program/timeslot_detail.html
index f8dee29..36a1e5f 100644
--- a/helsinki/program/templates/program/timeslot_detail.html
+++ b/helsinki/program/templates/program/timeslot_detail.html
@@ -6,7 +6,11 @@
 <body>
 
 <div id="timeslot-detail">
-    <div id="show-name">{{ timeslot.show.name }}</div>
+    <h1 id="show-name">{{ timeslot.show.name }}</h1>
+
+    {% if timeslot.show.short_description != 'FIXME' %}
+    <div id="short-description" class="documentDescription">{{ timeslot.show.short_description }}</div>
+    {% endif %}
 
     <div id="abbrevs">
     {% for topic in timeslot.show.showtopic.all %}
@@ -38,10 +42,6 @@
     {% endfor %}
     </div>
 
-    {% if timeslot.show.short_description != 'FIXME' %}
-    <div id="short-description">{{ timeslot.show.short_description }}</div>
-    {% endif %}
-
     <div id="description">{{ timeslot.show.description|safe }}</div>
 
     <div id="note">
@@ -55,4 +55,4 @@
 </div>
 
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/helsinki/program/urls.py b/helsinki/program/urls.py
index 06018e2..341923b 100644
--- a/helsinki/program/urls.py
+++ b/helsinki/program/urls.py
@@ -7,7 +7,7 @@ import os
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    (r'^admin/', include(admin.site.urls)),
+        (r'^admin/', include(admin.site.urls)),
     (r'^program', include('helsinki.program.urls_program')),
 )
 if settings.DEBUG:
diff --git a/helsinki/program/urls_program.py b/helsinki/program/urls_program.py
index f68d376..6f4ae3a 100644
--- a/helsinki/program/urls_program.py
+++ b/helsinki/program/urls_program.py
@@ -3,7 +3,7 @@ from django.conf.urls.defaults import *
 from django.views.generic.list_detail import object_detail, object_list
 
 from models import Host, Show, TimeSlot
-from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule
+from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule, bcformats
 
 urlpatterns = patterns('',
     ('^/today/?$', today_schedule),
@@ -17,6 +17,7 @@ urlpatterns = patterns('',
     ('^/shows/?$', show_list),
     url('^/shows/(?P<slug>[\w-]+)/?$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
     url('^/(?P<object_id>\d+)/?$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
+    ('^/bcformats_box/?$', bcformats),
     # TODO: implement
     ('^/week/?$', today_schedule),
     ('^/topics/?$', recommendations),
diff --git a/helsinki/program/views.py b/helsinki/program/views.py
index 2e9cd8a..584f24d 100644
--- a/helsinki/program/views.py
+++ b/helsinki/program/views.py
@@ -111,3 +111,12 @@ def week_schedule(request, year, week):
     extra_context['sunday_timeslots'] = TimeSlot.objects.filter(start__range=(sunday, next_monday))
 
     return simple.direct_to_template(request, template='program/week_schedule.html', extra_context=extra_context)
+
+
+def bcformats(request):
+    broadcastformats = BroadcastFormat.objects.all()
+    extra_context = dict(broadcastformats=broadcastformats)
+    return simple.direct_to_template(
+            request,
+            template='program/bcformats_box.html',
+            extra_context=extra_context)
author	Johannes Raggam <raggam-nl@adm.at>	2011-04-08 21:12:00 (GMT)
committer	Johannes Raggam <raggam-nl@adm.at>	2011-04-08 21:12:00 (GMT)
commit	de060aca81bf86472d37b8fc157e2984ec8ce791 (patch)
tree	13a042e6eb6eed1f3fbd42ed7117f91727ab87b9 /helsinki/program
parent	41d65a62e0d9ebb6e64661ac9ac014d5aa71c85c (diff)