From f70acfe893e4eaac16f9b48c0c694294fc79baf1 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Sun, 22 Apr 2018 16:09:07 +0200
Subject: [PATCH] Factor some generic bits in the base template

---
 config/templates/base.html   | 18 ++++++++++++++++++
 config/templates/wizard.html |  9 +++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/config/templates/base.html b/config/templates/base.html
index bc52b3b6..02ca06de 100644
--- a/config/templates/base.html
+++ b/config/templates/base.html
@@ -2,3 +2,21 @@
 {% import "macros.html" as macros %}
 
 {% block title %}Mailu configuration{% endblock %}
+
+{% block content %}
+<div class="container">
+  <h1>Mailu configuration</h1>
+  <p>
+    Version
+    <select onchange="window.location.href=this.value;">
+      {% for available in versions %}
+      <option value="{{ url_for('{}.wizard'.format(available)) }}" {% if available == version %}selected{% endif %}>{{ available }}</option>
+      {% endfor %}
+    </select>
+  </p>
+
+  {% block page %}{% endblock %}
+
+</div>
+<p></p>
+{% endblock %}
diff --git a/config/templates/wizard.html b/config/templates/wizard.html
index c5ac3ebf..da9d5134 100644
--- a/config/templates/wizard.html
+++ b/config/templates/wizard.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 
-{% block content %}
-<div class="container">
-  <h1>Mailu configuration - {{ branch }}</h1>
-
+{% block page %}
   {% call macros.panel("warning", "Before starting, read the docs!") %}
   Mailu is not perfectly documented, but still has a lot of documentation
   available at <a href="https://mailu.io">mailu.io</a>. Make sure you read
@@ -14,9 +11,9 @@
   <form method="post" action="{{ url_for(".submit") }}">
   {% include "steps/flavor.html" %}
   {% include "steps/expose.html" %}
+  {% include "steps/services.html" %}
+  {% include "steps/optional.html" %}
 
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
   </form>
-
-</div>
 {% endblock %}