CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Calendar view: improve differentiation between events’ states (Z#173939) (#2595)

Browse Source
This commit is contained in:
Richard Schreiber
2022-04-14 15:51:46 +02:00
committed by GitHub
parent 8f7bc59214
commit 2f6881934e
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pretix/presale/templates/pretixpresale/fragment_calendar.html
View File

@@ -55,16 +55,10 @@
{% if event.time %} {% if event.time %}
<span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short> <span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
<span class="fa fa-clock-o" aria-hidden="true"></span> <span class="fa fa-clock-o" aria-hidden="true"></span>
{% if not show_names|default_if_none:True %}
<strong>
{% endif %}
<time datetime="{{ event.time|date_fast:"H:i" }}">{{ event.time|date_fast:"TIME_FORMAT" }}</time> <time datetime="{{ event.time|date_fast:"H:i" }}">{{ event.time|date_fast:"TIME_FORMAT" }}</time>
{% if event.event.settings.show_date_to and event.time_end %} {% if event.event.settings.show_date_to and event.time_end %}
<span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span> <time datetime="{{ event.time_end|date_fast:"H:i" }}">{{ event.time_end|date_fast:"TIME_FORMAT" }}</time> <span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span> <time datetime="{{ event.time_end|date_fast:"H:i" }}">{{ event.time_end|date_fast:"TIME_FORMAT" }}</time>
{% endif %} {% endif %}
{% if not show_names|default_if_none:True %}
</strong>
{% endif %}
{% if multiple_timezones %} {% if multiple_timezones %}
{{ event.timezone }} {{ event.timezone }}
{% endif %} {% endif %}
@@ -77,18 +71,18 @@
{% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %} {% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Waiting list" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Waiting list" %}
{% elif event.event.best_availability_state == 20 %} {% elif event.event.best_availability_state == 20 %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Reserved" %} {% trans "Reserved" %}
{% elif event.event.best_availability_state < 20 %} {% elif event.event.best_availability_state < 20 %}
{% if event.event.has_paid_item %} {% if event.event.has_paid_item %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sold out" %} {% trans "Sold out" %}
{% else %} {% else %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Fully booked" %} {% trans "Fully booked" %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% elif event.event.presale_is_running %} {% elif event.event.presale_is_running %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %} {% trans "Sale over" %}
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
<span class="fa fa-ticket" aria-hidden="true"></span> <span class="fa fa-ticket" aria-hidden="true"></span>
{% with date_human=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.presale_start|date_fast:"c" %} {% with date_human=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.presale_start|date_fast:"c" %}

14
src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
View File

@@ -40,16 +40,10 @@
{% if event.time %} {% if event.time %}
<span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short> <span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
<span class="fa fa-clock-o" aria-hidden="true"></span> <span class="fa fa-clock-o" aria-hidden="true"></span>
{% if not show_names|default_if_none:True %}
<strong>
{% endif %}
<time datetime="{{ event.time|date_fast:"H:i" }}">{{ event.time|date_fast:"TIME_FORMAT" }}</time> <time datetime="{{ event.time|date_fast:"H:i" }}">{{ event.time|date_fast:"TIME_FORMAT" }}</time>
{% if event.time_end %} {% if event.time_end %}
<span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span> <time datetime="{{ event.time_end|date_fast:"H:i" }}">{{ event.time_end|date_fast:"TIME_FORMAT" }}</time> <span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span> <time datetime="{{ event.time_end|date_fast:"H:i" }}">{{ event.time_end|date_fast:"TIME_FORMAT" }}</time>
{% endif %} {% endif %}
{% if not show_names|default_if_none:True %}
</strong>
{% endif %}
{% if multiple_timezones %} {% if multiple_timezones %}
{{ event.timezone }} {{ event.timezone }}
{% endif %} {% endif %}
@@ -62,18 +56,18 @@
{% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %} {% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Waiting list" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Waiting list" %}
{% elif event.event.best_availability_state == 20 %} {% elif event.event.best_availability_state == 20 %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Reserved" %} {% trans "Reserved" %}
{% elif event.event.best_availability_state < 20 %} {% elif event.event.best_availability_state < 20 %}
{% if event.event.has_paid_item %} {% if event.event.has_paid_item %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sold out" %} {% trans "Sold out" %}
{% else %} {% else %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Fully booked" %} {% trans "Fully booked" %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% elif event.event.presale_is_running %} {% elif event.event.presale_is_running %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %} {% trans "Sale over" %}
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
<span class="fa fa-ticket" aria-hidden="true"></span> <span class="fa fa-ticket" aria-hidden="true"></span>
{% blocktrans with start_date=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" %} {% blocktrans with start_date=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" %}

23
src/pretix/static/pretixpresale/scss/_calendar.scss
View File

@@ -37,13 +37,13 @@
} }
&.continued, &.over { &.continued, &.over {
background: lighten(#767676, 48%); background: lighten(#767676, 54%);
border-color: lighten(#767676, 30%); border-color: lighten(#767676, 44%);
border-left-color: lighten(#767676, 30%); border-left-color: lighten(#767676, 44%);
color: #767676; color: #767676;
&:hover { &:hover {
background: lighten(#767676, 50%); background: lighten(#767676, 54%);
border-color: lighten(#767676, 25%); border-color: lighten(#767676, 40%);
} }
} }
@@ -82,8 +82,19 @@
} }
} }
.event-name {
&.available > *:first-child,
&.continued > *:first-child,
&.soon > *:first-child {
font-weight: bold; font-weight: bold;
}
&.over > *:first-child,
&.reserved > *:first-child,
&.soldout > *:first-child {
text-decoration: line-through
}
.event-name {
display: block; display: block;
} }
.event-time, .event-status { .event-time, .event-status {