Allowing more options to style pretix shops (#1585)

* Fix caching issues in SASS compilation

* Allow to set a custom page background color

* Allow to disable round corners

* Support larger header pictures

* Allow to show title despite header

* Move language picker

* FIx widget styles
This commit is contained in:
Raphael Michel
2020-02-27 10:54:00 +01:00
committed by GitHub
parent b622854be6
commit 3fd650081b
22 changed files with 650 additions and 72 deletions

View File

@@ -51,7 +51,7 @@
{{ html_page_header|safe }}
{% block above %}
{% endblock %}
<div class="container">
<div class="container main-box">
{% block page %}
{% endblock %}
<footer>

View File

@@ -30,20 +30,40 @@
</div>
</div>
{% endif %}
{% endblock %}
{% block page %}
<div class="page-header">
<div class="container page-header-links">
{% if event.settings.locales|length > 1 %}
{% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}
<div class="pull-right header-part flip">
<div class="locales">
{% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
{{ l.name_local }}</a>
{% endfor %}
</div>
</div>
{% endif %}
{% endif %}
{% if request.event.settings.organizer_link_back %}
<p>
<div class="pull-left header-part flip">
<a href="{% eventurl request.organizer "presale:organizer.index" %}">
&laquo; {% blocktrans trimmed with name=request.organizer.name %}
Show all events of {{ name }}
{% endblocktrans %}
Show all events of {{ name }}
{% endblocktrans %}
</a>
</p>
</div>
{% endif %}
<div class="pull-left flip">
{% if event_logo %}
<div class="clearfix"></div>
</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 %}
<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" />
</a>
{% elif event_logo %}
<a href="{% eventurl event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}"
title="{{ event.name }}">
<img src="{{ event_logo|thumb:'5000x120' }}" alt="{{ event.name }}" class="event-logo" />
@@ -57,16 +77,18 @@
</h1>
{% endif %}
</div>
<div class="pull-right flip loginbox">
{% if request.event.settings.locales|length > 1 %}
<div class="locales">
{% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
{{ l.name_local }}</a>
{% endfor %}
{% if event.settings.locales|length > 1 %}
{% 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">
<div class="locales">
{% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
{{ l.name_local }}</a>
{% endfor %}
</div>
</div>
{% endif %}
</div>
{% endif %}
<div class="clearfix"></div>
</div>
{% if request.event.testmode %}

View File

@@ -25,6 +25,7 @@
{{ ev.event_microdata }}
</script>
{% endautoescape %}
{% if show_cart %}
<details class="panel panel-primary cart" open>
<summary class="panel-heading">
@@ -126,6 +127,14 @@
<h2 class="subevent-head">{{ subevent.name }}</h2>
{% endif %}
{% endif %}
{% if event_logo and request.event.settings.logo_show_title and not subevent %}
<h2 class="content-header">
{{ event.name }}
{% if not event.has_subevents %}
<small>{{ event.get_date_range_display }}</small>
{% endif %}
</h2>
{% endif %}
{% if frontpage_text and not cart_namespace %}
<div>

View File

@@ -6,10 +6,31 @@
{% block thetitle %}
{% block title %}{% endblock %}{% if url_name != "organizer.index" %} :: {% endif %}{{ organizer.name }}
{% endblock %}
{% block above %}
{% if organizer.settings.locales|length > 1 %}
{% if organizer.settings.theme_color_background|upper != "#FFFFFF" or organizer.settings.organizer_logo_image_large %}
<div class="container page-header-links">
<div class="pull-right header-part flip">
<div class="locales">
{% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
{{ l.name_local }}</a>
{% endfor %}
</div>
</div>
</div>
{% endif %}
{% endif %}
{% endblock %}
{% block page %}
<div class="page-header">
<div class="pull-left flip">
{% if organizer_logo %}
<div class="page-header {% if organizer_logo and organizer.settings.organizer_logo_image_large %}logo-large{% endif %}">
<div class="{% if not organizer_logo or not organizer.settings.organizer_logo_image_large %}pull-left flip{% endif %}">
{% if organizer_logo and organizer.settings.organizer_logo_image_large %}
<a href="{% eventurl organizer "presale:organizer.index" %}" title="{{ organizer.name }}">
<img src="{{ organizer_logo|thumb:'1170x5000' }}" alt="{{ organizer.name }}"
class="organizer-logo" />
</a>
{% elif organizer_logo %}
<a href="{% eventurl organizer "presale:organizer.index" %}" title="{{ organizer.name }}">
<img src="{{ organizer_logo|thumb:'5000x120' }}" alt="{{ organizer.name }}"
class="organizer-logo" />
@@ -18,16 +39,18 @@
<h1><a href="{% eventurl organizer "presale:organizer.index" %}">{{ organizer.name }}</a></h1>
{% endif %}
</div>
<div class="pull-right flip loginbox">
{% if organizer.settings.locales|length > 1 %}
<div class="locales">
{% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
{{ l.name_local }}</a>
{% endfor %}
{% if organizer.settings.locales|length > 1 %}
{% if organizer.settings.theme_color_background|upper == "#FFFFFF" and not organizer.settings.organizer_logo_image_large %}
<div class="{% if not organizer_logo or not organizer.settings.organizer_logo_image_large %}pull-right flip{% endif %} loginbox">
<div class="locales">
{% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
{{ l.name_local }}</a>
{% endfor %}
</div>
</div>
{% endif %}
</div>
{% endif %}
<div class="clearfix"></div>
</div>
{% if messages %}