CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Define Favicons on Organizer-level

Browse Source
This commit is contained in:
Martin Gross
2019-01-28 17:29:39 +01:00
parent da8da01614
commit 6ed016e49e
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/control/forms/organizer.py
View File

@@ -262,6 +262,13 @@ class OrganizerDisplaySettingsForm(SettingsForm):
], ],
help_text=_('Only respected by modern browsers.') help_text=_('Only respected by modern browsers.')
) )
favicon = ExtFileField(
label=_('Favicon'),
ext_whitelist=(".ico", ".png", ".jpg", ".gif", ".jpeg"),
required=False,
help_text=_('If you provide a favicon, we will show it instead of the default pretix icon. '
'We recommend a size of at least 200x200px to accomodate most devices.')
)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)

1
src/pretix/control/templates/pretixcontrol/organizers/display.html
View File

@@ -27,6 +27,7 @@
{% bootstrap_field form.theme_color_success layout="control" %} {% bootstrap_field form.theme_color_success layout="control" %}
{% bootstrap_field form.theme_color_danger layout="control" %} {% bootstrap_field form.theme_color_danger layout="control" %}
{% bootstrap_field form.primary_font layout="control" %} {% bootstrap_field form.primary_font layout="control" %}
{% bootstrap_field form.favicon layout="control" %}
</fieldset> </fieldset>
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save"> <button type="submit" class="btn btn-primary btn-save">

16
src/pretix/presale/templates/pretixpresale/base.html
View File

@@ -3,6 +3,7 @@
{% load i18n %} {% load i18n %}
{% load safelink %} {% load safelink %}
{% load statici18n %} {% load statici18n %}
{% load thumb %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@@ -36,12 +37,19 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
<link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}"> <link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
{% block custom_header %}{% endblock %} {% block custom_header %}{% endblock %}
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}"> {% if settings.favicon %}
<link rel="shortcut icon" href="{{ settings.favicon|thumb:'16x16^' }}">
<link rel="icon" type="image/png" sizes="32x32" href="{{ settings.favicon|thumb:'32x32^' }}">
<link rel="icon" type="image/png" sizes="194x194" href="{{ settings.favicon|thumb:'194x194^' }}">
<link rel="icon" type="image/png" sizes="16x16" href="{{ settings.favicon|thumb:'16x16^' }}">
{% else %}
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">
{% endif %}
<link rel="apple-touch-icon" sizes="180x180" href="{% static "pretixbase/img/icons/apple-touch-icon.png" %}"> <link rel="apple-touch-icon" sizes="180x180" href="{% static "pretixbase/img/icons/apple-touch-icon.png" %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
<link rel="icon" type="image/png" sizes="192x192" href="{% static "pretixbase/img/icons/android-chrome-192x192.png" %}"> <link rel="icon" type="image/png" sizes="192x192" href="{% static "pretixbase/img/icons/android-chrome-192x192.png" %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">
<link rel="manifest" href="{% url "presale:site.webmanifest" %}"> <link rel="manifest" href="{% url "presale:site.webmanifest" %}">
<link rel="mask-icon" href="{% static "pretixbase/img/icons/safari-pinned-tab.svg" %}" color="{{ settings.primary_color|default:"#3b1c4a" }}"> <link rel="mask-icon" href="{% static "pretixbase/img/icons/safari-pinned-tab.svg" %}" color="{{ settings.primary_color|default:"#3b1c4a" }}">
<meta name="msapplication-TileColor" content="{{ settings.primary_color|default:"#3b1c4a" }}"> <meta name="msapplication-TileColor" content="{{ settings.primary_color|default:"#3b1c4a" }}">