Skip to content
Snippets Groups Projects
Commit 5df740f8 authored by Johannes Raggam's avatar Johannes Raggam
Browse files

include boxes where appropriate. simplifcations

parent f6a05a6a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 67 additions and 42 deletions
helsinki/program/templates/program/box_broadcastformat.html
+ 2
− 2
View file @ 5df740f8
{% if broadcastformats %}
<dl id="bcformats" class="portlet program-bcformats">
<dl id="broadcastformat" class="portlet">
<dt class="portletHeader"><span>Legende<span></dt>
{% for broadcastformat in broadcastformats %}
<dd class="portletItem bcformat bcformat-{{ broadcastformat.slug }}">
<dd class="portletItem bcformat bf-{{ broadcastformat.slug }}">
<a href="?broadcastformat={{ broadcastformat.slug }}">{{ broadcastformat.format }}</a>
</dd>
{% endfor %}
......
helsinki/program/templates/program/box_musicfocus.html
+ 8
− 4
View file @ 5df740f8
{% if musicfoci %}
<dl id="box_musicfocus" class="portlet">
<dt class="portletHeader"><span>Musiktendenz<span></dt>
{% for item in musicfoci %}
<dd class="portletItem musicfocus mf-{{ item.abbrev }}">
<a href="?musicfocus={{ item.slug }}">{{ item }}</a>
<dd class="portletItem">
<ul>
{% for item in musicfoci %}
<li class="mf-{{ item.abbrev }}">
<a href="?musicfocus={{ item.slug }}">{{ item }}</a>
</li>
{% endfor %}
</ul>
</dd>
{% endfor %}
</dl>
{% endif %}
helsinki/program/templates/program/box_showinformation.html
+ 8
− 4
View file @ 5df740f8
{% if showinformations %}
<dl id="box_showinformation" class="portlet">
<dt class="portletHeader"><span>Schwerpunkt<span></dt>
{% for item in showinformations %}
<dd class="portletItem showinformation mf-{{ item.abbrev }}">
<a href="?showinformation={{ item.slug }}">{{ item }}</a>
<dd class="portletItem">
<ul>
{% for item in showinformations %}
<li class="si-{{ item.abbrev }}">
<a href="?showinformation={{ item.slug }}">{{ item }}</a>
</li>
{% endfor %}
</ul>
</dd>
{% endfor %}
</dl>
{% endif %}
helsinki/program/templates/program/box_showtopic.html
+ 8
− 4
View file @ 5df740f8
{% if showtopics %}
<dl id="box_showtopic" class="portlet">
<dt class="portletHeader"><span>Thema / Schwerpunkt<span></dt>
{% for item in showtopics %}
<dd class="portletItem showtopic st-{{ item.abbrev }}">
<a href="?showtopic={{ item.slug }}">{{ item }}</a>
<dd class="portletItem">
<ul>
{% for item in showtopics %}
<li class="st-{{ item.abbrev }}">
<a href="?showtopic={{ item.slug }}">{{ item }}</a>
</li>
{% endfor %}
</ul>
</dd>
{% endfor %}
</dl>
{% endif %}
helsinki/program/templates/program/day_schedule.html
+ 14
− 1
View file @ 5df740f8
......@@ -8,7 +8,20 @@
<div id="calendar"></div>
<div id="content-main">
{% load content_boxes %}
<div id="filter-format">
{% broadcastformat %}
</div>
<div id="filter-topic">
<dl id="filter-header" class="portlet">
<dt class="portletHeader"><span>Filter<span></dt>
</dl>
{% musicfocus %}
{% showinformation %}
{% showtopic %}
</div>
<div id="content-main" class="day-schedule">
<h2>Tagesansicht</h2>
<h1 id="date">{{ day|date:"l, d.m.Y" }}</h1>
......
helsinki/program/templates/program/host_detail.html
+ 2
− 2
View file @ 5df740f8
......@@ -5,7 +5,7 @@
</head>
<body>
<div id="host-detail">
<div id="content-main" class="host-detail">
<div id="name">{{ host.name }}</div>
<div id="shows">
......@@ -26,4 +26,4 @@
</div>
</body>
</html>
\ No newline at end of file
</html>
helsinki/program/templates/program/host_list.html
+ 2
− 2
View file @ 5df740f8
......@@ -5,7 +5,7 @@
</head>
<body>
<div id="host-list">
<div id="content-main" class="host-list">
{% for host in host_list %}
<div class="host">
<a href="{% url host-detail host.id %}">{{ host.name }}</a>
......@@ -14,4 +14,4 @@
</div>
</body>
</html>
\ No newline at end of file
</html>
helsinki/program/templates/program/recommendations.html
+ 2
− 2
View file @ 5df740f8
......@@ -5,7 +5,7 @@
</head>
<body>
<div id="recommendations">
<div id="content-main" class="recommendations">
<div id="recommendations-title">Programmhinweise</div>
{% for recommendation in recommendation_list %}
<div class="recommendation {{ recommendation.show.broadcastformat.slug }}">
......@@ -21,4 +21,4 @@
</div>
</body>
</html>
\ No newline at end of file
</html>
helsinki/program/templates/program/show_detail.html
+ 1
− 1
View file @ 5df740f8
......@@ -6,7 +6,7 @@
<div id="calendar"></div>
<div id="show-detail">
<div id="content-main" class="show-detail">
<h1 id="name">{{ show.name }}</h1>
......
helsinki/program/templates/program/show_list.html
+ 7
− 6
View file @ 5df740f8
......@@ -5,18 +5,20 @@
</head>
<body>
<div id="filter">
<div id="filter-title">Filter</div>
{% load content_boxes %}
<div id="filter-format">
{% broadcastformat %}
</div>
<div id="filter-topic">
<dl id="filter-header" class="portlet">
<dt class="portletHeader"><span>Filter<span></dt>
</dl>
{% musicfocus %}
{% showinformation %}
{% showtopic %}
</div>
<div id="shows">
<div id="content-main" class="show-list">
{% for show in show_list %}
<div class="show">
<div class="abbrevs">&nbsp;
......@@ -52,6 +54,5 @@
{% endfor %}
</div>
</body>
</html>
helsinki/program/templates/program/timeslot_detail.html
+ 1
− 1
View file @ 5df740f8
......@@ -5,7 +5,7 @@
</head>
<body>
<div id="timeslot-detail">
<div id="content-main" class="timeslot-detail">
<h1 id="show-name">{{ timeslot.show.name }}</h1>
{% if timeslot.show.short_description != 'FIXME' %}
......
helsinki/program/templates/program/week_schedule.html
+ 1
− 1
View file @ 5df740f8
......@@ -6,7 +6,7 @@
<body>
<div id="week-schedule">
<div id="content-main" class="week-schedule">
<div id="monday">
<div class="weekday">{{ monday|date:"l d.m.Y" }}</div>
{% for timeslot in monday_timeslots %}
......
helsinki/program/views.py
+ 11
− 12
View file @ 5df740f8
......@@ -2,17 +2,18 @@ from django.views.generic import list_detail
from django.views.generic import simple
from django.shortcuts import get_object_or_404
from helsinki.program.models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic, TimeSlot
from helsinki.program.models import (
BroadcastFormat,
MusicFocus,
Note,
Show,
ShowInformation,
ShowTopic,
TimeSlot)
from datetime import date, datetime, time, timedelta
def show_list(request):
broadcastformats = BroadcastFormat.objects.all()
musicfoci = MusicFocus.objects.all()
showinformation = ShowInformation.objects.all()
showtopics = ShowTopic.objects.all()
extra_context = dict(broadcastformats=broadcastformats, musicfoci=musicfoci, showinformation=showinformation, showtopics=showtopics)
if 'broadcastformat' in request.GET:
broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat'])
......@@ -34,7 +35,7 @@ def show_list(request):
queryset = Show.objects.all()
return list_detail.object_list(request, queryset=queryset, extra_context=extra_context, template_object_name='show')
return list_detail.object_list(request, queryset=queryset, template_object_name='show')
def recommendations(request, template_name='program/recommendations.html'):
now = datetime.now()
......@@ -49,10 +50,9 @@ def today_schedule(request):
today = datetime.combine(date.today(), time(6, 0))
tomorrow = today + timedelta(days=1)
broadcastformats = BroadcastFormat.objects.all()
recommendations = Note.objects.filter(status=1, timeslot__start__range=(now, tomorrow))
extra_context = dict(day=today, broadcastformats=broadcastformats, recommendations=recommendations)
extra_context = dict(day=today, recommendations=recommendations)
if 'broadcastformat' in request.GET:
broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat'])
......@@ -67,10 +67,9 @@ def day_schedule(request, year, month, day):
this_day = datetime.strptime('%s__%s__%s__06__00' % (year, month, day), '%Y__%m__%d__%H__%M')
that_day = this_day+timedelta(days=1)
broadcastformats = BroadcastFormat.objects.all()
recommendations = Note.objects.filter(status=1, timeslot__start__range=(this_day, that_day))
extra_context = dict(day=this_day, broadcastformats=broadcastformats, recommendations=recommendations)
extra_context = dict(day=this_day, recommendations=recommendations)
if 'broadcastformat' in request.GET:
broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat'])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment