diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html index ee2044d941..f5d1834c5d 100644 --- a/src/pretix/control/templates/pretixcontrol/base.html +++ b/src/pretix/control/templates/pretixcontrol/base.html @@ -198,7 +198,7 @@ {% elif request.user.is_staff and staff_session %}
  • - + {% trans "End admin session" %}
  • diff --git a/src/pretix/control/templates/pretixcontrol/event/logs.html b/src/pretix/control/templates/pretixcontrol/event/logs.html index 46a62287e9..7fae7b6f4b 100644 --- a/src/pretix/control/templates/pretixcontrol/event/logs.html +++ b/src/pretix/control/templates/pretixcontrol/event/logs.html @@ -81,7 +81,7 @@
    {{ log.display }} {% if staff_session %} - + {% trans "Inspect" %} diff --git a/src/pretix/control/templates/pretixcontrol/event/logs_embed.html b/src/pretix/control/templates/pretixcontrol/event/logs_embed.html index 458bafd913..94b9e36e0a 100644 --- a/src/pretix/control/templates/pretixcontrol/event/logs_embed.html +++ b/src/pretix/control/templates/pretixcontrol/event/logs_embed.html @@ -42,7 +42,7 @@
    {{ log.display }} {% if staff_session %} - + {% trans "Inspect" %} diff --git a/src/pretix/control/templates/pretixcontrol/events/create_base.html b/src/pretix/control/templates/pretixcontrol/events/create_base.html index 7c45b5f5e1..17e273f2a9 100644 --- a/src/pretix/control/templates/pretixcontrol/events/create_base.html +++ b/src/pretix/control/templates/pretixcontrol/events/create_base.html @@ -31,7 +31,7 @@ {% trans "Every event needs to be created as part of an organizer account. Currently, you do not have access to any organizer accounts." %}
    {% if staff_session %} - + {% trans "Create a new organizer" %} {% endif %} diff --git a/src/pretix/control/templates/pretixcontrol/includes/logs.html b/src/pretix/control/templates/pretixcontrol/includes/logs.html index 2ead9985d5..8cb8b25467 100644 --- a/src/pretix/control/templates/pretixcontrol/includes/logs.html +++ b/src/pretix/control/templates/pretixcontrol/includes/logs.html @@ -37,7 +37,7 @@

    {{ log.display }} {% if staff_session %} - + {% trans "Inspect" %} diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html index 5f6dbe02d1..81ba1f8c43 100644 --- a/src/pretix/control/templates/pretixcontrol/order/index.html +++ b/src/pretix/control/templates/pretixcontrol/order/index.html @@ -800,7 +800,7 @@ {{ p.html_info|safe }} {% if staff_session %}

    - + {% trans "Inspect" %} @@ -812,7 +812,7 @@ - + {% trans "Inspect" %} @@ -916,7 +916,7 @@ {% endif %} {% if staff_session %}

    - {% trans "Inspect" %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/device_logs.html b/src/pretix/control/templates/pretixcontrol/organizers/device_logs.html index 322dd1fb08..0e526f3c0f 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/device_logs.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/device_logs.html @@ -37,7 +37,7 @@

    {{ log.display }} {% if staff_session %} - + {% trans "Inspect" %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html index acc04a27de..8697304a7a 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html @@ -12,7 +12,7 @@ {% blocktrans with name=organizer.name %}Organizer settings{% endblocktrans %} {% if request.user.is_staff and staff_session %} + class="btn btn-danger hidden-print admin-only"> {% endif %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html b/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html index 13aa415071..271780abe8 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html @@ -89,7 +89,7 @@ {% endif %} {% if staff_session and t.info %} -
    {{ t.info|pprint }}
    +
    {{ t.info|pprint }}
    {% endif %} {% if t.acceptor and t.acceptor != request.organizer %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/index.html b/src/pretix/control/templates/pretixcontrol/organizers/index.html index 0660d1fc62..942524b64b 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/index.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/index.html @@ -29,7 +29,7 @@
    {% if staff_session %}

    - + {% trans "Create a new organizer" %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/logs.html b/src/pretix/control/templates/pretixcontrol/organizers/logs.html index d849570e6a..aa3f32a631 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/logs.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/logs.html @@ -67,7 +67,7 @@

    {{ log.display }} {% if staff_session %} - + {% trans "Inspect" %} diff --git a/src/pretix/control/templates/pretixcontrol/search/payments.html b/src/pretix/control/templates/pretixcontrol/search/payments.html index dae3f1c068..0c1ed8a3a8 100644 --- a/src/pretix/control/templates/pretixcontrol/search/payments.html +++ b/src/pretix/control/templates/pretixcontrol/search/payments.html @@ -142,7 +142,7 @@ - + {% trans "Inspect" %} diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss index 41a72dee01..b689487354 100644 --- a/src/pretix/static/pretixcontrol/scss/main.scss +++ b/src/pretix/static/pretixcontrol/scss/main.scss @@ -48,7 +48,7 @@ nav.navbar { } nav.navbar .danger, nav.navbar .danger:hover, nav.navbar .danger:active { - background: $brand-danger !important; + background-color: $brand-danger !important; } .navbar-header .navbar-events { @@ -490,6 +490,28 @@ td > p:last-child, } } +.admin-only, +.panel-default > .panel-heading.admin-only, +.panel-default > legend > .panel-heading.admin-only { + background-color: #f9ece1; + background-image: repeating-linear-gradient(135deg, + rgba(255, 255, 255, .5), + rgba(255, 255, 255, .5) 10px, + transparent 12px, + transparent 22px, + rgba(255, 255, 255, .5) 24px); +} + + +.danger.admin-only { + background-image: repeating-linear-gradient(135deg, + rgba(0, 0, 0, .1), + rgba(0, 0, 0, .1) 10px, + transparent 12px, + transparent 22px, + rgba(0, 0, 0, .1) 24px); +} + .quotabox { display: inline-block; vertical-align: top;