diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 7198e1e3b..192c0f0f9 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -55,11 +55,11 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware', - 'pretixbase.middleware.LocaleMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'pretixcontrol.middleware.PermissionMiddleware', 'pretixpresale.middleware.EventMiddleware', + 'pretixbase.middleware.LocaleMiddleware', ) TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/src/pretixbase/middleware.py b/src/pretixbase/middleware.py index bc02e63d5..ac59e3f3b 100644 --- a/src/pretixbase/middleware.py +++ b/src/pretixbase/middleware.py @@ -28,7 +28,7 @@ class LocaleMiddleware(BaseLocaleMiddleware): def process_request(self, request): url = resolve(request.path_info) - if 'event' in url.kwargs and 'organizer' in url.kwargs: + if 'event' in url.kwargs and 'organizer' in url.kwargs and not hasattr(request, 'event'): try: request.event = Event.objects.current.get( slug=url.kwargs['event'], diff --git a/src/pretixpresale/static/pretixpresale/less/main.less b/src/pretixpresale/static/pretixpresale/less/main.less index 1267f75a1..037d8d3fc 100644 --- a/src/pretixpresale/static/pretixpresale/less/main.less +++ b/src/pretixpresale/static/pretixpresale/less/main.less @@ -1,3 +1,10 @@ @import "../../../../pretixbase/static/bootstrap/less/bootstrap.less"; @import "../../../../pretixbase/static/fontawesome/less/font-awesome.less"; @fa-font-path: "../../fontawesome/fonts"; + +.input-item-count { + text-align: center; +} +.availabilitybox.available { + text-align: center; +} diff --git a/src/pretixpresale/templates/pretixpresale/event/base.html b/src/pretixpresale/templates/pretixpresale/event/base.html index 02ad9be59..da8c79e17 100644 --- a/src/pretixpresale/templates/pretixpresale/event/base.html +++ b/src/pretixpresale/templates/pretixpresale/event/base.html @@ -16,7 +16,7 @@
-

{{ event.name }}

+

{{ event.name }} {{ event.date_from|date }}{% if event.show_date_to %} – {{ event.date_to|date }}{% endif %}

{% block content %} {% endblock %}
diff --git a/src/pretixpresale/templates/pretixpresale/event/index.html b/src/pretixpresale/templates/pretixpresale/event/index.html index bcf79c735..82f7dc7b6 100644 --- a/src/pretixpresale/templates/pretixpresale/event/index.html +++ b/src/pretixpresale/templates/pretixpresale/event/index.html @@ -1,5 +1,19 @@ {% extends "pretixpresale/event/base.html" %} {% block content %} -Hallo + {% for tup in items_by_category %} +

{{ tup.0.name }}

+ {% for item in tup.1 %} +
+
+ {{ item.name }} +

{{ item.short_description }}

+
+
+
+ +
+
+ {% endfor %} + {% endfor %} {% endblock %} \ No newline at end of file diff --git a/src/pretixpresale/views/event.py b/src/pretixpresale/views/event.py index 977e715d1..3eca58cd5 100644 --- a/src/pretixpresale/views/event.py +++ b/src/pretixpresale/views/event.py @@ -13,4 +13,12 @@ class EventIndex(EventViewMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + items = self.request.event.items.all().select_related( + 'category' + ).order_by('category__position', 'category_id', 'name') + # Regroup those by category + context['items_by_category'] = [ + (cat, [i for i in items if i.category_id == cat.identity]) + for cat in set([i.category for i in items]) + ] return context