diff --git a/common.js b/common.js index 231c7fc..e7ed223 100644 --- a/common.js +++ b/common.js @@ -274,13 +274,13 @@ function check_uninstall(additional) { console.log('check_uninstall '+additional+': '+data); if (data!="") { jQuery("#"+additional).html(data); - jQuery("#popupText").html(data); // manage2 + jQuery("#popupText").html('
'+data+'
'); // manage2 } if (data!="OK") { setTimeout(check_uninstall, 1000, additional); } else { - jQuery("#popupText").html('Uninstall has finished'); // manage2 + jQuery("#popupText").html('
Uninstall has finished
'); // manage2 jQuery("#"+additional).html('Uninstall has finished'); get_deployments(); } @@ -292,7 +292,7 @@ function uninstall(additional) { jQuery("div.deployment").each(function(index) { $(this).html(''); }); - data = '
You are going to uninstall '+additional.toUpperCase()+'.
Are you sure? If yes, please click on the Uninstall button below.

'; + data = '
You are going to uninstall '+additional.toUpperCase()+'.
Are you sure? If you click on Uninstall button below then all your data will be deleted.

'; jQuery("#"+additional).html(data); jQuery("#popupText").html(data); // manage2 } @@ -305,7 +305,7 @@ function confirm_uninstall(additional) { console.log('uninstall '+additional+': '+data); if (data!="") { jQuery("#"+additional).html(data); - jQuery("#popupText").html(data); // manage2 + jQuery("#popupText").html('
'+data+'
'); // manage2 setTimeout(check_uninstall, 1000, additional); } }); @@ -379,7 +379,7 @@ function deploy(additional) { console.log('deploy '+additional+': '+data); if (data!="") { jQuery("#"+additional).html(data); - jQuery("#popupText").html(data); // manage2 + jQuery("#popupText").html('
'+data+'
'); // manage2 setTimeout(check_deployment, 1000, additional); } }); @@ -398,7 +398,7 @@ function redeploy(additional) { console.log('redeploy '+additional+': '+data); if (data!="") { jQuery("#"+additional).html(data); - jQuery("#popupText").html(data); // manage2 + jQuery("#popupText").html('
'+data+'
'); // manage2 setTimeout(check_deployment, 1000, additional); } }); diff --git a/manage.html b/manage.html index c099e96..b148fe4 100644 --- a/manage.html +++ b/manage.html @@ -9,7 +9,7 @@ Safebox - +
@@ -390,6 +390,6 @@ - + diff --git a/scan.php b/scan.php index eed1967..68ee9f5 100644 --- a/scan.php +++ b/scan.php @@ -297,7 +297,7 @@ switch ($_GET["op"]) { "; } elseif ($data["STATUS"]=="2") { // deploy - echo "Install has finished."; + echo '
Install has finished.
'; echo ""; } remove_response("$key"); @@ -314,7 +314,7 @@ switch ($_GET["op"]) { echo ""; } elseif ($data["STATUS"]=="2") { - echo "Install has finished."; + echo '
Install has finished.'; echo ""; remove_response("$key"); // remove from output if finished so reinstall can start } @@ -392,8 +392,8 @@ switch ($_GET["op"]) { $payload = base64_encode(json_encode($fields, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT)); $arr = array("NAME" => $_GET["additional"], "ACTION" => $_GET["op"], "PAYLOAD" => $payload); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); - if (set_output("deployment",$json)) echo "OK"; - else echo "ERROR"; + if (set_output("deployment",$json)) echo ""; + else $text .= " - ERROR"; } echo $text; break; @@ -426,14 +426,15 @@ switch ($_GET["op"]) { if (!empty($arr)) { $data = $arr[$key]; if ($data["STATUS"]=="1") { - echo "Uninstall in progress... Please wait... ".date("Y-m-d H:i:s"); + //echo "Uninstall in progress... Please wait... ".date("Y-m-d H:i:s"); + echo "Uninstall in progress... "; } elseif ($data["STATUS"]=="2") { echo "OK"; remove_response("$key"); } } - else echo "Uninstall in progress... Please wait..."; + else echo "Uninstall in progress..."; } break; case "uninstall": @@ -441,12 +442,12 @@ switch ($_GET["op"]) { $text="Deploy/uninstall process has already started.
Please wait and do not start a new one..."; } else { - $text="Uninstall in progress... Please wait..."; + $text="Uninstall in progress..."; $arr = array("NAME" => $_GET["additional"], "ACTION" => "uninstall"); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); - if (set_output("deployment",$json)) echo "OK"; - else echo "ERROR"; + if (set_output("deployment",$json)) echo ""; + else $text .= " - ERROR"; } echo $text; break; diff --git a/style.css b/style.css index fe24ba1..7868c07 100644 --- a/style.css +++ b/style.css @@ -136,6 +136,9 @@ border-radius: 10px; margin-top:250px; padding: 20px; + font-size: 16px; + color: #999; + line-height: 1.5; } .menu { diff --git a/version.html b/version.html index cbb8cba..852ed67 100644 --- a/version.html +++ b/version.html @@ -1 +1 @@ -1.1.17 +1.1.18