From 2a76451a98edbf6d5f8feb02cc13f1577e75fcf9 Mon Sep 17 00:00:00 2001
From: Ionut Filip
Date: Wed, 7 Nov 2018 16:41:11 +0200
Subject: [PATCH] Moved scripts to an external js file
---
setup/Dockerfile | 1 +
setup/static/render.js | 34 +++++++++++++++++++
.../templates/steps/compose/02_services.html | 22 ++----------
setup/templates/steps/config.html | 18 +---------
setup/templates/steps/stack/02_services.html | 21 +-----------
5 files changed, 39 insertions(+), 57 deletions(-)
create mode 100644 setup/static/render.js
diff --git a/setup/Dockerfile b/setup/Dockerfile
index 83711af5..e39d7c3b 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -12,6 +12,7 @@ COPY setup.py ./setup.py
COPY main.py ./main.py
COPY flavors /data/master/flavors
COPY templates /data/master/templates
+COPY static ./static
#RUN python setup.py https://github.com/mailu/mailu /data
diff --git a/setup/static/render.js b/setup/static/render.js
new file mode 100644
index 00000000..a1c3fb0d
--- /dev/null
+++ b/setup/static/render.js
@@ -0,0 +1,34 @@
+$(document).ready(function() {
+ if ($("#webmail").val() == 'none') {
+ $("#webmail_path").hide();
+ $("#webmail_path").attr("value", "");
+ } else {
+ $("#webmail_path").show();
+ $("#webmail_path").attr("value", "/webmail");
+ }
+ $("#webmail").click(function() {
+ if (this.value == 'none') {
+ $("#webmail_path").hide();
+ $("#webmail_path").attr("value", "");
+ } else {
+ $("#webmail_path").show();
+ $("#webmail_path").attr("value", "/webmail");
+ }
+ });
+});
+
+$(document).ready(function() {
+ if ($('#admin').prop('checked')) {
+ $("#admin_path").show();
+ $("#admin_path").attr("value", "/admin");
+ }
+ $("#admin").change(function() {
+ if ($(this).is(":checked")) {
+ $("#admin_path").show();
+ $("#admin_path").attr("value", "/admin");
+ } else {
+ $("#admin_path").hide();
+ $("#admin_path").attr("value", "");
+ }
+ });
+});
\ No newline at end of file
diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html
index 53763658..11e7a14e 100644
--- a/setup/templates/steps/compose/02_services.html
+++ b/setup/templates/steps/compose/02_services.html
@@ -54,25 +54,7 @@ also disable the antivirus if required (it does use aroung 1GB of ram).
-
+
+
{% endcall %}
diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html
index a3352b7e..d843d684 100644
--- a/setup/templates/steps/config.html
+++ b/setup/templates/steps/config.html
@@ -75,22 +75,6 @@ manage your email domains, users, etc.
-
+
{% endcall %}
diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html
index 53763658..36493e05 100644
--- a/setup/templates/steps/stack/02_services.html
+++ b/setup/templates/steps/stack/02_services.html
@@ -54,25 +54,6 @@ also disable the antivirus if required (it does use aroung 1GB of ram).
-
+
{% endcall %}