From 08987dfa2269a672c9d370ecfe9a7ccade2c5b81 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 19 Oct 2018 11:45:55 +0300 Subject: [PATCH] Minor changes --- setup/flavors/compose/setup.html | 8 ++- setup/server.py | 4 +- .../templates/steps/compose/02_services.html | 11 --- .../{compose/01_config.html => config.html} | 18 +++-- setup/templates/steps/stack/01_config.html | 67 ------------------- setup/templates/steps/stack/02_services.html | 11 --- setup/templates/wizard.html | 3 +- 7 files changed, 20 insertions(+), 102 deletions(-) rename setup/templates/steps/{compose/01_config.html => config.html} (84%) delete mode 100644 setup/templates/steps/stack/01_config.html diff --git a/setup/flavors/compose/setup.html b/setup/flavors/compose/setup.html index d5f7abc5..0379ba82 100644 --- a/setup/flavors/compose/setup.html +++ b/setup/flavors/compose/setup.html @@ -39,11 +39,13 @@ Before you can use Mailu, you must create the primary administrator user account 
docker-compose exec admin python manage.py admin {{ postmaster }} {{ domain }} PASSWORD
-Login the the admin interface to change the password for a safe one, at +

Login to the admin interface to change the password for a safe one, at {% if admin_enabled %} -one of the hostnames ({{ hostnames }}){{ admin_path }}. +one of the hostnames +{{ hostnames.split(',')[0] }}{{ admin_path }}. {% else %} -http://127.0.0.1:8080 (only directly from the host running docker). +http://127.0.0.1:8080 (only directly from the host running docker). {% endif %} And choose the "Update password" option in the left menu. +

{% endcall %} diff --git a/setup/server.py b/setup/server.py index 7818e662..bfe5ef15 100644 --- a/setup/server.py +++ b/setup/server.py @@ -68,8 +68,8 @@ def build_app(path): @bp.route("/submit_flavor", methods=["POST"]) def submit_flavor(): data = flask.request.form.copy() - flavor_files = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"])) - return flask.render_template('wizard.html', flavor=data["flavor"], flavor_files=flavor_files) + steps = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"])) + return flask.render_template('wizard.html', flavor=data["flavor"], steps=steps) @bp.route("/submit", methods=["POST"]) def submit(): diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html index 07bca6ba..7117c490 100644 --- a/setup/templates/steps/compose/02_services.html +++ b/setup/templates/steps/compose/02_services.html @@ -3,17 +3,6 @@ interface, Web email clients (webmails), antispam, antivirus, etc. If you wish to disable some of these features, you are free to do so.

-

The admin interface is the main Mailu-specific bit, it provides tools to -manage your email domains, users, etc.

- -
- -
-
- -
-
-

Emails will be available through IMAP and POP3. You may also enable a Web email client. These do add some complexity but provide an easier way of accessing messages for beginner users.

diff --git a/setup/templates/steps/compose/01_config.html b/setup/templates/steps/config.html similarity index 84% rename from setup/templates/steps/compose/01_config.html rename to setup/templates/steps/config.html index cfca8aa7..7e09f17f 100644 --- a/setup/templates/steps/compose/01_config.html +++ b/setup/templates/steps/config.html @@ -14,13 +14,6 @@ required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$"> -
- -
-
@@ -64,4 +57,15 @@ pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
+

The admin interface is the main Mailu-specific bit, it provides tools to +manage your email domains, users, etc.

+ +
+ +
+
+ +
+
+ {% endcall %} diff --git a/setup/templates/steps/stack/01_config.html b/setup/templates/steps/stack/01_config.html deleted file mode 100644 index 8ada68a7..00000000 --- a/setup/templates/steps/stack/01_config.html +++ /dev/null @@ -1,67 +0,0 @@ -{% call macros.panel("info", "Step 2 - Initial configuration") %} -

Before starting some variables must be set

- -
- - - -
- -
- - - -
- -
- -
- -
- - -
- - - - - - - - - - - -
- - -

/minute; - /hour

-
- -
- -
- -
- - -
- -
- - - -
- -{% endcall %} diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html index 07bca6ba..7117c490 100644 --- a/setup/templates/steps/stack/02_services.html +++ b/setup/templates/steps/stack/02_services.html @@ -3,17 +3,6 @@ interface, Web email clients (webmails), antispam, antivirus, etc. If you wish to disable some of these features, you are free to do so.

-

The admin interface is the main Mailu-specific bit, it provides tools to -manage your email domains, users, etc.

- -
- -
-
- -
-
-

Emails will be available through IMAP and POP3. You may also enable a Web email client. These do add some complexity but provide an easier way of accessing messages for beginner users.

diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html index b74ac1b8..05de5a5c 100644 --- a/setup/templates/wizard.html +++ b/setup/templates/wizard.html @@ -15,7 +15,8 @@ {% if flavor %}
- {%for file in flavor_files %} + {% include "steps/config.html" %} + {%for file in steps %} {% include "steps/" + flavor + "/" + file %} {% endfor %}