Skip to content
Snippets Groups Projects
Commit 0c00f412 authored by Ernesto Rico Schmidt's avatar Ernesto Rico Schmidt
Browse files

Merge branch 'master' of https://github.com/nnrcschmdt/helsinki

parents abc43974 d4c75b48
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 19 deletions
.gitignore
+ 5
− 2
View file @ 0c00f412
*.pyc
dev_data.sqlite
local_settings.py
site_media
static/
pv/local_settings.py
pv/site_media/buttons/b-*.png
pv/site_media/buttons/s-*.png
pv/site_media/buttons/r-*.png
favicon.ico 0 → 100644
+ 0
− 0
View file @ 0c00f412
favicon.ico

1.37 KiB

pv/templates/program/day_schedule.html → program/templates/day_schedule.html
+ 15
− 5
View file @ 0c00f412
<html>
<head>
<title>Tagesansicht {{ day|date:"l, d.m.Y" }} &mdash; Radio Helsinki - Freies Radio Graz</title>
<script type="text/javascript" src="/program/static/js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="/program/static/js/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="/program/static/js/jqueryui/jquery.ui.datepicker-de.js"></script>
<script type="text/javascript" src="/program/static/programcalendar.js"></script>
<link type="text/css" href="/program/static/js/jqueryui/jquery-ui.css" rel="stylesheet" />
<link type="text/css" href="/program/static/js/jqueryui/jquery-ui.css" rel="stylesheet" />
<script type="text/javascript" src="/program/static/js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="/program/static/js/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="/program/static/js/jqueryui/jquery.ui.datepicker-de.js"></script>
<script type="text/javascript">
jQuery(document).ready(function() {
jQuery("#calendar").datepicker({
defaultDate: location.href.split('/').slice(4, 7).reverse().join('.'),
onSelect: function(dateText, inst) {
location = '/programm/' + dateText.split('.').reverse().join('/');
}
});
});
</script>
</head>
<body>
......
pv/templates/program/styles.css → program/templates/styles.css
+ 0
− 0
View file @ 0c00f412
File moved
pv/templates/program/week_schedule.html → program/templates/week_schedule.html
+ 7
− 7
View file @ 0c00f412
......@@ -47,49 +47,49 @@
<div id="monday" class="weekday weekday-first">
<h2>{{ monday|date:"l d.m.Y" }}</h2>
{% for timeslot in monday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="tuesday" class="weekday">
<h2>{{ tuesday|date:"l d.m.Y" }}</h2>
{% for timeslot in tuesday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="wednesday" class="weekday">
<h2>{{ wednesday|date:"l d.m.Y" }}</h2>
{% for timeslot in wednesday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="thursday" class="weekday">
<h2>{{ thursday|date:"l d.m.Y" }}</h2>
{% for timeslot in thursday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="friday" class="weekday">
<h2>{{ friday|date:"l d.m.Y" }}</h2>
{% for timeslot in friday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="saturday" class="weekday">
<h2>{{ saturday|date:"l d.m.Y" }}</h2>
{% for timeslot in saturday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="sunday" class="weekday weekday-last">
<h2>{{ sunday|date:"l d.m.Y" }}</h2>
{% for timeslot in sunday_timeslots %}
{% include "program/week_schedule_timeslot.html" %}
{% include "week_schedule_timeslot.html" %}
{% endfor %}
</div>
......
program/templatetags/content_boxes.py
+ 4
− 4
View file @ 0c00f412
......@@ -5,22 +5,22 @@ register = template.Library()
from program.models import BroadcastFormat, MusicFocus, ShowInformation, ShowTopic
@register.inclusion_tag('program/boxes/broadcastformat.html')
@register.inclusion_tag('boxes/broadcastformat.html')
def broadcastformat():
broadcastformats = BroadcastFormat.objects.filter(enabled=True)
return {'broadcastformats': broadcastformats}
@register.inclusion_tag('program/boxes/musicfocus.html')
@register.inclusion_tag('boxes/musicfocus.html')
def musicfocus():
musicfoci = MusicFocus.objects.all()
return {'musicfoci': musicfoci}
@register.inclusion_tag('program/boxes/showinformation.html')
@register.inclusion_tag('boxes/showinformation.html')
def showinformation():
showinformations = ShowInformation.objects.all()
return {'showinformations': showinformations}
@register.inclusion_tag('program/boxes/showtopic.html')
@register.inclusion_tag('boxes/showtopic.html')
def showtopic():
showtopics = ShowTopic.objects.all()
return {'showtopics': showtopics}
program/urls.py
+ 1
− 1
View file @ 0c00f412
......@@ -20,7 +20,7 @@ timeslots_dict = {
'queryset': TimeSlot.objects.all(),
'template_object_name': 'timeslot'
}
recommendations_dict = {'template_name': 'program/boxes/recommendations.html'}
recommendations_dict = {'template_name': 'boxes/recommendations.html'}
urlpatterns = patterns('',
url(r'^today/?$', day_schedule),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment