From 8e4b71eb19d2985e64e938e4ac33e1ecbcd33db8 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 23 Feb 2017 20:36:19 +0100 Subject: [PATCH] Display a small pretix logo next to changes performed by superusers --- .../templates/pretixcontrol/event/index.html | 6 ++++++ .../templates/pretixcontrol/event/logs.html | 6 ++++++ .../pretixcontrol/includes/logs.html | 7 +++++++ .../pretixbase/img/pretix-icon-colored.svg | 20 +++++++++++++++++++ .../static/pretixcontrol/scss/main.scss | 12 +++++++++++ 5 files changed, 51 insertions(+) create mode 100644 src/pretix/static/pretixbase/img/pretix-icon-colored.svg diff --git a/src/pretix/control/templates/pretixcontrol/event/index.html b/src/pretix/control/templates/pretixcontrol/event/index.html index ddc0d0599..c08666889 100644 --- a/src/pretix/control/templates/pretixcontrol/event/index.html +++ b/src/pretix/control/templates/pretixcontrol/event/index.html @@ -1,6 +1,7 @@ {% extends "pretixcontrol/event/base.html" %} {% load i18n %} {% load eventurl %} +{% load staticfiles %} {% block title %}{{ request.event.name }}{% endblock %} {% block content %}
@@ -85,6 +86,11 @@
{% if log.user %} {{ log.user.get_full_name }} + {% if log.user.is_superuser %} + + {% endif %} {% endif %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/logs.html b/src/pretix/control/templates/pretixcontrol/event/logs.html index 811d02222..34a98feef 100644 --- a/src/pretix/control/templates/pretixcontrol/event/logs.html +++ b/src/pretix/control/templates/pretixcontrol/event/logs.html @@ -1,5 +1,6 @@ {% extends "pretixcontrol/items/base.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "Event logs" %}{% endblock %} {% block inside %}

{% trans "Event logs" %}

@@ -32,6 +33,11 @@
{% if log.user %} {{ log.user.get_full_name }} + {% if log.user.is_superuser %} + + {% endif %} {% endif %}
diff --git a/src/pretix/control/templates/pretixcontrol/includes/logs.html b/src/pretix/control/templates/pretixcontrol/includes/logs.html index a1a0ffdb0..2366942d6 100644 --- a/src/pretix/control/templates/pretixcontrol/includes/logs.html +++ b/src/pretix/control/templates/pretixcontrol/includes/logs.html @@ -1,3 +1,5 @@ +{% load staticfiles %} +{% load i18n %}
    {% for log in obj.all_logentries %}
  • @@ -5,6 +7,11 @@ {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }} {% if log.user %}
    {{ log.user.get_full_name }} + {% if log.user.is_superuser %} + + {% endif %} {% endif %}

    diff --git a/src/pretix/static/pretixbase/img/pretix-icon-colored.svg b/src/pretix/static/pretixbase/img/pretix-icon-colored.svg new file mode 100644 index 000000000..e75b8df2d --- /dev/null +++ b/src/pretix/static/pretixbase/img/pretix-icon-colored.svg @@ -0,0 +1,20 @@ + + + + + id="svg2" + version="1.1"> + + + + + diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss index 825f391b7..ccb239842 100644 --- a/src/pretix/static/pretixcontrol/scss/main.scss +++ b/src/pretix/static/pretixcontrol/scss/main.scss @@ -196,3 +196,15 @@ body.loading #wrapper { font-size: 200px; color: $brand-primary; } + +.user-admin-icon { + width: 16px; + height: 16px; + margin-top: -2px; +} + +.meta .user-admin-icon { + width: 12px; + height: 12px; + margin-top: -2px; +} \ No newline at end of file