From b2b653e57e124c1ebfb9b06d8dfa4b5a32ebb3fc Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 12 Sep 2014 21:32:14 +0200 Subject: [PATCH] Event list --- src/tixlbase/models.py | 15 +++++++++++ src/tixlcontrol/context.py | 2 ++ .../templates/tixlcontrol/base.html | 7 +++-- .../templates/tixlcontrol/events/index.html | 27 +++++++++++++++++++ src/tixlcontrol/urls.py | 2 ++ src/tixlcontrol/views/main.py | 17 +++++++++++- 6 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 src/tixlcontrol/templates/tixlcontrol/events/index.html diff --git a/src/tixlbase/models.py b/src/tixlbase/models.py index eaad76577..06a87841a 100644 --- a/src/tixlbase/models.py +++ b/src/tixlbase/models.py @@ -2,6 +2,7 @@ from django.db import models from django.conf import settings from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin from django.utils.translation import ugettext_lazy as _ +from django.template.defaultfilters import date as _date class UserManager(BaseUserManager): @@ -244,6 +245,20 @@ class Event(models.Model): verbose_name=_("Last date of payments") ) + def get_date_from_display(self): + return _date( + self.date_from, + "DATETIME_FORMAT" if self.show_times else "DATE_FORMAT" + ) + + def get_date_to_display(self): + if not self.show_date_to: + return "" + return _date( + self.date_to, + "DATETIME_FORMAT" if self.show_times else "DATE_FORMAT" + ) + def __str__(self): return self.name diff --git a/src/tixlcontrol/context.py b/src/tixlcontrol/context.py index 27766ad08..ef43dd429 100644 --- a/src/tixlcontrol/context.py +++ b/src/tixlcontrol/context.py @@ -1,7 +1,9 @@ from django.conf import settings +from django.core.urlresolvers import resolve def contextprocessor(request): return { + 'url_name': resolve(request.path_info).url_name, 'settings': settings, } diff --git a/src/tixlcontrol/templates/tixlcontrol/base.html b/src/tixlcontrol/templates/tixlcontrol/base.html index 9d03b4725..4c8d82c43 100644 --- a/src/tixlcontrol/templates/tixlcontrol/base.html +++ b/src/tixlcontrol/templates/tixlcontrol/base.html @@ -4,7 +4,7 @@ - {{ settings.TIXL_INSTANCE_NAME }} + {% block title %}{% endblock %}{% if url_name != "index" %} :: {% endif %}{{ settings.TIXL_INSTANCE_NAME }} {% compress css %} {% endcompress %} @@ -23,7 +23,10 @@