From b5a2123d1c1407ace9c63c2c1635742fb1472a83 Mon Sep 17 00:00:00 2001
From: scabux <scabux@users.noreply.github.com>
Date: Wed, 17 May 2017 15:53:30 +0200
Subject: [PATCH] Added configurable text for organizer page (#494)

---
 src/pretix/base/templatetags/rich_text.py        |  1 +
 src/pretix/control/forms/organizer.py            | 16 ++++++++++++++++
 .../templates/pretixcontrol/organizers/edit.html |  2 ++
 src/pretix/presale/context.py                    |  1 +
 .../pretixpresale/organizers/index.html          |  6 ++++++
 5 files changed, 26 insertions(+)

diff --git a/src/pretix/base/templatetags/rich_text.py b/src/pretix/base/templatetags/rich_text.py
index df7d39b393..27d219bb45 100644
--- a/src/pretix/base/templatetags/rich_text.py
+++ b/src/pretix/base/templatetags/rich_text.py
@@ -47,6 +47,7 @@ def rich_text(text: str, **kwargs):
     """
     Processes markdown and cleans HTML in a text input.
     """
+    text = str(text)
     body_md = bleach.linkify(bleach.clean(
         markdown.markdown(text),
         tags=ALLOWED_TAGS,
diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py
index c80c57f4b4..6549b60e15 100644
--- a/src/pretix/control/forms/organizer.py
+++ b/src/pretix/control/forms/organizer.py
@@ -1,6 +1,8 @@
 from django import forms
+from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from i18nfield.forms import I18nFormField, I18nTextarea
 
 from pretix.base.forms import I18nModelForm, SettingsForm
 from pretix.base.models import Organizer, Team
@@ -103,6 +105,20 @@ class TeamForm(forms.ModelForm):
 
 class OrganizerSettingsForm(SettingsForm):
 
+    locales = forms.MultipleChoiceField(
+        choices=settings.LANGUAGES,
+        label=_("Use languages"),
+        widget=forms.CheckboxSelectMultiple,
+        help_text=_('Choose all languages that your organizer homepage should be available in.')
+    )
+
+    organizer_homepage_text = I18nFormField(
+        label=_('Homepage text'),
+        required=False,
+        widget=I18nTextarea,
+        help_text=_('This will be displayed on the organizer homepage.')
+    )
+
     organizer_logo_image = ExtFileField(
         label=_('Logo image'),
         ext_whitelist=(".png", ".jpg", ".svg", ".gif", ".jpeg"),
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html
index 9e88aca6da..477fd4ab20 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html
@@ -18,7 +18,9 @@
         <fieldset>
             <legend>{% trans "Display settings" %}</legend>
             {% bootstrap_form_errors sform %}
+            {% bootstrap_field sform.locales layout="horizontal" %}
             {% bootstrap_field sform.organizer_logo_image layout="horizontal" %}
+            {% bootstrap_field sform.organizer_homepage_text layout="horizontal" %}
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py
index b1fe7f8d0a..8f5b2bd89e 100644
--- a/src/pretix/presale/context.py
+++ b/src/pretix/presale/context.py
@@ -56,6 +56,7 @@ def contextprocessor(request):
 
     if hasattr(request, 'organizer'):
         ctx['organizer_logo'] = request.organizer.settings.get('organizer_logo_image', as_type=str, default='')[7:]
+        ctx['organizer_homepage_text'] = request.organizer.settings.get('organizer_homepage_text', as_type=LazyI18nString)
         ctx['organizer'] = request.organizer
 
     ctx['html_head'] = "".join(_html_head)
diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html
index 49f061a07e..7ad5bb4405 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/index.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html
@@ -1,8 +1,14 @@
 {% extends "pretixpresale/organizers/base.html" %}
 {% load i18n %}
+{% load rich_text %}
 {% load eventurl %}
 {% block title %}{% trans "Event list" %}{% endblock %}
 {% block content %}
+    <div>
+	{% if organizer_homepage_text %}
+                {{ organizer_homepage_text | rich_text }}
+	{% endif %}
+    </div>	
     {% if "old" in request.GET %}
         <h3>Past events</h3>
         <p>