Add setting organizer_logo_image_inherit

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'
     ]
 

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,

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',

src/pretix/control/templates/pretixcontrol/organizers/edit.html

@@ -41,6 +41,7 @@
                         <legend>{% trans "Organizer page" %}</legend>
                         {% 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" %}

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',

src/pretix/presale/templates/pretixpresale/event/base.html

@@ -33,9 +33,9 @@
             </div>
         </div>
     {% endif %}
-    <div class="container page-header-links {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}page-header-links-outside{% endif %}">
+    <div class="container page-header-links {% if event.settings.theme_color_background|upper != "#FFFFFF" or event_logo_image_large %}page-header-links-outside{% 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 %}
                 <div class="pull-right header-part flip hidden-print">
                     {% if event.settings.locales|length > 1 %}
                         <nav class="locales" aria-label="{% trans "select language" %}">
@@ -62,9 +62,9 @@
     </div>
 {% endblock %}
 {% block page %}
-    <div class="page-header {% if event_logo and event.settings.logo_image_large %}logo-large{% endif %}">
-        <div class="{% if not event_logo or not event.settings.logo_image_large %}pull-left flip{% endif %}">
-            {% if event_logo and event.settings.logo_image_large %}
+    <div class="page-header {% if event_logo and event_logo_image_large %}logo-large{% endif %}">
+        <div class="{% if not event_logo or not event_logo_image_large %}pull-left flip{% endif %}">
+            {% if event_logo and event_logo_image_large %}
                 <a href="{% eventurl event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}"
                    title="{{ event.name }}">
                     <img src="{{ event_logo|thumb:'1170x5000' }}" alt="{{ event.name }}" class="event-logo" />
@@ -84,8 +84,8 @@
             {% endif %}
         </div>
         {% if event.settings.locales|length > 1 or request.organizer.settings.customer_accounts %}
-            {% if event.settings.theme_color_background|upper == "#FFFFFF" and not event.settings.logo_image_large %}
-                <div class="{% if not event_logo or not event.settings.logo_image_large %}pull-right flip{% endif %} loginbox hidden-print">
+            {% if event.settings.theme_color_background|upper == "#FFFFFF" and not event_logo_image_large %}
+                <div class="{% if not event_logo or not event_logo_image_large %}pull-right flip{% endif %} loginbox hidden-print">
                     {% if event.settings.locales|length > 1 %}
                         <nav class="locales" aria-label="{% trans "select language" %}">
                             {% for l in languages %}

src/pretix/presale/templates/pretixpresale/event/index.html

@@ -32,7 +32,7 @@
 
     {% if request.event.has_subevents %}
         {% if not subevent %}
-            {% if event_logo and request.event.settings.logo_show_title %}
+            {% if event_logo and event_logo_show_title %}
                 <h2 class="content-header">
                     {{ event.name }}
                 </h2>
@@ -95,7 +95,7 @@
             {% endif %}
         {% endif %}
     {% else %}
-        {% if event_logo and request.event.settings.logo_show_title %}
+        {% if event_logo and event_logo_show_title %}
             <h2 class="content-header">
                 {{ event.name }}
                 {% if request.event.settings.show_dates_on_frontpage %}