diff --git a/src/pretix/api/serializers/organizer.py b/src/pretix/api/serializers/organizer.py index 5f2fad27d..2e49e44ee 100644 --- a/src/pretix/api/serializers/organizer.py +++ b/src/pretix/api/serializers/organizer.py @@ -295,6 +295,7 @@ class OrganizerSettingsSerializer(SettingsSerializer): 'theme_color_background', 'theme_round_borders', 'primary_font', + 'organizer_logo_image_inherit', 'organizer_logo_image' ] diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index accbaf433..17d149196 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -2093,7 +2093,8 @@ Your {organizer} team""")) 'serializer_class': serializers.BooleanField, 'form_kwargs': dict( label=_('Show event title even if a header image is present'), - help_text=_('The title will only be shown on the event front page.'), + help_text=_('The title will only be shown on the event front page. If no header image is uploaded for the event, but the header image ' + 'from the organizer profile is used, this option will be ignored and the event title will always be shown.'), ) }, 'organizer_logo_image': { @@ -2127,6 +2128,15 @@ Your {organizer} team""")) help_text=_('We recommend to upload a picture at least 1170 pixels wide.'), ) }, + 'organizer_logo_image_inherit': { + 'default': 'False', + 'type': bool, + 'form_class': forms.BooleanField, + 'serializer_class': serializers.BooleanField, + 'form_kwargs': dict( + label=_('Use header image also for events without an individually uploaded logo'), + ) + }, 'og_image': { 'default': None, 'type': File, diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py index 868762af7..158db11b8 100644 --- a/src/pretix/control/forms/organizer.py +++ b/src/pretix/control/forms/organizer.py @@ -295,6 +295,7 @@ class OrganizerSettingsForm(SettingsForm): 'organizer_homepage_text', 'organizer_link_back', 'organizer_logo_image_large', + 'organizer_logo_image_inherit', 'giftcard_length', 'giftcard_expiry_years', 'locales', diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html index 55043d7a9..7f5a082f7 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html @@ -41,6 +41,7 @@ {% trans "Organizer page" %} {% bootstrap_field sform.organizer_logo_image layout="control" %} {% bootstrap_field sform.organizer_logo_image_large layout="control" %} + {% bootstrap_field sform.organizer_logo_image_inherit layout="control" %} {% bootstrap_field sform.organizer_homepage_text layout="control" %} {% bootstrap_field sform.event_list_type layout="control" %} {% bootstrap_field sform.event_list_availability layout="control" %} diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py index 67150a573..e72385e03 100644 --- a/src/pretix/presale/context.py +++ b/src/pretix/presale/context.py @@ -122,6 +122,12 @@ def _default_context(request): ctx['css_file'] = default_storage.url(request.event.settings.presale_css_file) ctx['event_logo'] = request.event.settings.get('logo_image', as_type=str, default='')[7:] + ctx['event_logo_image_large'] = request.event.settings.logo_image_large + ctx['event_logo_show_title'] = request.event.settings.logo_image_show_title + if not ctx['event_logo'] and request.event.settings.organizer_logo_image_inherit and request.event.settings.organizer_logo_image: + ctx['event_logo'] = request.event.settings.get('organizer_logo_image', as_type=str, default='')[7:] + ctx['event_logo_image_large'] = request.event.settings.organizer_logo_image_large + ctx['event_logo_show_title'] = True try: ctx['social_image'] = request.event.cache.get_or_set( 'social_image_url', diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index e189d4ac7..d7941b3c4 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -33,9 +33,9 @@ {% endif %} -
+
{% if event.settings.locales|length > 1 or request.organizer.settings.customer_accounts %} - {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %} + {% if event.settings.theme_color_background|upper != "#FFFFFF" or event_logo_image_large %}
{% if event.settings.locales|length > 1 %}
{% endblock %} {% block page %} -