From 80b57507564990e1d691b67b5a356841d69b1fb4 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 18 Jan 2019 17:24:15 +0100 Subject: [PATCH] New content for / index page --- src/pretix/control/context.py | 1 + .../templates/pretixcontrol/auth/base.html | 2 +- src/pretix/presale/context.py | 1 + .../templates/pretixpresale/index.html | 42 +++++++++---------- .../static/pretixcontrol/scss/auth.scss | 4 ++ .../static/pretixpresale/scss/index.scss | 27 ------------ 6 files changed, 26 insertions(+), 51 deletions(-) delete mode 100644 src/pretix/static/pretixpresale/scss/index.scss diff --git a/src/pretix/control/context.py b/src/pretix/control/context.py index 046800120..7b20677f7 100644 --- a/src/pretix/control/context.py +++ b/src/pretix/control/context.py @@ -34,6 +34,7 @@ def contextprocessor(request): ctx = { 'url_name': url.url_name, 'settings': settings, + 'django_settings': settings, 'DEBUG': settings.DEBUG, } _html_head = [] diff --git a/src/pretix/control/templates/pretixcontrol/auth/base.html b/src/pretix/control/templates/pretixcontrol/auth/base.html index f7db89c5b..4a55d8a84 100644 --- a/src/pretix/control/templates/pretixcontrol/auth/base.html +++ b/src/pretix/control/templates/pretixcontrol/auth/base.html @@ -4,7 +4,7 @@ - {{ settings.PRETIX_INSTANCE_NAME }} + {{ django_settings.PRETIX_INSTANCE_NAME }} {% compress css %} {% endcompress %} diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py index f123fa9b3..24e2e98f1 100644 --- a/src/pretix/presale/context.py +++ b/src/pretix/presale/context.py @@ -79,5 +79,6 @@ def contextprocessor(request): ctx['js_time_format'] = get_javascript_format_without_seconds('TIME_INPUT_FORMATS') ctx['js_locale'] = get_moment_locale() ctx['settings'] = pretix_settings + ctx['django_settings'] = settings return ctx diff --git a/src/pretix/presale/templates/pretixpresale/index.html b/src/pretix/presale/templates/pretixpresale/index.html index c308484ae..eba1d483e 100644 --- a/src/pretix/presale/templates/pretixpresale/index.html +++ b/src/pretix/presale/templates/pretixpresale/index.html @@ -1,30 +1,26 @@ +{% extends "pretixcontrol/auth/base.html" %} +{% load bootstrap3 %} {% load i18n %} -{% load compress %} {% load static %} - - - - {{ settings.PRETIX_INSTANCE_NAME }} - {% compress css %} - - {% endcompress %} - - - -
- - -

{% trans "Hello!" %}

+{% block content %} + - - +{% endblock %} diff --git a/src/pretix/static/pretixcontrol/scss/auth.scss b/src/pretix/static/pretixcontrol/scss/auth.scss index 37d373fbb..30ac0eeb1 100644 --- a/src/pretix/static/pretixcontrol/scss/auth.scss +++ b/src/pretix/static/pretixcontrol/scss/auth.scss @@ -44,6 +44,10 @@ footer { h3 { margin-top: 0; } + + p:last-child { + margin-bottom: 20px; + } } .container > .alert { diff --git a/src/pretix/static/pretixpresale/scss/index.scss b/src/pretix/static/pretixpresale/scss/index.scss deleted file mode 100644 index 380b19a37..000000000 --- a/src/pretix/static/pretixpresale/scss/index.scss +++ /dev/null @@ -1,27 +0,0 @@ -@import "../../bootstrap/scss/_bootstrap.scss"; -@import "../../fontawesome/scss/font-awesome.scss"; -@import "../../pretixbase/scss/colors.scss"; - - -body { - background: #ececec; - text-align: center; - padding: 50px 0; -} - -.big-rotating-icon { - margin-top: 50px; - -webkit-animation: fa-spin 8s infinite linear; - animation: fa-spin 8s infinite linear; - font-size: 200px; - color: $brand-primary; -} - -.logo { - width: 330px; - margin: auto; - display: block; - margin-top: 10%; - height: auto; - max-width: 100%; -}