From adfadab4cf4d749d6bf95f0b9bd420fa3bc93094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Thu, 18 Oct 2018 12:56:16 +0300
Subject: [PATCH] Load steps after setting flavor

---
 setup/server.py                                 |  5 +++++
 setup/templates/macros.html                     |  4 ++--
 setup/templates/steps/{compose => }/flavor.html |  8 ++++----
 setup/templates/wizard.html                     | 17 +++++++++++------
 4 files changed, 22 insertions(+), 12 deletions(-)
 rename setup/templates/steps/{compose => }/flavor.html (81%)

diff --git a/setup/server.py b/setup/server.py
index ddeafd90..4e29fe9e 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -65,6 +65,11 @@ def build_app(path):
         def wizard():
             return flask.render_template('wizard.html')
 
+        @bp.route("/submit_flavor", methods=["POST"])
+        def submit_flavor():
+            data = flask.request.form.copy()
+            return flask.render_template('wizard.html', flavor=data["flavor"])
+
         @bp.route("/submit", methods=["POST"])
         def submit():
             data = flask.request.form.copy()
diff --git a/setup/templates/macros.html b/setup/templates/macros.html
index 579800d2..4af20c4e 100644
--- a/setup/templates/macros.html
+++ b/setup/templates/macros.html
@@ -9,10 +9,10 @@
   </div>
 {% endmacro %}
 
-{% macro radio(name, value, emph, text) %}
+{% macro radio(name, value, emph, text, current) %}
   <div class="radio">
     <label>
-      <input type="radio" name="{{ name }}" value="{{ value }}">
+      <input type="radio" name="{{ name }}" value="{{ value }}"{% if current == value %} checked="checked"{% endif %}>
       {% if emph %}
       <strong>{{ emph }}</strong>,
       {% endif %}
diff --git a/setup/templates/steps/compose/flavor.html b/setup/templates/steps/flavor.html
similarity index 81%
rename from setup/templates/steps/compose/flavor.html
rename to setup/templates/steps/flavor.html
index 66da0757..64aa0158 100644
--- a/setup/templates/steps/compose/flavor.html
+++ b/setup/templates/steps/flavor.html
@@ -7,10 +7,10 @@ developpers, will mostly cover Compose and Stack, while other flavors are
 maintained by specific contributors.</p>
 
 <div class="radio">
-  {{ macros.radio("flavor", "compose", "Compose", "simply using Docker Compose manager") }}
-  {{ macros.radio("flavor", "stack", "Stack", "using stack deployments in a Swarm cluster") }}
-  {{ macros.radio("flavor", "rancher", "Rancher", "on top of the Rancher container manager") }}
-  {{ macros.radio("flavor", "kubernetes", "Kubernetes", "on top of the Kubernetes container manager") }}
+  {{ macros.radio("flavor", "compose", "Compose", "simply using Docker Compose manager", flavor) }}
+  {{ macros.radio("flavor", "stack", "Stack", "using stack deployments in a Swarm cluster", flavor) }}
+  {{ macros.radio("flavor", "rancher", "Rancher", "on top of the Rancher container manager", flavor) }}
+  {{ macros.radio("flavor", "kubernetes", "Kubernetes", "on top of the Kubernetes container manager", flavor) }}
 </div>
 
 {% endcall %}
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index 1c85a0ad..d035a96b 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -8,13 +8,18 @@
   ready when using this wizard.
   {% endcall %}
 
+  <form method="post" action="{{ url_for(".submit_flavor") }}">
+  {% include "steps/flavor.html" %}
+  <input class="btn btn-primary" type="submit" value="Next >" style="margin-bottom: 15px">
+  </form>
+  {% if flavor %}
   <form method="post" action="{{ url_for(".submit") }}">
-  {% include "steps/compose/flavor.html" %}
-  {% include "steps/compose/config.html" %}
-  {% include "steps/compose/services.html" %}
-  {% include "steps/compose/expose.html" %}
-<!--   {% include "steps/compose/optional.html" %} -->
-
+  <input type="hidden" name="flavor" value="{{ flavor }}">
+  {% include "steps/" + flavor + "/config.html" %}
+  {% include "steps/" + flavor + "/services.html" %}
+  {% include "steps/" + flavor + "/expose.html" %}
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
+  {% endif %}
+<!--   {% include "steps/compose/optional.html" %} -->
   </form>
 {% endblock %}