From 73f267bc469230d7e17258778723bf2a37c41325 Mon Sep 17 00:00:00 2001
From: Christoph Volkert <inyoka@christoph-volkert.de>
Date: Fri, 8 Sep 2017 22:22:08 +0200
Subject: [PATCH 1/2] Add portal/configuration.html

The template currently does not include configuration for the distributions.
---
 .../templates/portal/configuration.html       | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 inyoka_theme_default/templates/portal/configuration.html

diff --git a/inyoka_theme_default/templates/portal/configuration.html b/inyoka_theme_default/templates/portal/configuration.html
new file mode 100644
index 0000000..ab4c791
--- /dev/null
+++ b/inyoka_theme_default/templates/portal/configuration.html
@@ -0,0 +1,41 @@
+{#
+    templates.portal.configuration
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    On this page the administrator can set general configuration values.
+
+    :copyright: (c) 2013-2017 by the Inyoka Team, see AUTHORS for more details.
+    :license: BSD, see LICENSE for more details.
+#}
+{% extends 'portal/base.html' %}
+
+{% block title %}
+  {% trans %}Configuration{% endtrans %} – {{ super() }}
+{% endblock title %}
+
+{% block breadcrumb %}
+  {{ super() }}
+
+  {{ macros.breadcrumb_item(_('Configuration'), href('portal', 'config')) }}
+{% endblock %}
+
+{% block content %}
+  {% call macros.outer_form(csrf_token(), form, manually_rendered=True) %}
+    <h1>{% trans %}General settings{% endtrans %}</h1>
+    {{ macros.inner_form(form, ['global_message', 'welcome_message',
+        'blocked_hosts', 'wiki_newpage_template', 'wiki_newpage_root',
+        'wiki_newpage_infopage', 'wiki_edit_note', 'license_note',
+        'ikhaya_description', 'planet_description', 'team_icon']) }}
+
+    {% if team_icon_url %}
+      <img src="{{ team_icon_url }}"
+           alt="{% trans %}Preview of Team Icon{% endtrans%}" />
+    {% endif %}
+
+    <h1>Release-Countdown</h1>
+    {{ macros.inner_form(form, ['countdown_active',
+                                'countdown_target_page',
+                                'countdown_image_url',
+                                'countdown_date']) }}
+  {% endcall %}
+{% endblock %}

From bbf5fba4c0c5a081321a8c0e2f38f24524a8b7dc Mon Sep 17 00:00:00 2001
From: Christoph Volkert <inyoka@christoph-volkert.de>
Date: Sun, 10 Sep 2017 00:15:48 +0200
Subject: [PATCH 2/2] portal/configuration: Sections for wiki and ikhaya

---
 .../templates/portal/configuration.html             | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/inyoka_theme_default/templates/portal/configuration.html b/inyoka_theme_default/templates/portal/configuration.html
index ab4c791..518742d 100644
--- a/inyoka_theme_default/templates/portal/configuration.html
+++ b/inyoka_theme_default/templates/portal/configuration.html
@@ -23,16 +23,21 @@
   {% call macros.outer_form(csrf_token(), form, manually_rendered=True) %}
     <h1>{% trans %}General settings{% endtrans %}</h1>
     {{ macros.inner_form(form, ['global_message', 'welcome_message',
-        'blocked_hosts', 'wiki_newpage_template', 'wiki_newpage_root',
-        'wiki_newpage_infopage', 'wiki_edit_note', 'license_note',
-        'ikhaya_description', 'planet_description', 'team_icon']) }}
+        'blocked_hosts', 'license_note', 'team_icon']) }}
 
     {% if team_icon_url %}
       <img src="{{ team_icon_url }}"
            alt="{% trans %}Preview of Team Icon{% endtrans%}" />
     {% endif %}
 
-    <h1>Release-Countdown</h1>
+    <h1>{% trans %}Ikhaya{% endtrans %}</h1>
+    {{ macros.inner_form(form, ['ikhaya_description', 'planet_description']) }}
+
+    <h1>{% trans %}Wiki{% endtrans %}</h1>
+    {{ macros.inner_form(form, ['wiki_newpage_template', 'wiki_newpage_root',
+        'wiki_newpage_infopage', 'wiki_edit_note']) }}
+
+    <h1>{% trans %}Release-Countdown{% endtrans %}</h1>
     {{ macros.inner_form(form, ['countdown_active',
                                 'countdown_target_page',
                                 'countdown_image_url',