Option to hide date-block on frontpage (#1603)

* Option to hide date-block on frontpage

* Also hide date in headline
This commit is contained in:
Martin Gross
2020-03-12 10:28:47 +01:00
committed by GitHub
parent 39d05a6c40
commit 34c9c40ddc
6 changed files with 66 additions and 46 deletions

View File

@@ -532,6 +532,7 @@ class EventSettingsSerializer(serializers.Serializer):
'checkout_email_helptext', 'checkout_email_helptext',
'presale_has_ended_text', 'presale_has_ended_text',
'voucher_explanation_text', 'voucher_explanation_text',
'show_dates_on_frontpage',
'show_date_to', 'show_date_to',
'show_times', 'show_times',
'show_items_outside_presale_period', 'show_items_outside_presale_period',

View File

@@ -668,6 +668,17 @@ DEFAULTS = {
label=_("Default language"), label=_("Default language"),
) )
}, },
'show_dates_on_frontpage': {
'default': 'True',
'type': bool,
'serializer_class': serializers.BooleanField,
'form_class': forms.BooleanField,
'form_kwargs': dict(
label=_("Show event times and dates on the ticket shop"),
help_text=_("If disabled, no date or time will be shown on the ticket shop's front page. This settings "
"does however not affect the display in other locations."),
)
},
'show_date_to': { 'show_date_to': {
'default': 'True', 'default': 'True',
'type': bool, 'type': bool,

View File

@@ -439,6 +439,7 @@ class EventSettingsForm(SettingsForm):
'checkout_email_helptext', 'checkout_email_helptext',
'presale_has_ended_text', 'presale_has_ended_text',
'voucher_explanation_text', 'voucher_explanation_text',
'show_dates_on_frontpage',
'show_date_to', 'show_date_to',
'show_times', 'show_times',
'show_items_outside_presale_period', 'show_items_outside_presale_period',

View File

@@ -121,6 +121,7 @@
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>{% trans "Display" %}</legend> <legend>{% trans "Display" %}</legend>
{% bootstrap_field sform.show_dates_on_frontpage layout="control" %}
{% bootstrap_field sform.show_date_to layout="control" %} {% bootstrap_field sform.show_date_to layout="control" %}
{% bootstrap_field sform.show_times layout="control" %} {% bootstrap_field sform.show_times layout="control" %}
{% bootstrap_field sform.show_quota_left layout="control" %} {% bootstrap_field sform.show_quota_left layout="control" %}

View File

@@ -130,7 +130,7 @@
{% if event_logo and request.event.settings.logo_show_title and not subevent %} {% if event_logo and request.event.settings.logo_show_title and not subevent %}
<h2 class="content-header"> <h2 class="content-header">
{{ event.name }} {{ event.name }}
{% if not event.has_subevents %} {% if event.settings.show_dates_on_frontpage and not event.has_subevents %}
<small>{{ event.get_date_range_display }}</small> <small>{{ event.get_date_range_display }}</small>
{% endif %} {% endif %}
</h2> </h2>
@@ -174,6 +174,7 @@
</p> </p>
</div> </div>
{% endif %} {% endif %}
{% if ev.settings.show_dates_on_frontpage %}
<div class="info-row"> <div class="info-row">
<span class="fa fa-clock-o fa-fw"></span> <span class="fa fa-clock-o fa-fw"></span>
<p> <p>
@@ -212,6 +213,7 @@
</a> </a>
</p> </p>
</div> </div>
{% endif %}
</div> </div>

View File

@@ -66,6 +66,7 @@
<td> <td>
<a href="{{ url }}">{{ e.name }}</a> <a href="{{ url }}">{{ e.name }}</a>
</td> </td>
{% if e.settings.show_dates_on_frontpage %}
<td> <td>
{{ e.daterange|default:e.get_date_range_display }} {{ e.daterange|default:e.get_date_range_display }}
{% if e.settings.show_times and not e.has_subevents %} {% if e.settings.show_times and not e.has_subevents %}
@@ -79,6 +80,9 @@
{% endtimezone %} {% endtimezone %}
{% endif %} {% endif %}
</td> </td>
{% else %}
<td>&nbsp;</td>
{% endif %}
<td> <td>
{% if e.has_subevents %} {% if e.has_subevents %}
<span class="label label-default">{% trans "Event series" %}</span> <span class="label label-default">{% trans "Event series" %}</span>