diff --git a/src/pretix/base/templatetags/textblob.py b/src/pretix/base/templatetags/textbubble.py similarity index 93% rename from src/pretix/base/templatetags/textblob.py rename to src/pretix/base/templatetags/textbubble.py index 700af8cbc5..4586e7265e 100644 --- a/src/pretix/base/templatetags/textblob.py +++ b/src/pretix/base/templatetags/textbubble.py @@ -26,9 +26,9 @@ register = template.Library() @register.simple_tag -def textblob(type, *args, **kwargs): +def textbubble(type, *args, **kwargs): return format_html( - '{}', + '{}', type or "info", "" if "icon" not in kwargs else format_html( ' ', @@ -37,5 +37,5 @@ def textblob(type, *args, **kwargs): ) @register.simple_tag -def endtextblob(): +def endtextbubble(): return mark_safe('') diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html b/src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html index 231eabf3b6..d11f4ac5cc 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html @@ -1,29 +1,29 @@ {% load i18n %} {% load bootstrap3 %} -{% load textblob %} +{% load textbubble %} {# Changes should be replicated in pretixcontrol/orders/fragment_order_status.html and in pretix/base/models/orders.py #} {% if order.status == "n" %} {% if order.require_approval %} - {% textblob "warning" icon="exclamation-triangle" %}{% trans "Approval pending" %}{% endtextblob %} + {% textbubble "warning" icon="exclamation-triangle" %}{% trans "Approval pending" %}{% endtextbubble %} {% elif order.total == 0 %} - {% textblob "warning" icon="exclamation-triangle" %}{% trans "Confirmation pending" context "order state" %}{% endtextblob %} + {% textbubble "warning" icon="exclamation-triangle" %}{% trans "Confirmation pending" context "order state" %}{% endtextbubble %} {% elif event.settings.payment_pending_hidden %} {# intentionally left blank #} {% elif order.valid_if_pending %} - {% textblob "info" icon="info-circle" %}{% trans "Confirmed" context "order state" %}{% endtextblob %} + {% textbubble "info" icon="info-circle" %}{% trans "Confirmed" context "order state" %}{% endtextbubble %} {% else %} - {% textblob "warning" icon="exclamation-triangle" %}{% trans "Payment pending" %}{% endtextblob %} + {% textbubble "warning" icon="exclamation-triangle" %}{% trans "Payment pending" %}{% endtextbubble %} {% endif %} {% elif order.status == "p" %} {% if order.count_positions == 0 %} - {% textblob "info" icon="info-circle" %}{% trans "Canceled (paid fee)" %}{% endtextblob %} + {% textbubble "info" icon="info-circle" %}{% trans "Canceled (paid fee)" %}{% endtextbubble %} {% elif order.total == 0 %} - {% textblob "success" icon="check" %}{% trans "Confirmed" context "order state" %}{% endtextblob %} + {% textbubble "success" icon="check" %}{% trans "Confirmed" context "order state" %}{% endtextbubble %} {% else %} - {% textblob "success" icon="check" %}{% trans "Paid" %}{% endtextblob %} + {% textbubble "success" icon="check" %}{% trans "Paid" %}{% endtextbubble %} {% endif %} {% elif order.status == "e" %} - {% textblob "danger" icon="minus" %}{% trans "Expired" %}{% endtextblob %} + {% textbubble "danger" icon="minus" %}{% trans "Expired" %}{% endtextbubble %} {% elif order.status == "c" %} - {% textblob "danger" icon="times" %}{% trans "Canceled" %}{% endtextblob %} + {% textbubble "danger" icon="times" %}{% trans "Canceled" %}{% endtextbubble %} {% endif %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html index 6f4a0dcfcf..20b3f93327 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html @@ -2,7 +2,7 @@ {% load i18n %} {% load icon %} {% load eventurl %} -{% load textblob %} +{% load textbubble %} {% block title %}{% trans "Your membership" %}{% endblock %} {% block inner %}
@@ -16,9 +16,9 @@ {% trans "Your membership" %} {% if membership.testmode %} - {% textblob "warning" %} + {% textbubble "warning" %} {% trans "TEST MODE" %} - {% endtextblob %} + {% endtextbubble %} {% endif %} @@ -30,9 +30,9 @@ {{ membership.membership_type.name }} {% if membership.canceled %} - {% textblob "danger" icon="times" %} + {% textbubble "danger" icon="times" %} {% trans "Canceled" %} - {% endtextblob %} + {% endtextbubble %} {% endif %}
@@ -80,9 +80,9 @@ {% if op.order.testmode %}
- {% textblob "warning" %} + {% textbubble "warning" %} {% trans "TEST MODE" %} - {% endtextblob %} + {% endtextbubble %}
{% endif %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html index a74730aa2d..98ad28d892 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html @@ -2,7 +2,7 @@ {% load i18n %} {% load icon %} {% load eventurl %} -{% load textblob %} +{% load textbubble %} {% block title %}{% trans "Memberships" %}{% endblock %} {% block inner %}
@@ -38,9 +38,9 @@
{% if m.canceled %} - {% textblob "danger" icon="times" %} + {% textbubble "danger" icon="times" %} {% trans "Canceled" %} - {% endtextblob %} + {% endtextbubble %} {% elif m.expired %} {% icon "minus-square-o" %} {% trans "Expired since" %} @@ -65,9 +65,9 @@ {% if m.testmode %}
- {% textblob "warning" %} + {% textbubble "warning" %} {% trans "TEST MODE" %} - {% endtextblob %} + {% endtextbubble %}
{% endif %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html index 939648f381..659d9f2b7a 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html @@ -2,7 +2,7 @@ {% load i18n %} {% load eventurl %} {% load money %} -{% load textblob %} +{% load textbubble %} {% block title %}{% trans "Your account" %}{% endblock %} {% block inner %}
@@ -36,9 +36,9 @@ {% if o.testmode %}
- {% textblob "warning" %} + {% textbubble "warning" %} {% trans "TEST MODE" %} - {% endtextblob %} + {% endtextbubble %}
{% endif %} diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss index c350a0f887..19c6931e6a 100644 --- a/src/pretix/static/pretixpresale/scss/main.scss +++ b/src/pretix/static/pretixpresale/scss/main.scss @@ -531,7 +531,7 @@ h2 .label { } -.text-blob-success, .text-blob-info, .text-blob-warning, .text-blob-danger { +.textbubble-success, .textbubble-info, .textbubble-warning, .textbubble-danger { padding: 0 .4em; border-radius: $border-radius-base; font-weight: bold; @@ -541,28 +541,28 @@ h2 .label { padding-left: .25em; } } -.text-blob-success { +.textbubble-success { color: var(--pretix-brand-success-shade-42); background: var(--pretix-brand-success-tint-85); .fa { color: var(--pretix-brand-success); } } -.text-blob-info { +.textbubble-info { color: var(--pretix-brand-info-shade-42); background: var(--pretix-brand-info-tint-85); .fa { color: var(--pretix-brand-info); } } -.text-blob-warning { +.textbubble-warning { color: var(--pretix-brand-warning-shade-42); background: var(--pretix-brand-warning-tint-85); .fa { color: var(--pretix-brand-warning); } } -.text-blob-danger { +.textbubble-danger { color: var(--pretix-brand-danger-shade-42); background: var(--pretix-brand-danger-tint-85); .fa {