layout
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
2025-08-15 13:17:10 +00:00
parent 41284bd0f2
commit bdb02f798d
5 changed files with 22 additions and 18 deletions

View File

@@ -274,13 +274,13 @@ function check_uninstall(additional) {
console.log('check_uninstall '+additional+': '+data); console.log('check_uninstall '+additional+': '+data);
if (data!="") { if (data!="") {
jQuery("#"+additional).html(data); jQuery("#"+additional).html(data);
jQuery("#popupText").html(data); // manage2 jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
} }
if (data!="OK") { if (data!="OK") {
setTimeout(check_uninstall, 1000, additional); setTimeout(check_uninstall, 1000, additional);
} }
else { else {
jQuery("#popupText").html('Uninstall has finished'); // manage2 jQuery("#popupText").html('<div class="loading">Uninstall has finished</div>'); // manage2
jQuery("#"+additional).html('Uninstall has finished'); jQuery("#"+additional).html('Uninstall has finished');
get_deployments(); get_deployments();
} }
@@ -292,7 +292,7 @@ function uninstall(additional) {
jQuery("div.deployment").each(function(index) { jQuery("div.deployment").each(function(index) {
$(this).html(''); $(this).html('');
}); });
data = '<div class="confirm"><form action="#" method="post"><div class="row">You are going to uninstall '+additional.toUpperCase()+'.<br>Are you sure? If yes, please click on the Uninstall button below.<br><br></div><div class="row buttons"><div class="mb-3"><button class="btn" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div><div class="mb-3" style="margin-left:200px;float:"><button class="btn" onclick="reinstall(\''+additional+'\',\''+additional+'\')">Cancel</button></div></div></form></div>'; data = '<div class="confirm"><form action="#" method="post"><div class="row">You are going to uninstall '+additional.toUpperCase()+'.<br>Are you sure? If you click on Uninstall button below then all your data will be deleted.<br><br></div><div class="row buttons"><div class="mb-3"><button class="btn" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div><div class="mb-3" style="margin-left:200px;float:"><button class="btn" onclick="reinstall(\''+additional+'\',\''+additional+'\')">Cancel</button></div></div></form></div>';
jQuery("#"+additional).html(data); jQuery("#"+additional).html(data);
jQuery("#popupText").html(data); // manage2 jQuery("#popupText").html(data); // manage2
} }
@@ -305,7 +305,7 @@ function confirm_uninstall(additional) {
console.log('uninstall '+additional+': '+data); console.log('uninstall '+additional+': '+data);
if (data!="") { if (data!="") {
jQuery("#"+additional).html(data); jQuery("#"+additional).html(data);
jQuery("#popupText").html(data); // manage2 jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
setTimeout(check_uninstall, 1000, additional); setTimeout(check_uninstall, 1000, additional);
} }
}); });
@@ -379,7 +379,7 @@ function deploy(additional) {
console.log('deploy '+additional+': '+data); console.log('deploy '+additional+': '+data);
if (data!="") { if (data!="") {
jQuery("#"+additional).html(data); jQuery("#"+additional).html(data);
jQuery("#popupText").html(data); // manage2 jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
setTimeout(check_deployment, 1000, additional); setTimeout(check_deployment, 1000, additional);
} }
}); });
@@ -398,7 +398,7 @@ function redeploy(additional) {
console.log('redeploy '+additional+': '+data); console.log('redeploy '+additional+': '+data);
if (data!="") { if (data!="") {
jQuery("#"+additional).html(data); jQuery("#"+additional).html(data);
jQuery("#popupText").html(data); // manage2 jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
setTimeout(check_deployment, 1000, additional); setTimeout(check_deployment, 1000, additional);
} }
}); });

View File

@@ -9,7 +9,7 @@
<title>Safebox</title> <title>Safebox</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap"/> <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/>
<link rel="stylesheet" href="style.css?t=14" /> <link rel="stylesheet" href="style.css?t=15" />
</head> </head>
<body> <body>
<div class="sidebar"> <div class="sidebar">
@@ -390,6 +390,6 @@
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.6/dist/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.6/dist/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
<script src="common.js?t=45"></script> <script src="common.js?t=52"></script>
</body> </body>
</html> </html>

View File

@@ -297,7 +297,7 @@ switch ($_GET["op"]) {
"; ";
} }
elseif ($data["STATUS"]=="2") { // deploy elseif ($data["STATUS"]=="2") { // deploy
echo "Install has finished."; echo '<div class="loading">Install has finished.</div>';
echo "<script>get_deployments();</script>"; echo "<script>get_deployments();</script>";
} }
remove_response("$key"); remove_response("$key");
@@ -314,7 +314,7 @@ switch ($_GET["op"]) {
echo ""; echo "";
} }
elseif ($data["STATUS"]=="2") { elseif ($data["STATUS"]=="2") {
echo "Install has finished."; echo '<div class="loading">Install has finished.';
echo "<script>get_deployments();</script>"; echo "<script>get_deployments();</script>";
remove_response("$key"); // remove from output if finished so reinstall can start 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)); $payload = base64_encode(json_encode($fields, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT));
$arr = array("NAME" => $_GET["additional"], "ACTION" => $_GET["op"], "PAYLOAD" => $payload); $arr = array("NAME" => $_GET["additional"], "ACTION" => $_GET["op"], "PAYLOAD" => $payload);
$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
if (set_output("deployment",$json)) echo "OK"; if (set_output("deployment",$json)) echo "";
else echo "ERROR"; else $text .= " - ERROR";
} }
echo $text; echo $text;
break; break;
@@ -426,14 +426,15 @@ switch ($_GET["op"]) {
if (!empty($arr)) { if (!empty($arr)) {
$data = $arr[$key]; $data = $arr[$key];
if ($data["STATUS"]=="1") { 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") { elseif ($data["STATUS"]=="2") {
echo "OK"; echo "OK";
remove_response("$key"); remove_response("$key");
} }
} }
else echo "Uninstall in progress... Please wait..."; else echo "Uninstall in progress...";
} }
break; break;
case "uninstall": case "uninstall":
@@ -441,12 +442,12 @@ switch ($_GET["op"]) {
$text="Deploy/uninstall process has already started.<br>Please wait and do not start a new one..."; $text="Deploy/uninstall process has already started.<br>Please wait and do not start a new one...";
} }
else { else {
$text="Uninstall in progress... Please wait..."; $text="Uninstall in progress...";
$arr = array("NAME" => $_GET["additional"], "ACTION" => "uninstall"); $arr = array("NAME" => $_GET["additional"], "ACTION" => "uninstall");
$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
if (set_output("deployment",$json)) echo "OK"; if (set_output("deployment",$json)) echo "";
else echo "ERROR"; else $text .= " - ERROR";
} }
echo $text; echo $text;
break; break;

View File

@@ -136,6 +136,9 @@
border-radius: 10px; border-radius: 10px;
margin-top:250px; margin-top:250px;
padding: 20px; padding: 20px;
font-size: 16px;
color: #999;
line-height: 1.5;
} }
.menu { .menu {

View File

@@ -1 +1 @@
1.1.17 1.1.18