CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-21 17:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename text-blob to textbubble

Browse Source
This commit is contained in:
Richard Schreiber
2024-11-22 12:56:22 +01:00
parent 3ec0fdb4d2
commit d1a6ab89fe
6 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/base/templatetags/textblob.py → src/pretix/base/templatetags/textbubble.py
View File

@@ -26,9 +26,9 @@ register = template.Library()
@register.simple_tag
def textblob(type, *args, **kwargs):
def textbubble(type, *args, **kwargs):
return format_html(
'<span class="text-blob-{}">{}',
'<span class="textbubble-{}">{}',
type or "info",
"" if "icon" not in kwargs else format_html(
'<i class="fa fa-{}" aria-hidden="true"></i> ',
@@ -37,5 +37,5 @@ def textblob(type, *args, **kwargs):
)
@register.simple_tag
def endtextblob():
def endtextbubble():
return mark_safe('</span>')

20
src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html
View File

@@ -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 %}

14
src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html
View File

@@ -2,7 +2,7 @@
{% load i18n %}
{% load icon %}
{% load eventurl %}
{% load textblob %}
{% load textbubble %}
{% block title %}{% trans "Your membership" %}{% endblock %}
{% block inner %}
<div class="panel panel-default">
@@ -16,9 +16,9 @@
<b>{% trans "Your membership" %}</b>
{% if membership.testmode %}
<span class="h6">
{% textblob "warning" %}
{% textbubble "warning" %}
{% trans "TEST MODE" %}
{% endtextblob %}
{% endtextbubble %}
</span>
{% endif %}
</h3>
@@ -30,9 +30,9 @@
{{ membership.membership_type.name }}
{% if membership.canceled %}</del>
<small>
{% textblob "danger" icon="times" %}
{% textbubble "danger" icon="times" %}
{% trans "Canceled" %}
{% endtextblob %}
{% endtextbubble %}
</small>
{% endif %}
<br><small class="text-muted">
@@ -80,9 +80,9 @@
{% if op.order.testmode %}
<dd>
<small>
{% textblob "warning" %}
{% textbubble "warning" %}
{% trans "TEST MODE" %}
{% endtextblob %}
{% endtextbubble %}
</small>
</dd>
{% endif %}

10
src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html
View File

@@ -2,7 +2,7 @@
{% load i18n %}
{% load icon %}
{% load eventurl %}
{% load textblob %}
{% load textbubble %}
{% block title %}{% trans "Memberships" %}{% endblock %}
{% block inner %}
<div class="panel panel-default">
@@ -38,9 +38,9 @@
<dd class="text-muted">
<small>
{% 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 %}
<dd>
<small>
{% textblob "warning" %}
{% textbubble "warning" %}
{% trans "TEST MODE" %}
{% endtextblob %}
{% endtextbubble %}
</small>
</dd>
{% endif %}

6
src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html
View File

@@ -2,7 +2,7 @@
{% load i18n %}
{% load eventurl %}
{% load money %}
{% load textblob %}
{% load textbubble %}
{% block title %}{% trans "Your account" %}{% endblock %}
{% block inner %}
<div class="panel panel-default">
@@ -36,9 +36,9 @@
{% if o.testmode %}
<dd>
<small>
{% textblob "warning" %}
{% textbubble "warning" %}
{% trans "TEST MODE" %}
{% endtextblob %}
{% endtextbubble %}
</small>
</dd>
{% endif %}

10
src/pretix/static/pretixpresale/scss/main.scss
View File

@@ -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 {