diff --git a/app/templates/ha_cluster.html b/app/templates/ha_cluster.html
index 71a86e9b..f58ceef8 100644
--- a/app/templates/ha_cluster.html
+++ b/app/templates/ha_cluster.html
@@ -42,14 +42,14 @@
{% else %}
{% if role <= 2 %}
-
+ {{lang.ha_page.create_ha}}
++ {{lang.ha_page.create_ha}}
{% endif %}
{% for cluster in clusters %}
{% endfor %}
-
+
-
+
diff --git a/app/templates/smon/manage_status_page.html b/app/templates/smon/manage_status_page.html
index 9f0859ea..ba439eaf 100644
--- a/app/templates/smon/manage_status_page.html
+++ b/app/templates/smon/manage_status_page.html
@@ -25,7 +25,7 @@
{{lang.smon_page.desc.run_smon}} {{lang.words.here}} {{lang.smon_page.desc.before_use}}
{% else %}
- + {{lang.phrases.create_page_status}}
+ + {{lang.phrases.create_page_status}}
{% include 'ajax/smon/status_pages.html' %}
diff --git a/inc/css/smon.css b/inc/css/smon.css
index a00fca2c..779214f5 100644
--- a/inc/css/smon.css
+++ b/inc/css/smon.css
@@ -94,7 +94,7 @@ h4 {
float: left;
margin-top: 3px;
}
-.add-button-status-page {
+.add-button-big {
font-size: 15px;
float: unset;
margin: var(--indent);
diff --git a/inc/ha.js b/inc/ha.js
index a0348ac0..60f11d82 100644
--- a/inc/ha.js
+++ b/inc/ha.js
@@ -344,6 +344,7 @@ function saveCluster(jsonData, cluster_id=0, edited=0, reconfigure=0) {
$.ajax({
url: "/app/ha/cluster",
type: req_method,
+ async: false,
data: {
jsonData: JSON.stringify(jsonData),
},
@@ -352,7 +353,8 @@ function saveCluster(jsonData, cluster_id=0, edited=0, reconfigure=0) {
toastr.error(data);
} else {
if (!edited) {
- getHaCluster(data, true);
+ cluster_id = data;
+ getHaCluster(cluster_id, true);
} else {
getHaCluster(cluster_id);
$("#cluster-" + cluster_id).addClass("update", 1000);
@@ -364,10 +366,10 @@ function saveCluster(jsonData, cluster_id=0, edited=0, reconfigure=0) {
}
});
if (reconfigure) {
- Reconfigure(jsonData);
+ Reconfigure(jsonData, cluster_id);
}
}
-function Reconfigure(jsonData) {
+function Reconfigure(jsonData, cluster_id) {
servers = JSON.parse(JSON.stringify(jsonData));
$("#wait-mess").html(wait_mess);
$("#wait-mess").show();
@@ -397,17 +399,18 @@ function Reconfigure(jsonData) {
server_creating.dialog('open');
let li_id = 'creating-'
let progress_step = 100 / total_installation;
- $.when(installServiceCluster(jsonData, 'keepalived', progress_step)).done(function () {
+ $.when(installServiceCluster(jsonData, 'keepalived', progress_step, cluster_id)).done(function () {
if (servers['services']['haproxy']['enabled']) {
- installServiceCluster(jsonData, 'haproxy', progress_step);
+ installServiceCluster(jsonData, 'haproxy', progress_step, cluster_id);
}
if (servers['services']['nginx']['enabled']) {
- installServiceCluster(jsonData, 'nginx', progress_step);
+ installServiceCluster(jsonData, 'nginx', progress_step, cluster_id);
}
});
}
-function installServiceCluster(jsonData, service, progress_step) {
+function installServiceCluster(jsonData, service, progress_step, cluster_id) {
servers = JSON.parse(JSON.stringify(jsonData));
+ servers['cluster_id'] = cluster_id;
var li_id = 'creating-' + service + '-';
var install_mess = $('#translate').attr('data-installing');
var timeout_mess = $('#translate').attr('data-roxywi_timeout');
@@ -426,7 +429,7 @@ function installServiceCluster(jsonData, service, progress_step) {
},
},
data: {
- jsonData: JSON.stringify(jsonData),
+ jsonData: JSON.stringify(servers),
},
success: function (data) {
try {