CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add setting organizer_logo_image_inherit

Browse Source
This commit is contained in:
Raphael Michel
2021-09-17 13:33:34 +02:00
parent 101f5f7781
commit 1d065a7672
7 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/presale/context.py
View File

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

14
src/pretix/presale/templates/pretixpresale/event/base.html
View File

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

4
src/pretix/presale/templates/pretixpresale/event/index.html
View File

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