allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

fixes

This commit is contained in:
Matteo Gheza 2021-05-10 21:57:38 +02:00
parent 35d3e573aa
commit c248d30c3d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/error_page.php
View File

@ -24,8 +24,8 @@ function show_error_page($error=null, $error_message=null, $error_message_advanc
file_get_contents($webpack_manifest_path), file_get_contents($webpack_manifest_path),
true true
); );
$main_script_url = "resources/dist/".$webpack_manifest["main.js"]; $main_script_url = "resources/dist/".$webpack_manifest["main.js"]["src"];
$game_script_url = "resources/dist/".$webpack_manifest["games.js"]; $game_script_url = "resources/dist/".$webpack_manifest["games.js"]["src"];
} }
} catch(\Exception $e) { } catch(\Exception $e) {
} }

2
server/resources/ajax/ajax_list.php
View File

@ -14,7 +14,7 @@ foreach(!is_null($result) ? $result : [] as $row){
$name_encoded = urlencode($user->name()); $name_encoded = urlencode($user->name());
$functionName = $row["available"] ? "allertaJS.main.deactivate" : "allertaJS.main.activate"; $functionName = $row["available"] ? "allertaJS.main.deactivate" : "allertaJS.main.activate";
$helmet_colour = $row["chief"] ? "red" : "black"; $helmet_colour = $row["chief"] ? "red" : "black";
$firstCell = "<a style='text-align: left;' onclick='$functionName(".$row["id"].",0);'><img alt='{$helmet_colour} helmet' src='./resources/images/{$helmet_colour}_helmet.png' width='20px'>$name</a>"; $firstCell = "<a id='username-{$row['id']}' style='text-align: left;' onclick='$functionName(".$row["id"].",0);'><img alt='{$helmet_colour} helmet' src='./resources/images/{$helmet_colour}_helmet.png' width='20px'>$name</a>";
$secondCell = $row["available"] ? "<a onclick='$functionName(".$row["id"].",0);'><i class='fa fa-check' style='color:green'></i></a>" : "<a onclick='$functionName(".$row["id"].",0);'><i class='fa fa-times' style='color:red'></i></a>"; $secondCell = $row["available"] ? "<a onclick='$functionName(".$row["id"].",0);'><i class='fa fa-check' style='color:green'></i></a>" : "<a onclick='$functionName(".$row["id"].",0);'><i class='fa fa-times' style='color:red'></i></a>";
$response[] = [ $response[] = [
(time()-$row["online_time"])<=30 ? "<u>".$firstCell."</u>" : $firstCell, (time()-$row["online_time"])<=30 ? "<u>".$firstCell."</u>" : $firstCell,