From d7d36114b8d71839f000d38c790c8f5a889b589b Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Sat, 12 Dec 2020 15:47:15 +0100
Subject: [PATCH 1/2] Move static legal information to editable settings #42

---
 babel.cfg                                     |    4 +-
 doc/development.md                            |    6 +-
 migrations/versions/31b60d93351d_.py          |   43 +
 project/forms/admin.py                        |   13 +
 project/models.py                             |   12 +
 project/services/admin.py                     |   11 +
 project/templates/admin/admin.html            |    4 +
 project/templates/admin/settings.html         |   21 +
 project/templates/impressum.html              |   19 -
 project/templates/layout.html                 |   12 +-
 .../{datenschutz.html => legal.html}          |   11 +-
 .../translations/de/LC_MESSAGES/messages.mo   |  Bin 18727 -> 18886 bytes
 .../translations/de/LC_MESSAGES/messages.po   | 1053 +++++++++--------
 project/views/admin.py                        |   34 +-
 project/views/root.py                         |   37 +-
 tests/views/test_admin.py                     |   40 +
 tests/views/test_root.py                      |   54 +-
 17 files changed, 826 insertions(+), 548 deletions(-)
 create mode 100644 migrations/versions/31b60d93351d_.py
 create mode 100644 project/forms/admin.py
 create mode 100644 project/services/admin.py
 create mode 100644 project/templates/admin/settings.html
 delete mode 100644 project/templates/impressum.html
 rename project/templates/{datenschutz.html => legal.html} (55%)

diff --git a/babel.cfg b/babel.cfg
index cc3e2c9..c088b4c 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,4 +1,4 @@
 [ignore: env/**]
-[python: app/**.py]
-[jinja2: app/templates/**.html]
+[python: project/**.py]
+[jinja2: project/templates/**.html]
 extensions=jinja2.ext.autoescape,jinja2.ext.with_
\ No newline at end of file
diff --git a/doc/development.md b/doc/development.md
index 648f626..4390a6b 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -42,17 +42,17 @@ flask db upgrade
 ### Init
 
 ```sh
-pybabel extract -F babel.cfg -o messages.pot . && pybabel extract -F babel.cfg -k lazy_gettext -o messages.pot . && pybabel init -i messages.pot -d app/translations -l de
+pybabel extract -F babel.cfg -o messages.pot . && pybabel extract -F babel.cfg -k lazy_gettext -o messages.pot . && pybabel init -i messages.pot -d project/translations -l de
 ```
 
 ### Extract new msgid's and merge into *.po files
 
 ```sh
-pybabel extract -F babel.cfg -o messages.pot . && pybabel extract -F babel.cfg -k lazy_gettext -o messages.pot . && pybabel update -i messages.pot -d app/translations
+pybabel extract -F babel.cfg -o messages.pot . && pybabel extract -F babel.cfg -k lazy_gettext -o messages.pot . && pybabel update -i messages.pot -d project/translations
 ```
 
 #### Compile after translation is done
 
 ```sh
-pybabel compile -d app/translations
+pybabel compile -d project/translations
 ```
diff --git a/migrations/versions/31b60d93351d_.py b/migrations/versions/31b60d93351d_.py
new file mode 100644
index 0000000..10f7754
--- /dev/null
+++ b/migrations/versions/31b60d93351d_.py
@@ -0,0 +1,43 @@
+"""empty message
+
+Revision ID: 31b60d93351d
+Revises: 3c5b34fd1156
+Create Date: 2020-12-12 13:48:34.244288
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+from project import dbtypes
+
+
+# revision identifiers, used by Alembic.
+revision = "31b60d93351d"
+down_revision = "3c5b34fd1156"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "settings",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("tos", sa.UnicodeText(), nullable=True),
+        sa.Column("legal_notice", sa.UnicodeText(), nullable=True),
+        sa.Column("contact", sa.UnicodeText(), nullable=True),
+        sa.Column("privacy", sa.UnicodeText(), nullable=True),
+        sa.Column("created_by_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["created_by_id"],
+            ["user.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    op.drop_table("settings")
+    # ### end Alembic commands ###
diff --git a/project/forms/admin.py b/project/forms/admin.py
new file mode 100644
index 0000000..1bf9a63
--- /dev/null
+++ b/project/forms/admin.py
@@ -0,0 +1,13 @@
+from flask_wtf import FlaskForm
+from flask_babelex import lazy_gettext
+from wtforms import TextAreaField, SubmitField
+from wtforms.validators import Optional
+
+
+class AdminSettingsForm(FlaskForm):
+    tos = TextAreaField(lazy_gettext("Terms of service"), validators=[Optional()])
+    legal_notice = TextAreaField(lazy_gettext("Legal notice"), validators=[Optional()])
+    contact = TextAreaField(lazy_gettext("Contact"), validators=[Optional()])
+    privacy = TextAreaField(lazy_gettext("Privacy"), validators=[Optional()])
+
+    submit = SubmitField(lazy_gettext("Save"))
diff --git a/project/models.py b/project/models.py
index ca52846..2d2e99b 100644
--- a/project/models.py
+++ b/project/models.py
@@ -40,6 +40,18 @@ class TrackableMixin(object):
         return relationship("User")
 
 
+# Global
+
+
+class Settings(db.Model, TrackableMixin):
+    __tablename__ = "settings"
+    id = Column(Integer(), primary_key=True)
+    tos = Column(UnicodeText())
+    legal_notice = Column(UnicodeText())
+    contact = Column(UnicodeText())
+    privacy = Column(UnicodeText())
+
+
 # Multi purpose
 
 
diff --git a/project/services/admin.py b/project/services/admin.py
new file mode 100644
index 0000000..717cf5b
--- /dev/null
+++ b/project/services/admin.py
@@ -0,0 +1,11 @@
+from project import db
+from project.models import Settings
+
+
+def upsert_settings():
+    result = Settings.query.first()
+    if result is None:
+        result = Settings()
+        db.session.add(result)
+
+    return result
diff --git a/project/templates/admin/admin.html b/project/templates/admin/admin.html
index 2dc9663..409f0aa 100644
--- a/project/templates/admin/admin.html
+++ b/project/templates/admin/admin.html
@@ -11,6 +11,10 @@
 </nav>
 
 <div class="list-group">
+    <a href="{{ url_for('admin_settings') }}" class="list-group-item">
+        {{ _('Settings') }}
+        <i class="fa fa-caret-right"></i>
+    </a>
     <a href="{{ url_for('admin_admin_units') }}" class="list-group-item">
         {{ _('Admin Units') }}
         <i class="fa fa-caret-right"></i>
diff --git a/project/templates/admin/settings.html b/project/templates/admin/settings.html
new file mode 100644
index 0000000..326380f
--- /dev/null
+++ b/project/templates/admin/settings.html
@@ -0,0 +1,21 @@
+{% extends "layout.html" %}
+{% from "_macros.html" import render_field, render_field_with_errors %}
+{% block title %}
+{{ _('Settings') }}
+{% endblock %}
+{% block content %}
+
+<h1>{{ _('Settings') }}</h1>
+
+<form action="" method="POST">
+    {{ form.hidden_tag() }}
+
+    {{ render_field_with_errors(form.tos) }}
+    {{ render_field_with_errors(form.legal_notice) }}
+    {{ render_field_with_errors(form.contact) }}
+    {{ render_field_with_errors(form.privacy) }}
+
+    {{ render_field(form.submit) }}
+</form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/project/templates/impressum.html b/project/templates/impressum.html
deleted file mode 100644
index 2f4b03b..0000000
--- a/project/templates/impressum.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}
-Impressum &amp; Kontakt
-{% endblock %}
-{% block content %}
-
-    <div class="p-3">
-        <p class="h3">Impressum &amp; Kontakt Entwickler</p>
-        <p>
-            Daniel Grams<br />
-            Schreiberstrasse 2<br />
-            38640 Goslar<br />
-            <a href="mailto:moin@danielgrams.de">moin@danielgrams.de</a><br />
-            <a href="https://www.danielgrams.de">https://www.danielgrams.de</a><br />
-            Link zum Datenschutz: <a href="{{ url_for('datenschutz') }}">Datenschutz</a>
-        </p>
-    </div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/project/templates/layout.html b/project/templates/layout.html
index 54be96e..d1d5c2b 100644
--- a/project/templates/layout.html
+++ b/project/templates/layout.html
@@ -62,7 +62,7 @@
     }
     </script>
 
-    <title>{% block title %}{{ title|default }}{% endblock title %}</title>
+    <title>{% block title %}{{ title|default('oveda') }}{% endblock title %}</title>
 
     {% block header %}
     {% endblock %}
@@ -136,15 +136,19 @@
                 <div class="col h-100 text-center my-auto">
                   <ul class="list-inline mb-2">
                     <li class="list-inline-item">
-                      <a href="{{ url_for('impressum') }}" class="text-muted">Impressum</a>
+                      <a href="{{ url_for('tos') }}" class="text-muted">{{ _('Terms of service') }}</a>
                     </li>
                     <li class="list-inline-item">&sdot;</li>
                     <li class="list-inline-item">
-                      <a href="{{ url_for('impressum') }}" class="text-muted">Kontakt</a>
+                      <a href="{{ url_for('legal_notice') }}" class="text-muted">{{ _('Legal notice') }}</a>
                     </li>
                     <li class="list-inline-item">&sdot;</li>
                     <li class="list-inline-item">
-                      <a href="{{ url_for('datenschutz') }}" class="text-muted">Datenschutz</a>
+                      <a href="{{ url_for('contact') }}" class="text-muted">{{ _('Contact') }}</a>
+                    </li>
+                    <li class="list-inline-item">&sdot;</li>
+                    <li class="list-inline-item">
+                      <a href="{{ url_for('privacy') }}" class="text-muted">{{ _('Privacy') }}</a>
                     </li>
                   </ul>
                   <p class="text-muted small mb-4 mb-lg-0">Mit <i class="fa fa-heart"></i> in Goslar entwickelt.</p>
diff --git a/project/templates/datenschutz.html b/project/templates/legal.html
similarity index 55%
rename from project/templates/datenschutz.html
rename to project/templates/legal.html
index 814790d..2632565 100644
--- a/project/templates/datenschutz.html
+++ b/project/templates/legal.html
@@ -1,14 +1,7 @@
 {% extends "layout.html" %}
 {% block title %}
-Datenschutz
+{{ title }}
 {% endblock %}
 {% block content %}
-
-<div class="p-3">
-
-    <h1>Datenschutzerklärung</h1>
-
-
-</div>
-
+{{ content }}
 {% endblock %}
\ No newline at end of file
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo
index 24731ea6d2d3e2aa2c961b95315aa30e89ceafa6..56740fb1efd666bb8deb92956e73e6857830b4fc 100644
GIT binary patch
delta 5087
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

delta 4938
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
W!-4}dTSJ45vp)+Bez*3=5&r`+N9{)d

diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po
index 075c906..ac6d7aa 100644
--- a/project/translations/de/LC_MESSAGES/messages.po
+++ b/project/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-11-12 10:45+0100\n"
+"POT-Creation-Date: 2020-12-12 13:52+0100\n"
 "PO-Revision-Date: 2020-06-07 18:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -16,618 +16,654 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
-#: app/i10n.py:9
+#: project/i10n.py:12
 msgid "Event_Art"
 msgstr "Kunst"
 
-#: app/i10n.py:10
+#: project/i10n.py:13
 msgid "Event_Book"
 msgstr "Literatur"
 
-#: app/i10n.py:11
+#: project/i10n.py:14
 msgid "Event_Movie"
 msgstr "Film"
 
-#: app/i10n.py:12
+#: project/i10n.py:15
 msgid "Event_Family"
 msgstr "Familie"
 
-#: app/i10n.py:13
+#: project/i10n.py:16
 msgid "Event_Festival"
 msgstr "Festival"
 
-#: app/i10n.py:14
+#: project/i10n.py:17
 msgid "Event_Religious"
 msgstr "Religion"
 
-#: app/i10n.py:15
+#: project/i10n.py:18
 msgid "Event_Shopping"
 msgstr "Shopping"
 
-#: app/i10n.py:16
+#: project/i10n.py:19
 msgid "Event_Comedy"
 msgstr "Comedy"
 
-#: app/i10n.py:17
+#: project/i10n.py:20
 msgid "Event_Music"
 msgstr "Musik"
 
-#: app/i10n.py:18
+#: project/i10n.py:21
 msgid "Event_Dance"
 msgstr "Tanz"
 
-#: app/i10n.py:19
+#: project/i10n.py:22
 msgid "Event_Nightlife"
 msgstr "Party"
 
-#: app/i10n.py:20
+#: project/i10n.py:23
 msgid "Event_Theater"
 msgstr "Theater"
 
-#: app/i10n.py:21
+#: project/i10n.py:24
 msgid "Event_Dining"
 msgstr "Essen"
 
-#: app/i10n.py:22
+#: project/i10n.py:25
 msgid "Event_Conference"
 msgstr "Konferenz"
 
-#: app/i10n.py:23
+#: project/i10n.py:26
 msgid "Event_Meetup"
 msgstr "Networking"
 
-#: app/i10n.py:24
+#: project/i10n.py:27
 msgid "Event_Fitness"
 msgstr "Fitness"
 
-#: app/i10n.py:25
+#: project/i10n.py:28
 msgid "Event_Sports"
 msgstr "Sport"
 
-#: app/i10n.py:26
+#: project/i10n.py:29
 msgid "Event_Other"
 msgstr "Sonstiges"
 
-#: app/i10n.py:27
+#: project/i10n.py:30
 msgid "Typical Age range"
 msgstr "Typische Altersspanne"
 
-#: app/i10n.py:28
+#: project/i10n.py:31
 msgid "Administrator"
 msgstr "Administrator:in"
 
-#: app/i10n.py:29
+#: project/i10n.py:32
 msgid "Event expert"
 msgstr "Veranstaltungsexpert:in"
 
-#: app/i10n.py:30
+#: project/i10n.py:33
 msgid "EventReviewStatus.inbox"
 msgstr "Ungeprüft"
 
-#: app/i10n.py:31
+#: project/i10n.py:34
 msgid "EventReviewStatus.verified"
 msgstr "Verifiziert"
 
-#: app/i10n.py:32
+#: project/i10n.py:35
 msgid "EventReviewStatus.rejected"
 msgstr "Abgelehnt"
 
-#: app/oauth.py:41 app/oauth.py:54
+#: project/oauth.py:42 project/oauth.py:55
 msgid "Successfully signed in."
 msgstr "Erfolgreich eingeloggt."
 
-#: app/utils.py:4
+#: project/utils.py:5
 msgid "Event_"
 msgstr "Event_"
 
-#: app/utils.py:7
+#: project/utils.py:9
 msgid "."
 msgstr "."
 
-#: app/forms/admin_unit.py:13 app/forms/event.py:14 app/forms/event_place.py:13
-#: app/forms/organizer.py:12
+#: project/forms/admin.py:8 project/templates/layout.html:139
+#: project/views/root.py:24
+msgid "Terms of service"
+msgstr "Nutzungsbedingungen"
+
+#: project/forms/admin.py:9 project/templates/layout.html:143
+#: project/views/root.py:31
+msgid "Legal notice"
+msgstr "Impressum"
+
+#: project/forms/admin.py:10 project/templates/_macros.html:972
+#: project/templates/layout.html:147
+#: project/templates/widget/event_suggestion/create.html:171
+#: project/views/root.py:38
+msgid "Contact"
+msgstr "Kontakt"
+
+#: project/forms/admin.py:11 project/templates/layout.html:151
+#: project/views/root.py:45
+msgid "Privacy"
+msgstr "Datenschutz"
+
+#: project/forms/admin.py:13
+msgid "Save"
+msgstr "Speichern"
+
+#: project/forms/admin_unit.py:17 project/forms/event.py:31
+#: project/forms/event_place.py:17 project/forms/organizer.py:16
 msgid "Street"
 msgstr "Straße"
 
-#: app/forms/admin_unit.py:14 app/forms/event.py:15 app/forms/event_place.py:14
-#: app/forms/organizer.py:13
+#: project/forms/admin_unit.py:18 project/forms/event.py:32
+#: project/forms/event_place.py:18 project/forms/organizer.py:17
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: app/forms/admin_unit.py:15 app/forms/event.py:16 app/forms/event_place.py:15
-#: app/forms/organizer.py:14
+#: project/forms/admin_unit.py:19 project/forms/event.py:33
+#: project/forms/event_place.py:19 project/forms/organizer.py:18
 msgid "City"
 msgstr "Stadt/Ort"
 
-#: app/forms/admin_unit.py:16 app/forms/event_place.py:16
-#: app/forms/organizer.py:15
+#: project/forms/admin_unit.py:20 project/forms/event_place.py:20
+#: project/forms/organizer.py:19
 msgid "State"
 msgstr "Bundesland"
 
-#: app/forms/admin_unit.py:17 app/forms/event_place.py:17
-#: app/forms/organizer.py:16
+#: project/forms/admin_unit.py:22 project/forms/event_place.py:22
+#: project/forms/organizer.py:21
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: app/forms/admin_unit.py:18 app/forms/event_place.py:18
-#: app/forms/organizer.py:17
+#: project/forms/admin_unit.py:25 project/forms/event_place.py:25
+#: project/forms/organizer.py:24
 msgid "Longitude"
 msgstr "Längengrad"
 
-#: app/forms/admin_unit.py:21 app/forms/event.py:19 app/forms/event.py:39
-#: app/forms/event.py:137 app/forms/event_place.py:21
-#: app/forms/event_place.py:43 app/forms/event_suggestion.py:15
-#: app/forms/event_suggestion.py:20 app/forms/organizer.py:20
-#: app/forms/organizer.py:44 app/forms/reference.py:18
-#: app/forms/reference_request.py:14 app/templates/_macros.html:117
-#: app/templates/admin/admin_units.html:18
-#: app/templates/event_place/list.html:19 app/templates/profile.html:19
-#: app/templates/profile.html:39
+#: project/forms/admin_unit.py:30 project/forms/event.py:37
+#: project/forms/event.py:60 project/forms/event.py:231
+#: project/forms/event_place.py:30 project/forms/event_place.py:55
+#: project/forms/event_suggestion.py:23 project/forms/event_suggestion.py:46
+#: project/forms/organizer.py:29 project/forms/organizer.py:56
+#: project/forms/reference.py:27 project/forms/reference_request.py:21
+#: project/templates/_macros.html:117
+#: project/templates/admin/admin_units.html:18
+#: project/templates/event_place/list.html:19 project/templates/profile.html:19
+#: project/templates/profile.html:39
 msgid "Name"
 msgstr "Name"
 
-#: app/forms/admin_unit.py:22
+#: project/forms/admin_unit.py:32
 msgid "Short name"
 msgstr "Kurzname"
 
-#: app/forms/admin_unit.py:22
+#: project/forms/admin_unit.py:33
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 "Der Kurzname wird verwendet, um Ihre Veranstaltungen eindeutig zu "
 "identifizieren. Der Kurzname darf nur Buchstaben, Nummern und "
 "Unterstriche enthalten."
 
-#: app/forms/admin_unit.py:22
+#: project/forms/admin_unit.py:40
 msgid "Short name must contain only letters numbers or underscore"
 msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten"
 
-#: app/forms/admin_unit.py:23 app/forms/event.py:33 app/forms/event.py:40
-#: app/forms/event_place.py:22 app/forms/event_suggestion.py:18
-#: app/forms/organizer.py:21
+#: project/forms/admin_unit.py:46 project/forms/event.py:53
+#: project/forms/event.py:61 project/forms/event_place.py:31
+#: project/forms/event_suggestion.py:38 project/forms/organizer.py:30
 msgid "Link URL"
 msgstr "Link URL"
 
-#: app/forms/admin_unit.py:24 app/forms/admin_unit_member.py:12
-#: app/forms/admin_unit_member.py:22 app/forms/admin_unit_member.py:26
-#: app/forms/event.py:34 app/forms/event_suggestion.py:22
-#: app/forms/organizer.py:22 app/templates/_macros.html:229
+#: project/forms/admin_unit.py:47 project/forms/admin_unit_member.py:10
+#: project/forms/admin_unit_member.py:22 project/forms/admin_unit_member.py:27
+#: project/forms/event.py:54 project/forms/event_suggestion.py:58
+#: project/forms/organizer.py:31 project/templates/_macros.html:229
 msgid "Email"
 msgstr "Email"
 
-#: app/forms/admin_unit.py:25 app/forms/event.py:35
-#: app/forms/event_suggestion.py:21 app/forms/organizer.py:23
-#: app/templates/_macros.html:256
+#: project/forms/admin_unit.py:48 project/forms/event.py:55
+#: project/forms/event_suggestion.py:51 project/forms/organizer.py:32
+#: project/templates/_macros.html:256
 msgid "Phone"
 msgstr "Telefon"
 
-#: app/forms/admin_unit.py:26 app/forms/event.py:36 app/forms/organizer.py:24
-#: app/templates/_macros.html:264
+#: project/forms/admin_unit.py:49 project/forms/event.py:56
+#: project/forms/organizer.py:33 project/templates/_macros.html:264
 msgid "Fax"
 msgstr "Fax"
 
-#: app/forms/admin_unit.py:27 app/forms/organizer.py:25
+#: project/forms/admin_unit.py:50 project/forms/organizer.py:34
 msgid "Logo"
 msgstr "Logo"
 
-#: app/forms/admin_unit.py:39 app/templates/admin_unit/create.html:10
-#: app/templates/manage/admin_units.html:18
+#: project/forms/admin_unit.py:63 project/templates/admin_unit/create.html:10
+#: project/templates/manage/admin_units.html:18
 msgid "Create admin unit"
 msgstr "Verwaltungseinheit erstellen"
 
-#: app/forms/admin_unit.py:42 app/forms/admin_unit.py:49
+#: project/forms/admin_unit.py:67 project/forms/admin_unit.py:90
 msgid "Update settings"
 msgstr "Einstellungen speichern"
 
-#: app/forms/admin_unit.py:45
+#: project/forms/admin_unit.py:71
 msgid "Font"
 msgstr "Schriftart"
 
-#: app/forms/admin_unit.py:46
+#: project/forms/admin_unit.py:73
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: app/forms/admin_unit.py:47
+#: project/forms/admin_unit.py:79
 msgid "Primary Color"
 msgstr "Hauptfarbe"
 
-#: app/forms/admin_unit.py:48
+#: project/forms/admin_unit.py:85
 msgid "Link Color"
 msgstr "Linkfarbe"
 
-#: app/forms/admin_unit_member.py:13 app/forms/admin_unit_member.py:29
-#: app/templates/profile.html:40
+#: project/forms/admin_unit_member.py:11 project/forms/admin_unit_member.py:31
+#: project/templates/profile.html:40
 msgid "Roles"
 msgstr "Rollen"
 
-#: app/forms/admin_unit_member.py:14
+#: project/forms/admin_unit_member.py:12
 msgid "Invite"
 msgstr "Einladen"
 
-#: app/forms/admin_unit_member.py:17
+#: project/forms/admin_unit_member.py:16
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: app/forms/admin_unit_member.py:18
+#: project/forms/admin_unit_member.py:17
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: app/forms/admin_unit_member.py:21
-#: app/templates/manage/delete_invitation.html:6
+#: project/forms/admin_unit_member.py:21
+#: project/templates/manage/delete_invitation.html:6
 msgid "Delete invitation"
 msgstr "Einladung löschen"
 
-#: app/forms/admin_unit_member.py:25 app/templates/manage/delete_member.html:6
+#: project/forms/admin_unit_member.py:26
+#: project/templates/manage/delete_member.html:6
 msgid "Delete member"
 msgstr "Mitglied löschen"
 
-#: app/forms/admin_unit_member.py:30
-#: app/templates/admin_unit/update_member.html:6
+#: project/forms/admin_unit_member.py:32
+#: project/templates/admin_unit/update_member.html:6
 msgid "Update member"
 msgstr "Mitglied aktualisieren"
 
-#: app/forms/common.py:10
+#: project/forms/common.py:12
 msgid "Copyright text"
 msgstr "Copyright Text"
 
-#: app/forms/common.py:13
+#: project/forms/common.py:18
 msgid "File"
 msgstr "Datei"
 
-#: app/forms/common.py:13
+#: project/forms/common.py:19
 msgid "Images only!"
 msgstr "Nur Bilder!"
 
-#: app/forms/common.py:14
+#: project/forms/common.py:22
 msgid "Delete image"
 msgstr "Bild löschen"
 
-#: app/forms/common.py:53
+#: project/forms/common.py:66
 msgid "0 (Little relevant)"
 msgstr "0 (Wenig relevant)"
 
-#: app/forms/common.py:63
+#: project/forms/common.py:76
 msgid "10 (Highlight)"
 msgstr "10 (Highlight)"
 
-#: app/forms/common.py:67
+#: project/forms/common.py:80
 msgid "Monday"
 msgstr "Montag"
 
-#: app/forms/common.py:68
+#: project/forms/common.py:81
 msgid "Tueday"
 msgstr "Dienstag"
 
-#: app/forms/common.py:69
+#: project/forms/common.py:82
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: app/forms/common.py:70
+#: project/forms/common.py:83
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: app/forms/common.py:71
+#: project/forms/common.py:84
 msgid "Friday"
 msgstr "Freitag"
 
-#: app/forms/common.py:72
+#: project/forms/common.py:85
 msgid "Saturday"
 msgstr "Samstag"
 
-#: app/forms/common.py:73
+#: project/forms/common.py:86
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: app/forms/common.py:77
+#: project/forms/common.py:90
 msgid "500 m"
 msgstr "500 m"
 
-#: app/forms/common.py:78
+#: project/forms/common.py:91
 msgid "5 km"
 msgstr "5 km"
 
-#: app/forms/common.py:79
+#: project/forms/common.py:92
 msgid "10 km"
 msgstr "10 km"
 
-#: app/forms/common.py:80
+#: project/forms/common.py:93
 msgid "20 km"
 msgstr "20 km"
 
-#: app/forms/common.py:81
+#: project/forms/common.py:94
 msgid "50 km"
 msgstr "50 km"
 
-#: app/forms/common.py:82
+#: project/forms/common.py:95
 msgid "100 km"
 msgstr "100 km"
 
-#: app/forms/event.py:32
+#: project/forms/event.py:52
 msgid "Organizator"
 msgstr "Veranstalter"
 
-#: app/forms/event.py:41
+#: project/forms/event.py:62
 msgid "Ticket Link URL"
 msgstr "Ticket Link"
 
-#: app/forms/event.py:42 app/forms/event_place.py:24
-#: app/forms/event_suggestion.py:17
+#: project/forms/event.py:64 project/forms/event_place.py:33
+#: project/forms/event_suggestion.py:33
 msgid "Description"
 msgstr "Beschreibung"
 
-#: app/forms/event.py:43
+#: project/forms/event.py:67
 msgid "Recurrence rule"
 msgstr "Wiederholungsregel"
 
-#: app/forms/event.py:44 app/forms/event_suggestion.py:16
+#: project/forms/event.py:69 project/forms/event_suggestion.py:28
 msgid "Start"
 msgstr "Beginn"
 
-#: app/forms/event.py:45
+#: project/forms/event.py:70
 msgid "End"
 msgstr "Ende"
 
-#: app/forms/event.py:46 app/templates/_macros.html:336
+#: project/forms/event.py:72 project/templates/_macros.html:336
 msgid "Previous start date"
 msgstr "Vorheriges Startdatum"
 
-#: app/forms/event.py:47 app/templates/_macros.html:211
+#: project/forms/event.py:74 project/templates/_macros.html:211
 msgid "Tags"
 msgstr "Stichworte"
 
-#: app/forms/event.py:48
+#: project/forms/event.py:76
 msgid "Categories"
 msgstr "Kategorien"
 
-#: app/forms/event.py:50
+#: project/forms/event.py:79
 msgid "Kid friendly"
 msgstr "Für Kinder geeignet"
 
-#: app/forms/event.py:51
+#: project/forms/event.py:81
 msgid "Accessible for free"
 msgstr "Kostenlos zugänglich"
 
-#: app/forms/event.py:52
+#: project/forms/event.py:83
 msgid "Typical Age from"
 msgstr "Typisches Alter von"
 
-#: app/forms/event.py:53
+#: project/forms/event.py:84
 msgid "Typical Age to"
 msgstr "Typisches Alter bis"
 
-#: app/forms/event.py:54
+#: project/forms/event.py:86
 msgid "Registration required"
 msgstr "Anmeldung erforderlich"
 
-#: app/forms/event.py:55
+#: project/forms/event.py:88
 msgid "Booked up"
 msgstr "Ausgebucht"
 
-#: app/forms/event.py:56
+#: project/forms/event.py:90
 msgid "Expected number of participants"
 msgstr "Erwartete Teilnehmerzahl"
 
-#: app/forms/event.py:57
+#: project/forms/event.py:92
 msgid "Price info"
 msgstr "Preisinformation"
 
-#: app/forms/event.py:59
+#: project/forms/event.py:95
 msgid "Target group origin"
 msgstr "Für Touristen/Einwohner geeignet"
 
-#: app/forms/event.py:60
+#: project/forms/event.py:100
 msgid "EventTargetGroupOrigin.both"
 msgstr "Für Touristen und Einwohner"
 
-#: app/forms/event.py:61
+#: project/forms/event.py:104
 msgid "EventTargetGroupOrigin.tourist"
 msgstr "Hauptsächlich für Touristen"
 
-#: app/forms/event.py:62
+#: project/forms/event.py:108
 msgid "EventTargetGroupOrigin.resident"
 msgstr "Hauptsächlich für Einwohner"
 
-#: app/forms/event.py:64
+#: project/forms/event.py:114
 msgid "Attendance mode"
 msgstr "Teilnahme"
 
-#: app/forms/event.py:65
+#: project/forms/event.py:119
 msgid "EventAttendanceMode.offline"
 msgstr "Offline"
 
-#: app/forms/event.py:66
+#: project/forms/event.py:123
 msgid "EventAttendanceMode.online"
 msgstr "Online"
 
-#: app/forms/event.py:67
+#: project/forms/event.py:125
 msgid "EventAttendanceMode.mixed"
 msgstr "Online und offline"
 
-#: app/forms/event.py:69 app/forms/event_place.py:23
-#: app/forms/event_suggestion.py:27
-#: app/templates/widget/event_suggestion/create.html:216
+#: project/forms/event.py:129 project/forms/event_place.py:32
+#: project/forms/event_suggestion.py:85
+#: project/templates/widget/event_suggestion/create.html:216
 msgid "Photo"
 msgstr "Foto"
 
-#: app/forms/event.py:70 app/forms/reference.py:9 app/forms/reference.py:13
-#: app/forms/reference_request.py:29 app/templates/event/create.html:164
-#: app/templates/event/update.html:98
+#: project/forms/event.py:131 project/forms/reference.py:13
+#: project/forms/reference.py:20 project/forms/reference_request.py:69
+#: project/templates/event/create.html:164
+#: project/templates/event/update.html:98
 msgid "Rating"
 msgstr "Bewertung"
 
-#: app/forms/event.py:73 app/forms/event.py:74 app/forms/event.py:117
-#: app/forms/event_suggestion.py:25 app/templates/_macros.html:371
-#: app/templates/event/create.html:106 app/templates/event/update.html:57
-#: app/templates/event_place/create.html:20
-#: app/templates/event_place/delete.html:13
-#: app/templates/event_place/update.html:20
+#: project/forms/event.py:137 project/forms/event.py:146
+#: project/forms/event.py:202 project/forms/event_suggestion.py:70
+#: project/templates/_macros.html:371 project/templates/event/create.html:106
+#: project/templates/event/update.html:57
+#: project/templates/event_place/create.html:20
+#: project/templates/event_place/delete.html:13
+#: project/templates/event_place/update.html:20
 msgid "Place"
 msgstr "Ort"
 
-#: app/forms/event.py:73
+#: project/forms/event.py:139
 msgid "Select existing place"
 msgstr "Vorhandenen Ort auswählen"
 
-#: app/forms/event.py:73
+#: project/forms/event.py:140
 msgid "Enter new place"
 msgstr "Neuen Ort eingeben"
 
-#: app/forms/event.py:77 app/forms/event.py:78 app/forms/event.py:118
-#: app/forms/event.py:146 app/forms/event_suggestion.py:26
-#: app/templates/_macros.html:401 app/templates/event/create.html:81
-#: app/templates/event/update.html:48 app/templates/organizer/create.html:16
-#: app/templates/organizer/delete.html:13
-#: app/templates/organizer/update.html:16
+#: project/forms/event.py:151 project/forms/event.py:160
+#: project/forms/event.py:205 project/forms/event.py:245
+#: project/forms/event_suggestion.py:77 project/templates/_macros.html:401
+#: project/templates/event/create.html:81
+#: project/templates/event/update.html:48
+#: project/templates/organizer/create.html:16
+#: project/templates/organizer/delete.html:13
+#: project/templates/organizer/update.html:16
 msgid "Organizer"
 msgstr "Veranstalter"
 
-#: app/forms/event.py:77
+#: project/forms/event.py:153
 msgid "Select existing organizer"
 msgstr "Vorhandenen Veranstalter auswählem"
 
-#: app/forms/event.py:77
+#: project/forms/event.py:154
 msgid "Enter new organizer"
 msgstr "Neuen Veranstalter eingeben"
 
-#: app/forms/event.py:81 app/templates/event/create.html:52
-#: app/templates/manage/events.html:12 app/templates/manage/organizers.html:21
+#: project/forms/event.py:164 project/templates/event/create.html:52
+#: project/templates/manage/events.html:12
+#: project/templates/manage/organizers.html:21
 msgid "Create event"
 msgstr "Veranstaltung erstellen"
 
-#: app/forms/event.py:105
+#: project/forms/event.py:188
 msgid "Select existing place or enter new place"
 msgstr "Existierenden Ort wählen oder neuen Ort eingeben"
 
-#: app/forms/event.py:110
+#: project/forms/event.py:193
 msgid "Select existing organizer or enter new organizer"
 msgstr "Wähle einen vorhandenen Veranstalter oder gib einen neuen Veranstalter ein"
 
-#: app/forms/event.py:120 app/templates/event/update.html:38
+#: project/forms/event.py:209 project/templates/event/update.html:38
 msgid "Status"
 msgstr "Status"
 
-#: app/forms/event.py:121
+#: project/forms/event.py:212
 msgid "EventStatus.scheduled"
 msgstr "Geplant"
 
-#: app/forms/event.py:122 app/templates/layout.html:48
+#: project/forms/event.py:213 project/templates/layout.html:48
 msgid "EventStatus.cancelled"
 msgstr "Abgesagt"
 
-#: app/forms/event.py:123 app/templates/layout.html:51
+#: project/forms/event.py:214 project/templates/layout.html:51
 msgid "EventStatus.movedOnline"
 msgstr "Online verschoben"
 
-#: app/forms/event.py:124 app/templates/layout.html:54
+#: project/forms/event.py:215 project/templates/layout.html:54
 msgid "EventStatus.postponed"
 msgstr "Verschoben"
 
-#: app/forms/event.py:125 app/templates/layout.html:57
+#: project/forms/event.py:216 project/templates/layout.html:57
 msgid "EventStatus.rescheduled"
 msgstr "Neu angesetzt"
 
-#: app/forms/event.py:127 app/templates/event/update.html:9
+#: project/forms/event.py:220 project/templates/event/update.html:9
 msgid "Update event"
 msgstr "Veranstaltung aktualisieren"
 
-#: app/forms/event.py:136 app/templates/_macros.html:918
-#: app/templates/event/delete.html:6
+#: project/forms/event.py:230 project/templates/_macros.html:918
+#: project/templates/event/delete.html:6
 msgid "Delete event"
 msgstr "Veranstaltung löschen"
 
-#: app/forms/event.py:142 app/forms/event_date.py:17 app/forms/planing.py:17
+#: project/forms/event.py:238 project/forms/event_date.py:19
+#: project/forms/planing.py:13
 msgid "From"
 msgstr "Von"
 
-#: app/forms/event.py:143 app/forms/event_date.py:18 app/forms/planing.py:18
+#: project/forms/event.py:239 project/forms/event_date.py:20
+#: project/forms/planing.py:14
 msgid "to"
 msgstr "bis"
 
-#: app/forms/event.py:144 app/forms/event_date.py:19
+#: project/forms/event.py:240 project/forms/event_date.py:21
 msgid "Keyword"
 msgstr "Stichwort"
 
-#: app/forms/event.py:145 app/forms/event_date.py:20 app/forms/planing.py:19
-#: app/templates/_macros.html:354
+#: project/forms/event.py:242 project/forms/event_date.py:23
+#: project/forms/planing.py:16 project/templates/_macros.html:354
 msgid "Category"
 msgstr "Kategorie"
 
-#: app/forms/event.py:148
+#: project/forms/event.py:248
 msgid "Find events"
 msgstr "Veranstaltungen finden"
 
-#: app/forms/event_date.py:22 app/forms/planing.py:21
-#: app/templates/_macros.html:119 app/templates/_macros.html:271
-#: app/templates/admin_unit/create.html:26
-#: app/templates/admin_unit/update.html:27
-#: app/templates/event_place/create.html:29
-#: app/templates/event_place/update.html:29
-#: app/templates/organizer/create.html:25
-#: app/templates/organizer/update.html:25
+#: project/forms/event_date.py:26 project/forms/planing.py:19
+#: project/templates/_macros.html:119 project/templates/_macros.html:271
+#: project/templates/admin_unit/create.html:26
+#: project/templates/admin_unit/update.html:27
+#: project/templates/event_place/create.html:29
+#: project/templates/event_place/update.html:29
+#: project/templates/organizer/create.html:25
+#: project/templates/organizer/update.html:25
 msgid "Location"
 msgstr "Standort"
 
-#: app/forms/event_date.py:23 app/forms/planing.py:22
+#: project/forms/event_date.py:28 project/forms/planing.py:21
 msgid "Distance"
 msgstr "Distanz"
 
-#: app/forms/event_date.py:25 app/forms/planing.py:25
-#: app/templates/widget/event_date/list.html:47
+#: project/forms/event_date.py:34 project/forms/planing.py:33
+#: project/templates/widget/event_date/list.html:47
 msgid "Find"
 msgstr "Finden"
 
-#: app/forms/event_place.py:36 app/templates/event_place/create.html:10
-#: app/templates/event_place/list.html:11 app/templates/manage/places.html:18
+#: project/forms/event_place.py:46 project/templates/event_place/create.html:10
+#: project/templates/event_place/list.html:11
+#: project/templates/manage/places.html:18
 msgid "Create place"
 msgstr "Ort hinzufügen"
 
-#: app/forms/event_place.py:39 app/templates/event_place/read.html:12
-#: app/templates/event_place/update.html:10
+#: project/forms/event_place.py:50 project/templates/event_place/read.html:12
+#: project/templates/event_place/update.html:10
 msgid "Update place"
 msgstr "Ort aktualisieren"
 
-#: app/forms/event_place.py:42 app/templates/event_place/delete.html:6
+#: project/forms/event_place.py:54 project/templates/event_place/delete.html:6
 msgid "Delete place"
 msgstr "Ort löschen"
 
-#: app/forms/event_place.py:48
+#: project/forms/event_place.py:62
 msgid "Find places"
 msgstr "Orte finden"
 
-#: app/forms/event_suggestion.py:15
+#: project/forms/event_suggestion.py:25
 msgid "Enter a short, meaningful name for the event."
 msgstr "Gib einen kurzen, aussagekräftigen Namen für die Veranstaltung ein."
 
-#: app/forms/event_suggestion.py:16
+#: project/forms/event_suggestion.py:30
 msgid "Indicate when the event will take place."
 msgstr "Gib an, wann die Veranstaltung stattfindet."
 
-#: app/forms/event_suggestion.py:17
+#: project/forms/event_suggestion.py:35
 msgid "Add an optional description of the event."
 msgstr "Füge der Veranstaltung eine optionale Beschreibung hinzu."
 
-#: app/forms/event_suggestion.py:18
+#: project/forms/event_suggestion.py:40
 msgid "Add an optional link. That can make the review easier."
 msgstr "Füge einen optionalen Link hinzu. Das kann die Prüfung erleichtern."
 
-#: app/forms/event_suggestion.py:20
+#: project/forms/event_suggestion.py:48
 msgid "Please enter your name for the review."
 msgstr "Bitte gib deinen Namen für die Prüfung an."
 
-#: app/forms/event_suggestion.py:21
+#: project/forms/event_suggestion.py:53
 msgid "Please enter your phone number or email address for the review."
 msgstr "Bitte gib deine Telefonnummer oder deine Email-Adresse für die Prüfung an."
 
-#: app/forms/event_suggestion.py:22
+#: project/forms/event_suggestion.py:60
 msgid "Please enter your email address or phone number for the review."
 msgstr "Bitte gib deine Email-Adresse oder deine Telefonnummer für die Prüfung an."
 
-#: app/forms/event_suggestion.py:23
+#: project/forms/event_suggestion.py:65
 msgid "I would like to be notified by email after the review"
 msgstr "Ich möchte per Email benachrichtigt werden nach der Prüfung"
 
-#: app/forms/event_suggestion.py:25
+#: project/forms/event_suggestion.py:72
 msgid ""
 "Choose where the event takes place. If the venue is not yet in the list, "
 "just enter it."
@@ -635,7 +671,7 @@ msgstr ""
 "Wähle aus, wo die Veranstaltung stattfindet. Ist der Veranstaltungsort "
 "noch nicht in der Liste, trage ihn einfach ein."
 
-#: app/forms/event_suggestion.py:26
+#: project/forms/event_suggestion.py:79
 msgid ""
 "Select the organizer. If the organizer is not yet on the list, just enter"
 " it."
@@ -643,7 +679,7 @@ msgstr ""
 "Wähle den Veranstalter aus. Ist der Veranstalter noch nicht in der Liste,"
 " trage ihn einfach ein."
 
-#: app/forms/event_suggestion.py:27
+#: project/forms/event_suggestion.py:87
 msgid ""
 "We recommend uploading a photo for the event. It looks a lot more, but of"
 " course it works without it."
@@ -651,7 +687,7 @@ msgstr ""
 "Wir empfehlen dir, ein Foto für die Veranstaltung hochzuladen. Es macht "
 "schon deutlich mehr her, aber es geht natürlich auch ohne."
 
-#: app/forms/event_suggestion.py:28
+#: project/forms/event_suggestion.py:92
 msgid ""
 "I confirm that I have clarified all information (text, images, etc.) that"
 " I upload into the system with regard to their rights of use and declare "
@@ -661,707 +697,730 @@ msgstr ""
 "das System hochlade, hinsichtlich ihrer Nutzungsrechte abgeklärt habe und"
 " erkläre, dass diese weitergegeben werden dürfen."
 
-#: app/forms/event_suggestion.py:30 app/templates/example.html:10
-#: app/templates/widget/event_suggestion/create.html:4
-#: app/templates/widget/event_suggestion/create.html:124
+#: project/forms/event_suggestion.py:98 project/templates/example.html:10
+#: project/templates/widget/event_suggestion/create.html:4
+#: project/templates/widget/event_suggestion/create.html:124
 msgid "Create event suggestion"
 msgstr "Veranstaltung vorschlagen"
 
-#: app/forms/event_suggestion.py:46 app/forms/reference_request.py:22
+#: project/forms/event_suggestion.py:116 project/forms/reference_request.py:45
 msgid "Rejection reason"
 msgstr "Ablehnungsgrund"
 
-#: app/forms/event_suggestion.py:48
+#: project/forms/event_suggestion.py:122
 msgid "EventRejectionReason.duplicate"
 msgstr "Duplikat"
 
-#: app/forms/event_suggestion.py:49
+#: project/forms/event_suggestion.py:126
 msgid "EventRejectionReason.untrustworthy"
 msgstr "Unseriös"
 
-#: app/forms/event_suggestion.py:50
+#: project/forms/event_suggestion.py:130
 msgid "EventRejectionReason.illegal"
 msgstr "Unzulässig"
 
-#: app/forms/event_suggestion.py:52
-#: app/templates/event_suggestion/reject.html:9
-#: app/templates/event_suggestion/review.html:22
+#: project/forms/event_suggestion.py:135
+#: project/templates/event_suggestion/reject.html:9
+#: project/templates/event_suggestion/review.html:22
 msgid "Reject event suggestion"
 msgstr "Vorgeschlagene Veranstaltung ablehnen"
 
-#: app/forms/organizer.py:37 app/templates/manage/organizers.html:12
-#: app/templates/organizer/create.html:10
+#: project/forms/organizer.py:47 project/templates/manage/organizers.html:12
+#: project/templates/organizer/create.html:10
 msgid "Create organizer"
 msgstr "Veranstalter hinzufügen"
 
-#: app/forms/organizer.py:40 app/templates/organizer/update.html:10
+#: project/forms/organizer.py:51 project/templates/organizer/update.html:10
 msgid "Update organizer"
 msgstr "Veranstalter aktualisieren"
 
-#: app/forms/organizer.py:43 app/templates/organizer/delete.html:6
+#: project/forms/organizer.py:55 project/templates/organizer/delete.html:6
 msgid "Delete organizer"
 msgstr "Veranstalter löschen"
 
-#: app/forms/planing.py:23
+#: project/forms/planing.py:27
 msgid "Weekdays"
 msgstr "Wochentage"
 
-#: app/forms/reference.py:8 app/forms/reference_request.py:9
-#: app/templates/_macros.html:417 app/templates/admin_unit/create.html:16
-#: app/templates/admin_unit/update.html:17
+#: project/forms/reference.py:10 project/forms/reference_request.py:14
+#: project/templates/_macros.html:417
+#: project/templates/admin_unit/create.html:16
+#: project/templates/admin_unit/update.html:17
 msgid "Admin unit"
 msgstr "Verwaltungseinheit"
 
-#: app/forms/reference.py:10
+#: project/forms/reference.py:15
 msgid "Save reference"
 msgstr "Empfehlung speichern"
 
-#: app/forms/reference.py:14
+#: project/forms/reference.py:22
 msgid "Update reference"
 msgstr "Empfehlung aktualisieren"
 
-#: app/forms/reference.py:17 app/templates/reference/delete.html:6
+#: project/forms/reference.py:26 project/templates/reference/delete.html:6
 msgid "Delete reference"
 msgstr "Empfehlung löschen"
 
-#: app/forms/reference_request.py:10
+#: project/forms/reference_request.py:16
 msgid "Save request"
 msgstr "Anfrage speichern"
 
-#: app/forms/reference_request.py:13
+#: project/forms/reference_request.py:20
 msgid "Delete request"
 msgstr "Anfrage löschen"
 
-#: app/forms/reference_request.py:17 app/templates/_macros.html:983
-#: app/templates/event_suggestion/review_status.html:18
-#: app/templates/reference_request/review_status.html:12
+#: project/forms/reference_request.py:26 project/templates/_macros.html:983
+#: project/templates/event_suggestion/review_status.html:18
+#: project/templates/reference_request/review_status.html:12
 msgid "Review status"
 msgstr "Prüfungsstatus"
 
-#: app/forms/reference_request.py:18
+#: project/forms/reference_request.py:31
 msgid "EventReferenceRequestReviewStatus.inbox"
 msgstr "Ungeprüft"
 
-#: app/forms/reference_request.py:19
+#: project/forms/reference_request.py:35
 msgid "EventReferenceRequestReviewStatus.verified"
 msgstr "Verifiziert"
 
-#: app/forms/reference_request.py:20
+#: project/forms/reference_request.py:39
 msgid "EventReferenceRequestReviewStatus.rejected"
 msgstr "Abgelehnt"
 
-#: app/forms/reference_request.py:24
+#: project/forms/reference_request.py:51
 msgid "EventReferenceRequestRejectionReason.duplicate"
 msgstr "Duplikat"
 
-#: app/forms/reference_request.py:25
+#: project/forms/reference_request.py:55
 msgid "EventReferenceRequestRejectionReason.untrustworthy"
 msgstr "Unseriös"
 
-#: app/forms/reference_request.py:26
+#: project/forms/reference_request.py:59
 msgid "EventReferenceRequestRejectionReason.irrelevant"
 msgstr "Nicht relevant"
 
-#: app/forms/reference_request.py:27
+#: project/forms/reference_request.py:63
 msgid "EventReferenceRequestRejectionReason.illegal"
 msgstr "Unzulässig"
 
-#: app/forms/reference_request.py:30
+#: project/forms/reference_request.py:71
 msgid "Save review"
 msgstr "Prüfung speichern"
 
-#: app/forms/widgets.py:102
+#: project/forms/widgets.py:134
 msgid "This field is required"
 msgstr "Dieses Feld ist erforderlich"
 
-#: app/templates/_macros.html:116 app/templates/_macros.html:322
-#: app/templates/_macros.html:329 app/templates/_macros.html:614
+#: project/templates/_macros.html:116 project/templates/_macros.html:322
+#: project/templates/_macros.html:329 project/templates/_macros.html:614
 msgid "Date"
 msgstr "Datum"
 
-#: app/templates/_macros.html:118
+#: project/templates/_macros.html:118
 msgid "Host"
 msgstr "Veranstalter"
 
-#: app/templates/_macros.html:140
+#: project/templates/_macros.html:140
 msgid "Show all events"
 msgstr "Alle Veranstaltungen anzeigen"
 
-#: app/templates/_macros.html:156
+#: project/templates/_macros.html:156
 msgid "Show on Google Maps"
 msgstr "Auf Google Maps anzeigen"
 
-#: app/templates/_macros.html:220
+#: project/templates/_macros.html:220
 msgid "Link"
 msgstr "Link"
 
-#: app/templates/_macros.html:315 app/templates/event/create.html:59
-#: app/templates/event/delete.html:13 app/templates/event/update.html:16
-#: app/templates/reference/delete.html:13
-#: app/templates/widget/event_suggestion/create.html:196
+#: project/templates/_macros.html:315 project/templates/event/create.html:59
+#: project/templates/event/delete.html:13
+#: project/templates/event/update.html:16
+#: project/templates/reference/delete.html:13
+#: project/templates/widget/event_suggestion/create.html:196
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: app/templates/_macros.html:325
+#: project/templates/_macros.html:325
 #, python-format
 msgid "%(count)d event dates"
 msgstr "%(count)d Termine"
 
-#: app/templates/_macros.html:391
+#: project/templates/_macros.html:391
 msgid "Show directions"
 msgstr "Anreise planen"
 
-#: app/templates/_macros.html:442
+#: project/templates/_macros.html:442
 msgid "Sign in with Google"
 msgstr "Mit Google anmelden"
 
-#: app/templates/_macros.html:502
+#: project/templates/_macros.html:502
 msgid "Search location on Google"
 msgstr "Ort bei Google suchen"
 
-#: app/templates/_macros.html:565 app/templates/_macros.html:567
-#: app/templates/event_date/list.html:270
-#: app/templates/widget/event_suggestion/create.html:160
-#: app/templates/widget/event_suggestion/create.html:185
-#: app/templates/widget/event_suggestion/create.html:205
-#: app/templates/widget/event_suggestion/create.html:228
-#: app/templates/widget/event_suggestion/create.html:246
-#: app/templates/widget/event_suggestion/create.html:267
+#: project/templates/_macros.html:565 project/templates/_macros.html:567
+#: project/templates/event_date/list.html:270
+#: project/templates/widget/event_suggestion/create.html:160
+#: project/templates/widget/event_suggestion/create.html:185
+#: project/templates/widget/event_suggestion/create.html:205
+#: project/templates/widget/event_suggestion/create.html:228
+#: project/templates/widget/event_suggestion/create.html:246
+#: project/templates/widget/event_suggestion/create.html:267
 msgid "Previous"
 msgstr "Zurück"
 
-#: app/templates/_macros.html:570 app/templates/_macros.html:572
-#: app/templates/event_date/list.html:271
-#: app/templates/widget/event_suggestion/create.html:161
-#: app/templates/widget/event_suggestion/create.html:186
-#: app/templates/widget/event_suggestion/create.html:206
-#: app/templates/widget/event_suggestion/create.html:229
-#: app/templates/widget/event_suggestion/create.html:247
+#: project/templates/_macros.html:570 project/templates/_macros.html:572
+#: project/templates/event_date/list.html:271
+#: project/templates/widget/event_suggestion/create.html:161
+#: project/templates/widget/event_suggestion/create.html:186
+#: project/templates/widget/event_suggestion/create.html:206
+#: project/templates/widget/event_suggestion/create.html:229
+#: project/templates/widget/event_suggestion/create.html:247
 msgid "Next"
 msgstr "Weiter"
 
-#: app/templates/_macros.html:637
+#: project/templates/_macros.html:637
 msgid "Radius"
 msgstr "Umkreis"
 
-#: app/templates/_macros.html:832
+#: project/templates/_macros.html:832
 msgid "Edit image"
 msgstr "Bild bearbeiten"
 
-#: app/templates/_macros.html:853
+#: project/templates/_macros.html:853
 msgid "Close"
 msgstr "Schließen"
 
-#: app/templates/_macros.html:854
+#: project/templates/_macros.html:854
 msgid "Okay"
 msgstr "OK"
 
-#: app/templates/_macros.html:863 app/templates/_macros.html:865
+#: project/templates/_macros.html:863 project/templates/_macros.html:865
 msgid "Choose image file"
 msgstr "Bild-Datei auswählen"
 
-#: app/templates/_macros.html:913
+#: project/templates/_macros.html:913
 msgid "Actions"
 msgstr "Aktionen"
 
-#: app/templates/_macros.html:917
+#: project/templates/_macros.html:917
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: app/templates/_macros.html:921
+#: project/templates/_macros.html:921
 msgid "Duplicate event"
 msgstr "Veranstaltung duplizieren"
 
-#: app/templates/_macros.html:924
-#: app/templates/manage/references_incoming.html:10
+#: project/templates/_macros.html:924
+#: project/templates/manage/references_incoming.html:10
 msgid "Reference event"
 msgstr "Veranstaltung empfehlen"
 
-#: app/templates/_macros.html:927
-#: app/templates/manage/reference_requests_outgoing.html:10
-#: app/templates/manage/references_outgoing.html:10
+#: project/templates/_macros.html:927
+#: project/templates/manage/reference_requests_outgoing.html:10
+#: project/templates/manage/references_outgoing.html:10
 msgid "Empfehlung anfragen"
 msgstr "Empfehlung anfragen"
 
-#: app/templates/_macros.html:950
+#: project/templates/_macros.html:950
 msgid "Event suggestion"
 msgstr "Veranstaltungsvorschlag"
 
-#: app/templates/_macros.html:972
-#: app/templates/widget/event_suggestion/create.html:171
-msgid "Contact"
-msgstr "Kontakt"
-
-#: app/templates/example.html:15
+#: project/templates/example.html:15
 msgid "Widget als iFrame einbetten"
 msgstr "Widget als iFrame einbetten"
 
-#: app/templates/home.html:26 app/templates/home.html:142
-#: app/templates/security/login_user.html:25 app/views/widget.py:99
+#: project/templates/home.html:26 project/templates/home.html:142
+#: project/templates/security/login_user.html:25 project/views/widget.py:143
 msgid "Register for free"
 msgstr "Kostenlos registrieren"
 
-#: app/templates/layout.html:84
+#: project/templates/layout.html:84
 msgid "Manage"
 msgstr "Verwaltung"
 
-#: app/templates/event_place/read.html:22 app/templates/layout.html:87
-#: app/templates/layout_manage.html:24 app/templates/manage/events.html:5
-#: app/templates/manage/events.html:9
+#: project/templates/event_place/read.html:22 project/templates/layout.html:87
+#: project/templates/layout_manage.html:24
+#: project/templates/manage/events.html:5
+#: project/templates/manage/events.html:9
 msgid "Events"
 msgstr "Veranstaltungen"
 
-#: app/templates/layout.html:88
+#: project/templates/layout.html:88
 msgid "Planing"
 msgstr "Planung"
 
-#: app/templates/layout.html:89
+#: project/templates/layout.html:89
 msgid "Example"
 msgstr "Beispiel"
 
-#: app/templates/developer/read.html:4 app/templates/layout.html:90
+#: project/templates/developer/read.html:4 project/templates/layout.html:90
 msgid "Developer"
 msgstr "Entwickler"
 
-#: app/templates/layout.html:99 app/templates/profile.html:4
-#: app/templates/profile.html:10
+#: project/templates/layout.html:99 project/templates/profile.html:4
+#: project/templates/profile.html:10
 msgid "Profile"
 msgstr "Profil"
 
-#: app/templates/admin/admin.html:3 app/templates/admin/admin.html:9
-#: app/templates/admin/admin_units.html:9 app/templates/layout.html:102
+#: project/templates/admin/admin.html:3 project/templates/admin/admin.html:9
+#: project/templates/admin/admin_units.html:9 project/templates/layout.html:102
 msgid "Admin"
 msgstr "Administration"
 
-#: app/templates/layout.html:106
+#: project/templates/layout.html:106
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: app/templates/layout_manage.html:25 app/templates/manage/organizers.html:5
-#: app/templates/manage/organizers.html:9
+#: project/templates/layout_manage.html:25
+#: project/templates/manage/organizers.html:5
+#: project/templates/manage/organizers.html:9
 msgid "Organizers"
 msgstr "Veranstalter"
 
-#: app/templates/event_place/list.html:3 app/templates/event_place/list.html:7
-#: app/templates/layout_manage.html:26 app/templates/manage/places.html:5
-#: app/templates/manage/places.html:9
+#: project/templates/event_place/list.html:3
+#: project/templates/event_place/list.html:7
+#: project/templates/layout_manage.html:26
+#: project/templates/manage/places.html:5
+#: project/templates/manage/places.html:9
 msgid "Places"
 msgstr "Orte"
 
-#: app/templates/layout_manage.html:27 app/templates/manage/reviews.html:5
-#: app/templates/manage/reviews.html:9
+#: project/templates/layout_manage.html:27
+#: project/templates/manage/reviews.html:5
+#: project/templates/manage/reviews.html:9
 msgid "Reviews"
 msgstr "Prüfungen"
 
-#: app/templates/layout_manage.html:30
-#: app/templates/manage/references_incoming.html:5
-#: app/templates/manage/references_outgoing.html:5
+#: project/templates/layout_manage.html:30
+#: project/templates/manage/references_incoming.html:5
+#: project/templates/manage/references_outgoing.html:5
 msgid "References"
 msgstr "Empfehlungen"
 
-#: app/templates/layout_manage.html:36
-#: app/templates/manage/references_incoming.html:9
+#: project/templates/layout_manage.html:36
+#: project/templates/manage/references_incoming.html:9
 msgid "Incoming references"
 msgstr "Eingehende Empfehlungen"
 
-#: app/templates/layout_manage.html:37
-#: app/templates/manage/references_outgoing.html:9
+#: project/templates/layout_manage.html:37
+#: project/templates/manage/references_outgoing.html:9
 msgid "Outgoing references"
 msgstr "Ausgehende Empfehlungen"
 
-#: app/templates/layout_manage.html:38
-#: app/templates/manage/reference_requests_incoming.html:9
+#: project/templates/layout_manage.html:38
+#: project/templates/manage/reference_requests_incoming.html:9
 msgid "Incoming reference requests"
 msgstr "Eingehende Empfehlungsanfragen"
 
-#: app/templates/layout_manage.html:43
-#: app/templates/manage/reference_requests_outgoing.html:9
+#: project/templates/layout_manage.html:43
+#: project/templates/manage/reference_requests_outgoing.html:9
 msgid "Outgoing reference requests"
 msgstr "Ausgehende Empfehlungsanfragen"
 
-#: app/templates/layout_manage.html:46 app/templates/manage/members.html:5
-#: app/templates/manage/members.html:28
+#: project/templates/layout_manage.html:46
+#: project/templates/manage/members.html:5
+#: project/templates/manage/members.html:28
 msgid "Members"
 msgstr "Mitglieder"
 
-#: app/templates/layout_manage.html:47 app/templates/manage/reviews.html:10
-#: app/templates/manage/widgets.html:5 app/templates/manage/widgets.html:9
+#: project/templates/layout_manage.html:47
+#: project/templates/manage/reviews.html:10
+#: project/templates/manage/widgets.html:5
+#: project/templates/manage/widgets.html:9
 msgid "Widgets"
 msgstr "Widgets"
 
-#: app/templates/admin_unit/update.html:11 app/templates/layout_manage.html:48
-#: app/templates/manage/widgets.html:12
+#: project/templates/admin/admin.html:15
+#: project/templates/admin/settings.html:4
+#: project/templates/admin/settings.html:8
+#: project/templates/admin_unit/update.html:11
+#: project/templates/layout_manage.html:48
+#: project/templates/manage/widgets.html:12
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app/templates/manage/admin_units.html:8 app/templates/manage/members.html:9
-#: app/templates/profile.html:14
+#: project/templates/manage/admin_units.html:8
+#: project/templates/manage/members.html:9 project/templates/profile.html:14
 msgid "Invitations"
 msgstr "Einladungen"
 
-#: app/templates/admin/admin.html:15 app/templates/admin/admin_units.html:3
-#: app/templates/admin/admin_units.html:10
-#: app/templates/manage/admin_units.html:3
-#: app/templates/manage/admin_units.html:16 app/templates/profile.html:34
+#: project/templates/admin/admin.html:19
+#: project/templates/admin/admin_units.html:3
+#: project/templates/admin/admin_units.html:10
+#: project/templates/manage/admin_units.html:3
+#: project/templates/manage/admin_units.html:16
+#: project/templates/profile.html:34
 msgid "Admin Units"
 msgstr "Verwaltungseinheiten"
 
-#: app/templates/admin_unit/create.html:46
-#: app/templates/admin_unit/update.html:47 app/templates/event/create.html:147
-#: app/templates/event/update.html:81 app/templates/event_place/create.html:46
-#: app/templates/event_place/update.html:46
-#: app/templates/organizer/create.html:45
-#: app/templates/organizer/update.html:45
+#: project/templates/admin_unit/create.html:46
+#: project/templates/admin_unit/update.html:47
+#: project/templates/event/create.html:147
+#: project/templates/event/update.html:81
+#: project/templates/event_place/create.html:46
+#: project/templates/event_place/update.html:46
+#: project/templates/organizer/create.html:45
+#: project/templates/organizer/update.html:45
 msgid "Additional information"
 msgstr "Zusätzliche Informationen"
 
-#: app/templates/admin_unit/invite_member.html:6
-#: app/templates/manage/members.html:12
+#: project/templates/admin_unit/invite_member.html:6
+#: project/templates/manage/members.html:12
 msgid "Invite user"
 msgstr "Nutzer:in einladen"
 
-#: app/templates/email/invitation_notice.html:4
+#: project/templates/email/invitation_notice.html:4
 #, python-format
 msgid "You have been invited to join %(admin_unit_name)s."
 msgstr "Du wurdest eingeladen, %(admin_unit_name)s beizutreten."
 
-#: app/templates/email/invitation_notice.html:5
+#: project/templates/email/invitation_notice.html:5
 msgid "Click here to view the invitation"
 msgstr "Klicke hier, um die Einladung anzunehmen."
 
-#: app/templates/email/layout.html:350
+#: project/templates/email/layout.html:350
 msgid "Hi there"
 msgstr "Moin"
 
-#: app/templates/email/layout.html:351
+#: project/templates/email/layout.html:351
 msgid "this is a message from Oveda - Die offene Veranstaltungsdatenbank."
 msgstr "das ist eine Nachricht von Oveda - Die offene Veranstaltungsdatenbank."
 
-#: app/templates/email/reference_request_notice.html:4
+#: project/templates/email/reference_request_notice.html:4
 msgid "There is a new event reference request that needs to be reviewed."
 msgstr "Es gibt eine neue Empfehlungsanfrage, die geprüft werden muss."
 
-#: app/templates/email/reference_request_notice.html:5
+#: project/templates/email/reference_request_notice.html:5
 msgid "Click here to review the request"
 msgstr "Klicke hier, um die Anfrage anzuzeigen"
 
-#: app/templates/email/reference_request_review_status_notice.html:4
+#: project/templates/email/reference_request_review_status_notice.html:4
 msgid "The review status of your event reference request has been updated."
 msgstr "Der Prüfungsstatus deiner Empfehlungsanfrage wurde aktualisiert"
 
-#: app/templates/email/reference_request_review_status_notice.html:5
-#: app/templates/email/review_status_notice.html:5
+#: project/templates/email/reference_request_review_status_notice.html:5
+#: project/templates/email/review_status_notice.html:5
 msgid "Click here to view the status"
 msgstr "Klicke hier, um den Status anzuzeigen"
 
-#: app/templates/email/review_notice.html:4
+#: project/templates/email/review_notice.html:4
 msgid "There is a new event that needs to be reviewed."
 msgstr "Es wurde eine neue Veranstaltung eingetragen, die geprüft werden muss."
 
-#: app/templates/email/review_notice.html:5
+#: project/templates/email/review_notice.html:5
 msgid "Click here to review the event suggestion"
 msgstr "Klicke hier, um den Vorschlag zu prüfen"
 
-#: app/templates/email/review_status_notice.html:4
+#: project/templates/email/review_status_notice.html:4
 msgid "The review status of your event has been updated."
 msgstr "Der Prüfungsstatus deiner Veranstaltung wurde aktualisiert"
 
-#: app/templates/event/create.html:70 app/templates/event/update.html:27
+#: project/templates/event/create.html:70
+#: project/templates/event/update.html:27
 msgid "Event date"
 msgstr "Termin"
 
-#: app/templates/event/create.html:132 app/templates/event/update.html:66
+#: project/templates/event/create.html:132
+#: project/templates/event/update.html:66
 msgid "Target group"
 msgstr "Zielgruppe"
 
-#: app/templates/event/read.html:17 app/templates/event_date/list.html:4
-#: app/templates/event_date/list.html:249
-#: app/templates/reference_request/review.html:30
+#: project/templates/event/read.html:17
+#: project/templates/event_date/list.html:4
+#: project/templates/event_date/list.html:249
+#: project/templates/reference_request/review.html:30
 msgid "Event Dates"
 msgstr "Termine"
 
-#: app/templates/event/reference.html:8
+#: project/templates/event/reference.html:8
 #, python-format
 msgid "Reference event \"%(name)s\""
 msgstr "Veranstaltung \"%(name)s\" empfehlen"
 
-#: app/templates/event/reference_request.html:8
+#: project/templates/event/reference_request.html:8
 #, python-format
 msgid "Request reference for event \"%(name)s\""
 msgstr "Empfehlung anfragen für Veranstaltung \"%(name)s\""
 
-#: app/templates/event_place/read.html:19
+#: project/templates/event_place/read.html:19
 msgid "Info"
 msgstr "Info"
 
-#: app/templates/event_suggestion/review.html:9
-#: app/templates/manage/reviews.html:19
+#: project/templates/event_suggestion/review.html:9
+#: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
 msgstr "Veranstaltungsvorschlag prüfen"
 
-#: app/templates/event_suggestion/review.html:17
-#: app/templates/event_suggestion/review_status.html:24
-#: app/templates/reference_request/review_status.html:17
+#: project/templates/event_suggestion/review.html:17
+#: project/templates/event_suggestion/review_status.html:24
+#: project/templates/reference_request/review_status.html:17
 msgid "View event"
 msgstr "Veranstaltung anzeigen"
 
-#: app/templates/event_suggestion/review.html:21
+#: project/templates/event_suggestion/review.html:21
 msgid "Create event from suggestion"
 msgstr "Erstelle eine Veranstaltung aus dem Vorschlag"
 
-#: app/templates/event_suggestion/review_status.html:12
+#: project/templates/event_suggestion/review_status.html:12
 msgid "You can visit this page again to check the status."
 msgstr "Sie können diese Seite erneut besuchen, um den Status zu prüfen."
 
-#: app/templates/invitation/read.html:4 app/templates/invitation/read.html:8
-#: app/templates/manage/delete_invitation.html:13
+#: project/templates/invitation/read.html:4
+#: project/templates/invitation/read.html:8
+#: project/templates/manage/delete_invitation.html:13
 msgid "Invitation"
 msgstr "Einladung"
 
-#: app/templates/invitation/read.html:10
+#: project/templates/invitation/read.html:10
 #, python-format
 msgid "Would you like to accept the invitation from %(name)s?"
 msgstr "Möchtest du die Einladung von %(name)s akzeptieren?"
 
-#: app/templates/manage/delete_member.html:13
+#: project/templates/manage/delete_member.html:13
 msgid "Member"
 msgstr "Mitglied"
 
-#: app/templates/manage/events.html:26
-#: app/templates/manage/references_incoming.html:19
-#: app/templates/manage/references_outgoing.html:19
+#: project/templates/manage/events.html:26
+#: project/templates/manage/references_incoming.html:19
+#: project/templates/manage/references_outgoing.html:19
 msgid "View"
 msgstr "Anzeigen"
 
-#: app/templates/manage/events.html:27 app/templates/manage/members.html:35
-#: app/templates/manage/organizers.html:22 app/templates/manage/places.html:27
-#: app/templates/manage/references_incoming.html:20
+#: project/templates/manage/events.html:27
+#: project/templates/manage/members.html:35
+#: project/templates/manage/organizers.html:22
+#: project/templates/manage/places.html:27
+#: project/templates/manage/references_incoming.html:20
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: app/templates/manage/events.html:28 app/templates/manage/members.html:21
-#: app/templates/manage/members.html:36 app/templates/manage/organizers.html:23
-#: app/templates/manage/places.html:28
-#: app/templates/manage/references_incoming.html:21
+#: project/templates/manage/events.html:28
+#: project/templates/manage/members.html:21
+#: project/templates/manage/members.html:36
+#: project/templates/manage/organizers.html:23
+#: project/templates/manage/places.html:28
+#: project/templates/manage/references_incoming.html:21
 msgid "Delete"
 msgstr "Löschen"
 
-#: app/templates/manage/events.html:29
+#: project/templates/manage/events.html:29
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: app/templates/manage/organizers.html:24
+#: project/templates/manage/organizers.html:24
 msgid "Assistents"
 msgstr "Assistenten"
 
-#: app/templates/manage/reference_requests_incoming.html:5
-#: app/templates/manage/reference_requests_outgoing.html:5
+#: project/templates/manage/reference_requests_incoming.html:5
+#: project/templates/manage/reference_requests_outgoing.html:5
 msgid "Reference requests"
 msgstr "Empfehlungsanfragen"
 
-#: app/templates/manage/reference_requests_incoming.html:19
+#: project/templates/manage/reference_requests_incoming.html:19
 msgid "Review request"
 msgstr "Anfrage prüfen"
 
-#: app/templates/manage/reference_requests_outgoing.html:19
+#: project/templates/manage/reference_requests_outgoing.html:19
 msgid "Show review status"
 msgstr "Prüfungsstatus anzeigen"
 
-#: app/templates/manage/widgets.html:25
+#: project/templates/manage/widgets.html:25
 msgid "Veranstaltungen als iFrame einbetten"
 msgstr "Veranstaltungen als iFrame einbetten"
 
-#: app/templates/manage/widgets.html:32
+#: project/templates/manage/widgets.html:32
 msgid "Link, um Veranstaltungen vorzuschlagen"
 msgstr "Link, um Veranstaltungen vorzuschlagen"
 
-#: app/templates/manage/widgets.html:36
+#: project/templates/manage/widgets.html:36
 msgid "URL für Infoscreen"
 msgstr "URL für Infoscreen"
 
-#: app/templates/planing/list.html:4 app/templates/planing/list.html:92
+#: project/templates/planing/list.html:4 project/templates/planing/list.html:92
 msgid "Event Planing"
 msgstr "Planungsassistent"
 
-#: app/templates/reference/update.html:4 app/templates/reference/update.html:8
+#: project/templates/reference/update.html:4
+#: project/templates/reference/update.html:8
 #, python-format
 msgid "Update reference to event \"%(name)s\""
 msgstr "Empfehlung aktualisieren für Veranstaltung \"%(name)s\""
 
-#: app/templates/reference_request/review.html:8
+#: project/templates/reference_request/review.html:8
 msgid "Review event reference request"
 msgstr "Empfehlungsanfrage prüfen"
 
-#: app/templates/security/login_user.html:23
+#: project/templates/security/login_user.html:23
 msgid "You do not have an account yet? Not a problem!"
 msgstr "Du hast noch keinen Account? Kein Problem!"
 
-#: app/templates/widget/event_date/list.html:4
+#: project/templates/widget/event_date/list.html:4
 msgid "Widget"
 msgstr "Widget"
 
-#: app/templates/widget/event_suggestion/create.html:142
+#: project/templates/widget/event_suggestion/create.html:142
 msgid "Continue as guest"
 msgstr "Weiter als Gast"
 
-#: app/templates/widget/event_suggestion/create.html:239
+#: project/templates/widget/event_suggestion/create.html:239
 msgid "Optional details"
 msgstr "Optionale Details"
 
-#: app/templates/widget/event_suggestion/create.html:257
+#: project/templates/widget/event_suggestion/create.html:257
 msgid "Preview"
 msgstr "Vorschau"
 
-#: app/views/admin_unit.py:49
-msgid "Admin unit successfully created"
-msgstr "Verwaltungseinheit erfolgreich erstellt"
-
-#: app/views/admin_unit.py:74
-msgid "AdminUnit successfully updated"
-msgstr "Verwaltungseinheit erfolgreich aktualisiert"
-
-#: app/views/admin_unit_member.py:30
-msgid "Member successfully updated"
-msgstr "Mitglied erfolgreich aktualisiert"
-
-#: app/views/admin_unit_member.py:56
-msgid "Entered email does not match member email"
-msgstr "Die eingegebene Email passt nicht zur Email des Mitglieds"
-
-#: app/views/admin_unit_member.py:61
-msgid "Member successfully deleted"
-msgstr "Mitglied erfolgreich gelöscht"
-
-#: app/views/admin_unit_member_invitation.py:32
-msgid "Invitation successfully accepted"
-msgstr "Einladung erfolgreich akzeptiert"
-
-#: app/views/admin_unit_member_invitation.py:36
-msgid "Invitation successfully declined"
-msgstr "Einladung erfolgreich abgelehnt"
-
-#: app/views/admin_unit_member_invitation.py:72
-msgid "You have received an invitation"
-msgstr "Du hast eine Einladung erhalten"
-
-#: app/views/admin_unit_member_invitation.py:76
-msgid "Invitation successfully sent"
-msgstr "Einladung erfolgreich gesendet"
-
-#: app/views/admin_unit_member_invitation.py:98
-msgid "Entered email does not match invitation email"
-msgstr "Die eingegebene Email passt nicht zur Email der Einladung"
-
-#: app/views/admin_unit_member_invitation.py:103
-msgid "Invitation successfully deleted"
-msgstr "Einladung erfolgreich gelöscht"
-
-#: app/views/event.py:84
-msgid "Event successfully created"
-msgstr "Veranstaltung erfolgreich erstellt"
-
-#: app/views/event.py:109
-msgid "Event successfully updated"
-msgstr "Veranstaltung erfolgreich aktualisiert"
-
-#: app/views/event.py:130 app/views/reference.py:99
-msgid "Entered name does not match event name"
-msgstr "Der eingegebene Name entspricht nicht dem Namen der Veranstaltung"
-
-#: app/views/event.py:136
-msgid "Event successfully deleted"
-msgstr "Veranstaltung erfolgreich gelöscht"
-
-#: app/views/event_place.py:29
-msgid "Place successfully created"
-msgstr "Ort erfolgreich erstellt"
-
-#: app/views/event_place.py:49
-msgid "Place successfully updated"
-msgstr "Ort erfolgreich aktualisiert"
-
-#: app/views/event_place.py:69
-msgid "Entered name does not match place name"
-msgstr "Der eingegebene Name entspricht nicht dem Namen des Ortes"
-
-#: app/views/event_place.py:75
-msgid "Place successfully deleted"
-msgstr "Ort erfolgreich gelöscht"
-
-#: app/views/event_suggestion.py:45
-msgid "Event suggestion successfully rejected"
-msgstr "Veranstaltungsvorschlag erfolgreich abgelehnt"
-
-#: app/views/event_suggestion.py:68 app/views/reference_request_review.py:76
-msgid "Event review status updated"
-msgstr "Prüfungsstatus aktualisiert"
-
-#: app/views/manage.py:173
+#: project/views/admin.py:38 project/views/manage.py:247
 msgid "Settings successfully updated"
 msgstr "Einstellungen erfolgreich aktualisiert"
 
-#: app/views/organizer.py:29
+#: project/views/admin_unit.py:33
+msgid "Admin unit successfully created"
+msgstr "Verwaltungseinheit erfolgreich erstellt"
+
+#: project/views/admin_unit.py:59
+msgid "AdminUnit successfully updated"
+msgstr "Verwaltungseinheit erfolgreich aktualisiert"
+
+#: project/views/admin_unit_member.py:41
+msgid "Member successfully updated"
+msgstr "Mitglied erfolgreich aktualisiert"
+
+#: project/views/admin_unit_member.py:67
+msgid "Entered email does not match member email"
+msgstr "Die eingegebene Email passt nicht zur Email des Mitglieds"
+
+#: project/views/admin_unit_member.py:72
+msgid "Member successfully deleted"
+msgstr "Mitglied erfolgreich gelöscht"
+
+#: project/views/admin_unit_member_invitation.py:42
+msgid "Invitation successfully accepted"
+msgstr "Einladung erfolgreich akzeptiert"
+
+#: project/views/admin_unit_member_invitation.py:48
+msgid "Invitation successfully declined"
+msgstr "Einladung erfolgreich abgelehnt"
+
+#: project/views/admin_unit_member_invitation.py:87
+msgid "You have received an invitation"
+msgstr "Du hast eine Einladung erhalten"
+
+#: project/views/admin_unit_member_invitation.py:92
+msgid "Invitation successfully sent"
+msgstr "Einladung erfolgreich gesendet"
+
+#: project/views/admin_unit_member_invitation.py:115
+msgid "Entered email does not match invitation email"
+msgstr "Die eingegebene Email passt nicht zur Email der Einladung"
+
+#: project/views/admin_unit_member_invitation.py:120
+msgid "Invitation successfully deleted"
+msgstr "Einladung erfolgreich gelöscht"
+
+#: project/views/event.py:123
+msgid "Event successfully created"
+msgstr "Veranstaltung erfolgreich erstellt"
+
+#: project/views/event.py:155
+msgid "Event successfully updated"
+msgstr "Veranstaltung erfolgreich aktualisiert"
+
+#: project/views/event.py:177 project/views/reference.py:130
+msgid "Entered name does not match event name"
+msgstr "Der eingegebene Name entspricht nicht dem Namen der Veranstaltung"
+
+#: project/views/event.py:183
+msgid "Event successfully deleted"
+msgstr "Veranstaltung erfolgreich gelöscht"
+
+#: project/views/event_place.py:36
+msgid "Place successfully created"
+msgstr "Ort erfolgreich erstellt"
+
+#: project/views/event_place.py:60
+msgid "Place successfully updated"
+msgstr "Ort erfolgreich aktualisiert"
+
+#: project/views/event_place.py:83
+msgid "Entered name does not match place name"
+msgstr "Der eingegebene Name entspricht nicht dem Namen des Ortes"
+
+#: project/views/event_place.py:89
+msgid "Place successfully deleted"
+msgstr "Ort erfolgreich gelöscht"
+
+#: project/views/event_suggestion.py:50
+msgid "Event suggestion successfully rejected"
+msgstr "Veranstaltungsvorschlag erfolgreich abgelehnt"
+
+#: project/views/event_suggestion.py:83
+#: project/views/reference_request_review.py:114
+msgid "Event review status updated"
+msgstr "Prüfungsstatus aktualisiert"
+
+#: project/views/organizer.py:35
 msgid "Organizer successfully created"
 msgstr "Veranstalter erfolgreich erstellt"
 
-#: app/views/organizer.py:49
+#: project/views/organizer.py:60
 msgid "Organizer successfully updated"
 msgstr "Veranstalter erfolgreich aktualisiert"
 
-#: app/views/organizer.py:69
+#: project/views/organizer.py:83
 msgid "Entered name does not match organizer name"
 msgstr "Der eingegebene Name entspricht nicht dem Namen des Veranstalters"
 
-#: app/views/organizer.py:74
+#: project/views/organizer.py:88
 msgid "Organizer successfully deleted"
 msgstr "Veranstalter erfolgreich gelöscht"
 
-#: app/views/reference.py:32
+#: project/views/reference.py:46
 msgid "Event successfully referenced"
 msgstr "Veranstaltung erfolgreich empfohlen"
 
-#: app/views/reference.py:56
+#: project/views/reference.py:69
 msgid "Reference successfully updated"
 msgstr "Empfehlung erfolgreich empfohlen"
 
-#: app/views/reference.py:104
+#: project/views/reference.py:135
 msgid "Reference successfully deleted"
 msgstr "Empfehlung erfolgreich gelöscht"
 
-#: app/views/reference_request.py:54
+#: project/views/reference_request.py:88
 msgid "Request successfully created"
 msgstr "Empfehlungsanfrage erfolgreich erstellt"
 
-#: app/views/reference_request.py:73
+#: project/views/reference_request.py:111
 msgid "New reference request"
 msgstr "Neue Empfehlungsanfrage"
 
-#: app/views/reference_request_review.py:19
+#: project/views/reference_request_review.py:29
 msgid "Request already verified"
 msgstr "Empfehlungsanfrage ist bereits verifiziert"
 
-#: app/views/reference_request_review.py:37
-msgid "Request successfully updated"
-msgstr "Empfehlungsanfrage erfolgreich aktualisiert"
-
-#: app/views/reference_request_review.py:39
+#: project/views/reference_request_review.py:52
 msgid "Reference successfully created"
 msgstr "Empfehlung erfolgreich erstellt"
 
-#: app/views/utils.py:53
+#: project/views/reference_request_review.py:54
+msgid "Request successfully updated"
+msgstr "Empfehlungsanfrage erfolgreich aktualisiert"
+
+#: project/views/utils.py:53
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr "Fehler im Feld %s: %s"
 
-#: app/views/utils.py:60
+#: project/views/utils.py:61
 msgid "Show"
 msgstr "Anzeigen"
 
-#: app/views/widget.py:96
+#: project/views/widget.py:135
 msgid "Thank you so much! The event is being verified."
 msgstr "Vielen Dank! Die Veranstaltung wird geprüft."
 
-#: app/views/widget.py:99
+#: project/views/widget.py:139
 msgid ""
 "For more options and your own calendar of events, you can register for "
 "free."
@@ -1369,7 +1428,7 @@ msgstr ""
 "Für mehr Optionen und einen eigenen Veranstaltungskalender, kannst du "
 "dich kostenlos registrieren."
 
-#: app/views/widget.py:135
+#: project/views/widget.py:195
 msgid "New event review"
 msgstr "Neue Veranstaltung zu prüfen"
 
diff --git a/project/views/admin.py b/project/views/admin.py
index 128ef30..f5375d1 100644
--- a/project/views/admin.py
+++ b/project/views/admin.py
@@ -1,7 +1,15 @@
-from project import app
+from project import app, db
 from project.models import AdminUnit
-from flask import render_template
+from flask import render_template, flash, url_for, redirect
+from flask_babelex import gettext
 from flask_security import roles_required
+from project.forms.admin import AdminSettingsForm
+from project.services.admin import upsert_settings
+from project.views.utils import (
+    flash_errors,
+    handleSqlError,
+)
+from sqlalchemy.exc import SQLAlchemyError
 
 
 @app.route("/admin")
@@ -14,3 +22,25 @@ def admin():
 @roles_required("admin")
 def admin_admin_units():
     return render_template("admin/admin_units.html", admin_units=AdminUnit.query.all())
+
+
+@app.route("/admin/settings", methods=("GET", "POST"))
+@roles_required("admin")
+def admin_settings():
+    settings = upsert_settings()
+    form = AdminSettingsForm(obj=settings)
+
+    if form.validate_on_submit():
+        form.populate_obj(settings)
+
+        try:
+            db.session.commit()
+            flash(gettext("Settings successfully updated"), "success")
+            return redirect(url_for("admin"))
+        except SQLAlchemyError as e:
+            db.session.rollback()
+            flash(handleSqlError(e), "danger")
+    else:
+        flash_errors(form)
+
+    return render_template("admin/settings.html", form=form)
diff --git a/project/views/root.py b/project/views/root.py
index 4c52fb1..7695dcf 100644
--- a/project/views/root.py
+++ b/project/views/root.py
@@ -1,6 +1,9 @@
 from project import app
+from project.services.admin import upsert_settings
 from project.views.utils import track_analytics
 from flask import url_for, render_template, request, redirect
+from flask_babelex import gettext
+from markupsafe import Markup
 
 
 @app.route("/")
@@ -17,14 +20,36 @@ def example():
     return render_template("example.html")
 
 
-@app.route("/impressum")
-def impressum():
-    return render_template("impressum.html")
+@app.route("/tos")
+def tos():
+    title = gettext("Terms of service")
+    settings = upsert_settings()
+    content = Markup(settings.tos)
+    return render_template("legal.html", title=title, content=content)
 
 
-@app.route("/datenschutz")
-def datenschutz():
-    return render_template("datenschutz.html")
+@app.route("/legal_notice")
+def legal_notice():
+    title = gettext("Legal notice")
+    settings = upsert_settings()
+    content = Markup(settings.legal_notice)
+    return render_template("legal.html", title=title, content=content)
+
+
+@app.route("/contact")
+def contact():
+    title = gettext("Contact")
+    settings = upsert_settings()
+    content = Markup(settings.contact)
+    return render_template("legal.html", title=title, content=content)
+
+
+@app.route("/privacy")
+def privacy():
+    title = gettext("Privacy")
+    settings = upsert_settings()
+    content = Markup(settings.privacy)
+    return render_template("legal.html", title=title, content=content)
 
 
 @app.route("/developer")
diff --git a/tests/views/test_admin.py b/tests/views/test_admin.py
index 4fdeef6..8d64b3b 100644
--- a/tests/views/test_admin.py
+++ b/tests/views/test_admin.py
@@ -1,3 +1,6 @@
+import pytest
+
+
 def test_normal_user(client, seeder, utils):
     seeder.create_user()
     utils.login()
@@ -18,3 +21,40 @@ def test_admin_units(client, seeder, utils, app):
     seeder.create_admin_unit(user, "Meine Crew")
     response = client.get("/admin/admin_units")
     assert b"Meine Crew" in response.data
+
+
+@pytest.mark.parametrize("db_error", [True, False])
+def test_admin_settings(client, seeder, utils, app, mocker, db_error):
+    user_id, admin_unit_id = seeder.setup_base(True)
+
+    url = utils.get_url("admin_settings")
+    response = utils.get_ok(url)
+
+    if db_error:
+        utils.mock_db_commit(mocker)
+
+    response = utils.post_form(
+        url,
+        response,
+        {
+            "tos": "Meine Nutzungsbedingungen",
+            "legal_notice": "Mein Impressum",
+            "contact": "Mein Kontakt",
+            "privacy": "Mein Datenschutz",
+        },
+    )
+
+    if db_error:
+        utils.assert_response_db_error(response)
+        return
+
+    utils.assert_response_redirect(response, "admin")
+
+    with app.app_context():
+        from project.services.admin import upsert_settings
+
+        settings = upsert_settings()
+        assert settings.tos == "Meine Nutzungsbedingungen"
+        assert settings.legal_notice == "Mein Impressum"
+        assert settings.contact == "Mein Kontakt"
+        assert settings.privacy == "Mein Datenschutz"
diff --git a/tests/views/test_root.py b/tests/views/test_root.py
index 25377db..2de9711 100644
--- a/tests/views/test_root.py
+++ b/tests/views/test_root.py
@@ -12,14 +12,56 @@ def test_example(client, seeder, utils):
     utils.get_ok(url)
 
 
-def test_impressum(client, seeder, utils):
-    url = utils.get_url("impressum")
-    utils.get_ok(url)
+def test_tos(app, db, utils):
+    with app.app_context():
+        from project.services.admin import upsert_settings
+
+        settings = upsert_settings()
+        settings.tos = "Meine Nutzungsbedingungen"
+        db.session.commit()
+
+    url = utils.get_url("tos")
+    response = utils.get_ok(url)
+    assert b"Meine Nutzungsbedingungen" in response.data
 
 
-def test_datenschutz(client, seeder, utils):
-    url = utils.get_url("datenschutz")
-    utils.get_ok(url)
+def test_legal_notice(app, db, utils):
+    with app.app_context():
+        from project.services.admin import upsert_settings
+
+        settings = upsert_settings()
+        settings.legal_notice = "Mein Impressum"
+        db.session.commit()
+
+    url = utils.get_url("legal_notice")
+    response = utils.get_ok(url)
+    assert b"Mein Impressum" in response.data
+
+
+def test_contact(app, db, utils):
+    with app.app_context():
+        from project.services.admin import upsert_settings
+
+        settings = upsert_settings()
+        settings.contact = "Mein Kontakt"
+        db.session.commit()
+
+    url = utils.get_url("contact")
+    response = utils.get_ok(url)
+    assert b"Mein Kontakt" in response.data
+
+
+def test_privacy(app, db, utils):
+    with app.app_context():
+        from project.services.admin import upsert_settings
+
+        settings = upsert_settings()
+        settings.privacy = "Mein Datenschutz"
+        db.session.commit()
+
+    url = utils.get_url("privacy")
+    response = utils.get_ok(url)
+    assert b"Mein Datenschutz" in response.data
 
 
 def test_developer(client, seeder, utils):

From 8d43426c70dd90e758c7611d65256fb2f137d3fe Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Sat, 12 Dec 2020 15:53:12 +0100
Subject: [PATCH 2/2] Update packages #42

---
 requirements.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 716d733..036ef96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,10 +6,10 @@ bcrypt==3.2.0
 beautifulsoup4==4.9.3
 black==20.8b1
 blinker==1.4
-certifi==2020.11.8
+certifi==2020.12.5
 cffi==1.14.4
 cfgv==3.2.0
-chardet==3.0.4
+chardet==4.0.0
 click==7.1.2
 colour==0.1.5
 coverage==5.3
@@ -38,7 +38,7 @@ GeoAlchemy2==0.8.4
 gunicorn==20.0.4
 identify==1.5.10
 idna==2.10
-importlib-metadata==2.1.1
+importlib-metadata==3.1.1
 iniconfig==1.1.1
 itsdangerous==1.1.0
 Jinja2==2.11.2
@@ -48,14 +48,14 @@ mccabe==0.6.1
 mypy-extensions==0.4.3
 nodeenv==1.5.0
 oauthlib==3.1.0
-packaging==20.7
+packaging==20.8
 passlib==1.7.4
 pathspec==0.8.1
 Pillow==8.0.1
 pluggy==0.13.1
-pre-commit==2.9.2
+pre-commit==2.9.3
 psycopg2-binary==2.8.6
-py==1.9.0
+py==1.10.0
 pycodestyle==2.6.0
 pycparser==2.20
 pyflakes==2.2.0
@@ -74,7 +74,7 @@ requests==2.25.0
 requests-oauthlib==1.3.0
 rope==0.18.0
 six==1.15.0
-soupsieve==2.0.1
+soupsieve==2.1
 speaklater==1.3
 SQLAlchemy==1.3.20
 SQLAlchemy-Utils==0.36.8
@@ -83,7 +83,7 @@ typed-ast==1.4.1
 typing-extensions==3.7.4.3
 urllib3==1.26.2
 URLObject==2.4.3
-virtualenv==20.2.1
+virtualenv==20.2.2
 visitor==0.1.3
 Werkzeug==1.0.1
 WTForms==2.3.3