Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
Merge pull request #26 from kc1awv/bootstrap4
Browse files Browse the repository at this point in the history
Bootstrap 4
  • Loading branch information
dg9vh authored Apr 23, 2020
2 parents bf03a03 + 2153b3a commit 16b2493
Show file tree
Hide file tree
Showing 10 changed files with 361 additions and 316 deletions.
10 changes: 4 additions & 6 deletions include/allheard.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?php
?>
<div class="panel panel-default">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Todays Heard List</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="card">
<div class="card-header">Todays Heard List</div>
<div class="table-responsive">
<table id="allHeard" class="table table-condensed">
<thead>
<tr>
Expand All @@ -21,7 +19,7 @@
$listElem = $allHeard[$i];
echo"<tr>";
echo"<td>$listElem[0]</td>";

if (defined("GDPR"))
echo"<td nowrap>".str_replace("0","&Oslash;",substr($listElem[1],0,3)."***")."</td>";
else
Expand Down
27 changes: 9 additions & 18 deletions include/disk.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<div class="panel panel-default">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Disk use</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="card">
<div class="card-header">Disk use</div>
<div class="table-responsive">
<table id="diskuse" class="table table-condensed table-striped table-hover">

<thead>
<tr>

<th class="w10p filesystem">Filesystem</th>
<th class="w20p">Mount</th>
<th>Use</th>
Expand All @@ -17,7 +15,7 @@
</tr>
</thead>
<tbody>

<?php

error_reporting(E_ERROR | E_WARNING | E_PARSE);
Expand Down Expand Up @@ -51,7 +49,7 @@
continue;


?>
?>

<tr>
<td><?php echo $filesystem ?></td>
Expand All @@ -61,27 +59,20 @@
<td><?php echo getSize($used * 1024) ?></td>
<td><?php echo getSize($total * 1024) ?></td>
</tr>
<?php

<?php
$key++;
}

}




} catch (Exception $e) {
return false;
}

?>



</tbody>
</table>
</div>
</div>
</div>


12 changes: 5 additions & 7 deletions include/gateways.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?php
?>
<div class="panel panel-default">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Connected YSFGateways</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="card">
<div class="card-header">Connected YSFGateways</div>
<div class="table-responsive">
<table id="gateways" class="table table-condensed">
<thead>
<tr>
Expand All @@ -17,10 +15,10 @@
//$gateways = getConnectedGateways($logLines);
$gateways = getLinkedGateways($logLines);
foreach ($gateways as $gateway) {

echo "<tr>";
echo "<td>".convertTimezone($gateway['timestamp'])."</td>";

if (defined("GDPR"))
echo"<td nowrap>".str_replace("0","&Oslash;",substr($gateway['callsign'],0,3)."***")."</td>";
else
Expand Down
8 changes: 3 additions & 5 deletions include/lh.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?php
?>
<div class="panel panel-default">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Last Heard List</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="card">
<div class="card-header">Last Heard List</div>
<div class="table-responsive">
<table id="lh" class="table table-condensed">
<thead>
<tr>
Expand Down
10 changes: 4 additions & 6 deletions include/oldheard.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?php
?>
<div class="panel panel-default">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Alltime Heard List</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="card">
<div class="card-header">Alltime Heard List</div>
<div class="table-responsive">
<table id="oldallHeard" class="table table-condensed">
<thead>
<tr>
Expand All @@ -20,7 +18,7 @@
$listElem = $oldallHeard[$i];
echo"<tr>";
echo"<td>$listElem[0]</td>";

if (defined("GDPR"))
echo"<td nowrap>".str_replace("0","&Oslash;",substr($listElem[1],0,3)."***")."</td>";
else
Expand Down
4 changes: 2 additions & 2 deletions include/sysinfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ function makeLayer(id,L,T,W,H,bgColor,visible,zIndex) {
$idletime = format_time((substr($output,strpos($output," ")))/$cpucores);

?>
<div class="panel panel-default">
<div class="card">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">System Info</div>
<div class="card-header">System Info</div>
<!-- Tabelle -->
<div class="table-responsive">
<table id="sysinfo" class="table table-condensed">
Expand Down
8 changes: 4 additions & 4 deletions include/txinfo.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="panel panel-default">
<div class="card">
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Currently TXing</div>
<div class="card-header">Currently TXing</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="currtx" class="table table-condensed table-striped table-hover">
<thead>
<tr>
Expand All @@ -16,7 +16,7 @@
<tbody id="txline">
</tbody>
</table>
</div>
</div>
</div>
<script>
function doXMLHTTPRequest(scriptname, elem) {
Expand Down
196 changes: 113 additions & 83 deletions index.php
Original file line number Diff line number Diff line change
@@ -1,83 +1,113 @@
<?php
$time = microtime();
$time = explode(' ', $time);
$time = $time[1] + $time[0];
$start = $time;
header("Cache-Control: no-cache, must-revalidate");
header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
// do not touch this includes!!! Never ever!!!
include "config/config.php";
include "include/tools.php";
include "include/functions.php";
include "include/init.php";
include "version.php";
?>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<!--<meta name="viewport" content="width=device-width, initial-scale=1.0">
-->
<meta name="viewport" content="width=device-width, initial-scale=0.6,maximum-scale=1, user-scalable=yes">
<meta http-equiv="refresh" content="<?php echo REFRESHAFTER?>">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
<!-- Das neueste kompilierte und minimierte CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<!-- Optionales Theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css">
<!-- Das neueste kompilierte und minimierte JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- Datatables -->
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.12/css/jquery.dataTables.min.css">
<script type="text/javascript" src="https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js"></script>
<style>
h4 {
display: inline
}
body{
padding: 10px;
}
</style>
<title><?php echo getConfigItem("Info", "Name", $configs); ?> - YSFReflector-Dashboard by DG9VH</title>
</head>
<body>
<div class="page-header" style="position:relative;">
<h1><small>YSFReflector-Dashboard by DG9VH for Reflector:</small> <?php echo getConfigItem("Info", "Name", $configs); ?> / <?php echo getConfigItem("Info", "Description", $configs); ?></h1>
<h4>YSFReflector by G4KLX Version:
<?php echo getYSFReflectorVersion(); ?></h4>
<?php
if (LOGO !== "") {
?>
<div id="Logo" style="position:absolute;top:-43px;right:10px;"><img src="<?php echo LOGO ?>" width="250px" style="width:250px; border-radius:10px;box-shadow:2px 2px 2px #808080; padding:1px;background:#FFFFFF;border:1px solid #808080;" border="0" hspace="10" vspace="10" align="absmiddle"></div>
<?php
}
?>
</div>
<?php
checkSetup();
// Here you can feel free to disable info-sections by commenting out with // before include
include "include/txinfo.php";
include "include/sysinfo.php";
include "include/disk.php";
include "include/gateways.php";
include "include/lh.php";
include "include/allheard.php";
if (defined("SHOWOLDMHEARD")) {
include "include/oldheard.php";
}
?>
<div class="panel panel-info">
<?php
$lastReload = new DateTime();
$lastReload->setTimezone(new DateTimeZone(TIMEZONE));
echo "YSFReflector-Dashboard V ".VERSION." | Last Reload ".$lastReload->format('Y-m-d, H:i:s')." (".TIMEZONE.")";
$time = microtime();
$time = explode(' ', $time);
$time = $time[1] + $time[0];
$finish = $time;
$total_time = round(($finish - $start), 4);
echo '<!--Page generated in '.$total_time.' seconds.-->';
?> | get your own at: <a href="https://github.com/dg9vh/YSFReflector-Dashboard">https://github.com/dg9vh/YSFReflector-Dashboard</a>
</div>
</body>
</html>
<?php
$time = microtime();
$time = explode(' ', $time);
$time = $time[1] + $time[0];
$start = $time;
// do not touch this includes!!! Never ever!!!
include "config/config.php";
include "include/tools.php";
include "include/functions.php";
include "include/init.php";
include "version.php";
?>

<!DOCTYPE html>
<html lang="en">

<head>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="YSF-Reflector Dashboard by DG9VH">
<meta name="author" content="DG9VH, KC1AWV">
<meta http-equiv="refresh" content="<?php echo REFRESHAFTER?>">

<title><?php echo getConfigItem("Info", "Name", $configs); ?> - YSFReflector-Dashboard by DG9VH</title>

<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

</head>

<body>

<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark static-top">
<div class="container-fluid">
<span class="float:left">
<a class="navbar-brand" href="#">YSFReflector-Dashboard by DG9VH for Reflector: <?php echo getConfigItem("Info", "Name", $configs); ?> / <?php echo getConfigItem("Info", "Description", $configs); ?></a>
</span>
<span class="navbar-brand float:right">
YSFReflector by G4KLX Version: <?php echo getYSFReflectorVersion(); ?>
</span>
</div>
</nav>

<!-- Page Content -->
<div class="container-fluid">
<?php
checkSetup();
?>
<div class="row">
<div class="col-10">
<?php
include "include/txinfo.php";
?>
</div>
<?php if (LOGO !== "") { ?>
<div id="Logo" class="col-2">
<img src="<?php echo LOGO ?>" width="250px" style="width:250px; border-radius:10px;box-shadow:2px 2px 2px #808080; padding:1px;background:#FFFFFF;border:1px solid #808080;" border="0" hspace="10" vspace="10" align="justify-content-center">
</div>
<?php } else { ?>
<div id="Logo" class="col-2">
<h3 class="text-center">YSF-Reflector<br />Dashboard</h3>
</div>
<?php } ?>
</div>
</div>

<div class="row">
<div class="col">
<?php
include "include/sysinfo.php";
?>
</div>
<div class="col">
<?php
include "include/disk.php";
?>
</div>
</div>
<?php
include "include/gateways.php";
include "include/lh.php";
include "include/allheard.php";
if (defined("SHOWOLDMHEARD")) {
include "include/oldheard.php";
}
?>
</div>

<div class="card">
<div class="card-body">
<?php
$lastReload = new DateTime();
$lastReload->setTimezone(new DateTimeZone(TIMEZONE));
echo "YSFReflector-Dashboard V ".VERSION." | Last Reload ".$lastReload->format('Y-m-d, H:i:s')." (".TIMEZONE.")";
$time = microtime();
$time = explode(' ', $time);
$time = $time[1] + $time[0];
$finish = $time;
$total_time = round(($finish - $start), 4);
echo '<!--Page generated in '.$total_time.' seconds.-->';
?> | get your own at: <a href="https://github.com/dg9vh/YSFReflector-Dashboard">https://github.com/dg9vh/YSFReflector-Dashboard</a>
</div>
</div>

<!-- Bootstrap core JavaScript -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
</body>

</html>
Loading

0 comments on commit 16b2493

Please sign in to comment.