summaryrefslogtreecommitdiff
path: root/program/templatetags
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-05-27 20:03:04 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-05-27 20:03:04 (GMT)
commit4a66728a9bbe88704c6e01ec8dd683cdb0a4c0c6 (patch)
tree9c62c09230aec03187cc13d2ac78d299bd96096b /program/templatetags
parenta1487772e667436e2274dece86cb40d2e58632a7 (diff)
parentc27b374386463c56f41815869d6209f9a422b858 (diff)
Merge branch 'master' into stable
Diffstat (limited to 'program/templatetags')
-rw-r--r--program/templatetags/content_boxes.py5
-rw-r--r--program/templatetags/timeslots.py4
2 files changed, 4 insertions, 5 deletions
diff --git a/program/templatetags/content_boxes.py b/program/templatetags/content_boxes.py
index 7f176c6..2d1745e 100644
--- a/program/templatetags/content_boxes.py
+++ b/program/templatetags/content_boxes.py
@@ -1,10 +1,9 @@
-# http://docs.djangoproject.com/en/1.2/howto/custom-template-tags/
-
from django import template
-register = template.Library()
from program.models import BroadcastFormat, MusicFocus, ShowInformation, ShowTopic
+register = template.Library()
+
@register.inclusion_tag('boxes/broadcastformat.html')
def broadcastformat():
diff --git a/program/templatetags/timeslots.py b/program/templatetags/timeslots.py
index c2c44b5..08e45b1 100644
--- a/program/templatetags/timeslots.py
+++ b/program/templatetags/timeslots.py
@@ -1,9 +1,9 @@
from django import template
-register = template.Library()
-
from datetime import datetime, time, timedelta
+register = template.Library()
+
@register.simple_tag
def duration(start, end):