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

Merge branch 'master' into fix_github-action

This commit is contained in:
MatteoGheza 2020-12-03 23:50:26 +01:00 committed by GitHub
parent 1ac5437f17 f39b3f7136
commit a7ecfb854d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ foreach($risultato as $row){
$functionName = $row["available"] ? "deactivate" : "activate";
$helmet_colour = $row["chief"] ? "red" : "black";
$firstCell = "<a id='username-{$row['id']}' style='text-align: left;' onclick='$functionName(".$row["id"].");'><img alt='{$helmet_colour} helmet' src='./resources/images/{$helmet_colour}_helmet.png' width='20px'>$name</a>";
$secondCell = $row["available"] ? "<a onclick='$functionName(".$row["id"].");'><i class='fa fa-check' style='color:green'></i></a>" : "<a onclick='$functionName(".$row["id"].");'><i class='fa fa-times' style='color:red'></i></a>";
$secondCell = $row["available"] ? "<a onclick='$functionName(".$row["id"].");'><i class='fa fa-check' style='color:green'></i></a>" : "<a onclick='$functionName(".$row["id"].");'><i class='fa fa-times' style='color:red'></i></a>";
$response[] = [
(time()-$row["online_time"])<=30 ? "<u>".$firstCell."</u>" : $firstCell,
$secondCell,
@ -49,10 +49,13 @@ foreach($risultato as $row){
"<a href='user_details.php?user=".$row['id']."'><p>".t("Altri dettagli", false)."</p></a>"
];
} else {
$name = $user->nameById($row["id"]);
$helmet_colour = $row["chief"] ? "red" : "black";
$firstCell = "<a id='username-{$row['id']}' style='text-align: left;'><img alt='{$helmet_colour} helmet' src='./resources/images/{$helmet_colour}_helmet.png' width='20px'>$name</a>";
$secondCell = $row["available"] ? "<a><i class='fa fa-check' style='color:green'></i></a>" : "<a><i class='fa fa-times' style='color:red'></i></a>";
$response[] = [
"id" => $row["id"],
"available" => $row["available"],
"online" => (time()-$row["online_time"])<=30 ? 1 : 0
(time()-$row["online_time"])<=30 ? "<u>".$firstCell."</u>" : $firstCell,
$secondCell
];
}
}

4
server/templates/index.html
View File

@ -17,12 +17,16 @@
<input type="text" name="name" placeholder="{{ 'username'|t }}" required autocomplete="username" autofocus><br><br>
<input type="password" name="password" placeholder="{{ 'password'|t }}" required
autocomplete="current-password"><br><br>
{% if option('force_remember_cookie') %}
<input type="hidden" name="remember_me" value='1' id="remember_me checkbox1" type="checkbox">
{% else %}
<div>
<div class="form-check">
<input type="checkbox" name="remember_me" value='1' id="remember_me checkbox1" type="checkbox">
<label for="checkbox1">{{ 'Stay connected'|t }}</label>
</div>
</div>
{% endif %}
<input type="submit" name="login" class="btn btn-lg btn-success" value="{{ 'Login'|t }}">
</form>
{% if error %}