From f37d265534b8a2ef450535d316ba5dd005e89d6d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 18 Jan 2019 17:14:24 +0100 Subject: [PATCH] Refresh design for auth and error pages --- src/pretix/base/templates/400.html | 20 ++++++---- src/pretix/base/templates/403.html | 40 ++++++++++--------- src/pretix/base/templates/404.html | 38 ++++++++++-------- src/pretix/base/templates/500.html | 38 ++++++++++-------- src/pretix/base/templates/csrffail.html | 40 +++++++++++-------- src/pretix/base/templates/error.html | 4 +- .../templates/pretixcontrol/auth/base.html | 2 +- .../static/pretixbase/img/pretix-logo.svg | 29 +++++++------- src/pretix/static/pretixbase/scss/error.scss | 36 ++++++++++++++--- .../static/pretixcontrol/scss/auth.scss | 11 +++-- 10 files changed, 155 insertions(+), 103 deletions(-) diff --git a/src/pretix/base/templates/400.html b/src/pretix/base/templates/400.html index 274850d437..a86a2d3f1d 100644 --- a/src/pretix/base/templates/400.html +++ b/src/pretix/base/templates/400.html @@ -1,13 +1,17 @@ {% extends "error.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "Bad Request" %}{% endblock %} {% block content %} - -

{% trans "Bad Request" %}

-

{% trans "We were unable to parse your request." %}

-

{{ exception }}

-

- {% trans "Take a step back" %} - · {% trans "Try again" %} -

+ +
+

{% trans "Bad Request" %}

+

{% trans "We were unable to parse your request." %}

+

{{ exception }}

+

+ {% trans "Take a step back" %} + · {% trans "Try again" %} +

+ +
{% endblock %} diff --git a/src/pretix/base/templates/403.html b/src/pretix/base/templates/403.html index 867d860a53..28df94c6b0 100644 --- a/src/pretix/base/templates/403.html +++ b/src/pretix/base/templates/403.html @@ -1,23 +1,27 @@ {% extends "error.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "Permission denied" %}{% endblock %} {% block content %} - -

{% trans "Permission denied" %}

-

{% trans "You do not have access to this page." %}

-

{{ exception }}

-

- {% trans "Take a step back" %} - · {% trans "Try again" %} -

- {% if request.user.is_staff and not staff_session %} -
-

- {% csrf_token %} - -

-
- {% endif %} + +
+

{% trans "Permission denied" %}

+

{% trans "You do not have access to this page." %}

+

{{ exception }}

+

+ {% trans "Take a step back" %} + · {% trans "Try again" %} +

+ {% if request.user.is_staff and not staff_session %} +
+

+ {% csrf_token %} + +

+
+ {% endif %} + +
{% endblock %} diff --git a/src/pretix/base/templates/404.html b/src/pretix/base/templates/404.html index b717879ec2..b157a58723 100644 --- a/src/pretix/base/templates/404.html +++ b/src/pretix/base/templates/404.html @@ -1,22 +1,26 @@ {% extends "error.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "Not found" %}{% endblock %} {% block content %} - -

{% trans "Not found" %}

-

{% trans "I'm afraid we could not find the the resource you requested." %}

-

{{ exception }}

-

- {% trans "Take a step back" %} -

- {% if request.user.is_staff and not staff_session %} -
-

- {% csrf_token %} - -

-
- {% endif %} + +
+

{% trans "Not found" %}

+

{% trans "I'm afraid we could not find the the resource you requested." %}

+

{{ exception }}

+

+ {% trans "Take a step back" %} +

+ {% if request.user.is_staff and not staff_session %} +
+

+ {% csrf_token %} + +

+
+ {% endif %} + +
{% endblock %} diff --git a/src/pretix/base/templates/500.html b/src/pretix/base/templates/500.html index 409f3e30d1..7093f1156e 100644 --- a/src/pretix/base/templates/500.html +++ b/src/pretix/base/templates/500.html @@ -1,23 +1,27 @@ {% extends "error.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "Internal Server Error" %}{% endblock %} {% block content %} - -

{% trans "Internal Server Error" %}

-

{% trans "We had trouble processing your request." %}

-

{% trans "If this problem persists, please contact us." %}

- {% if request.sentry.id %} -

- {% blocktrans trimmed %} - If you contact us, please send us the following code: - {% endblocktrans %} -
- {{ request.sentry.id }} + +

+

{% trans "Internal Server Error" %}

+

{% trans "We had trouble processing your request." %}

+

{% trans "If this problem persists, please contact us." %}

+ {% if request.sentry.id %} +

+ {% blocktrans trimmed %} + If you contact us, please send us the following code: + {% endblocktrans %} +
+ {{ request.sentry.id }} +

+ {% endif %} +

{{ exception }}

+

+ {% trans "Take a step back" %} + · {% trans "Try again" %}

- {% endif %} -

{{ exception }}

-

- {% trans "Take a step back" %} - · {% trans "Try again" %} -

+ +
{% endblock %} diff --git a/src/pretix/base/templates/csrffail.html b/src/pretix/base/templates/csrffail.html index 59fe8d60b9..bdd8642a6f 100644 --- a/src/pretix/base/templates/csrffail.html +++ b/src/pretix/base/templates/csrffail.html @@ -1,24 +1,30 @@ {% extends "error.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "Verification failed" %}{% endblock %} {% block content %} - -

{% trans "Verification failed" %}

-

{% blocktrans trimmed %} - We could not verify that this request really was sent from you. For security reasons, we therefore cannot process it. - {% endblocktrans %}

- {% if no_referer %} -

{{ no_referer1 }}

-

{{ no_referer2 }}

- {% elif no_cookie %} -

{{ no_cookie1 }}

-

{{ no_cookie2 }}

- {% else %} + +
+

{% trans "Verification failed" %}

{% blocktrans trimmed %} - Please go back to the last page, refresh this page and then try again. If the problem persists, please get in touch with us. + We could not verify that this request really was sent from you. For security reasons, we therefore cannot + process it. {% endblocktrans %}

- {% endif %} -

- {% trans "Take a step back" %} -

+ {% if no_referer %} +

{{ no_referer1 }}

+

{{ no_referer2 }}

+ {% elif no_cookie %} +

{{ no_cookie1 }}

+

{{ no_cookie2 }}

+ {% else %} +

{% blocktrans trimmed %} + Please go back to the last page, refresh this page and then try again. If the problem persists, please + get in touch with us. + {% endblocktrans %}

+ {% endif %} +

+ {% trans "Take a step back" %} +

+ +
{% endblock %} diff --git a/src/pretix/base/templates/error.html b/src/pretix/base/templates/error.html index 6125ed9a08..fcb1f223cc 100644 --- a/src/pretix/base/templates/error.html +++ b/src/pretix/base/templates/error.html @@ -1,6 +1,6 @@ {% load compress %} {% load i18n %} -{% load static %} +{% load staticfiles %} @@ -16,6 +16,6 @@
{% block content %}{% endblock %}
- + diff --git a/src/pretix/control/templates/pretixcontrol/auth/base.html b/src/pretix/control/templates/pretixcontrol/auth/base.html index cb84c2d12b..f7db89c5b7 100644 --- a/src/pretix/control/templates/pretixcontrol/auth/base.html +++ b/src/pretix/control/templates/pretixcontrol/auth/base.html @@ -1,6 +1,6 @@ {% load compress %} {% load i18n %} -{% load static %} +{% load staticfiles %} diff --git a/src/pretix/static/pretixbase/img/pretix-logo.svg b/src/pretix/static/pretixbase/img/pretix-logo.svg index e68073c188..9bfdcc47c7 100644 --- a/src/pretix/static/pretixbase/img/pretix-logo.svg +++ b/src/pretix/static/pretixbase/img/pretix-logo.svg @@ -1,21 +1,22 @@ - - id="svg2" - version="1.1"> + width="254.15625" + height="109.59375" + viewBox="0 0 254.15625 109.59375" + version="1.1" + id="svg5"> - - - + id="defs4" /> + + + diff --git a/src/pretix/static/pretixbase/scss/error.scss b/src/pretix/static/pretixbase/scss/error.scss index 4cebda8d04..6ad8d516e0 100644 --- a/src/pretix/static/pretixbase/scss/error.scss +++ b/src/pretix/static/pretixbase/scss/error.scss @@ -5,16 +5,40 @@ body { - background: #ececec; - text-align: center; + background: #fbf7fc; padding: 50px 0; } .big-icon { font-size: 200px; - color: $brand-primary; + color: $navbar-inverse-bg; + display: block; + float: left; } -.larger { - font-size: 16px; -} \ No newline at end of file +.error-details { + margin-left: 260px; +} + +.container { + width: 90%; + max-width: 800px; +} + +.logo { + height: 35px; + width: auto; +} + +@media(max-width: 600px) { + body { + text-align: center; + } + .big-icon { + margin: auto; + float: none; + } + .error-details { + margin-left: 0; + } +} diff --git a/src/pretix/static/pretixcontrol/scss/auth.scss b/src/pretix/static/pretixcontrol/scss/auth.scss index f148fb7c01..37d373fbb5 100644 --- a/src/pretix/static/pretixcontrol/scss/auth.scss +++ b/src/pretix/static/pretixcontrol/scss/auth.scss @@ -4,7 +4,7 @@ @import "../../pretixbase/scss/_theme.scss"; body { - background: #eee; + background: #fbf7fc; } footer { @@ -14,20 +14,25 @@ footer { } .logo { - width: 330px; + width: 200px; margin: auto; display: block; margin-top: 10%; + margin-bottom: 30px; height: auto; max-width: 100%; } .form-signin { @extend .well; + background: white; + box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07); + border: 1px solid white; + max-width: 330px; margin: auto; padding-bottom: 0; - + .control-label { display: none; }