diff --git a/www/old_webend/gfx/lupe.png b/www/old_webend/gfx/lupe.png
new file mode 100644
index 0000000..60b51cd
Binary files /dev/null and b/www/old_webend/gfx/lupe.png differ
diff --git a/www/old_webend/index.php b/www/old_webend/index.php
index aeaa785..737d621 100644
--- a/www/old_webend/index.php
+++ b/www/old_webend/index.php
@@ -11,14 +11,22 @@ $db = new Database($dbhost, $dbuser, $dbpassword, $database, 1); //Show Error =
BOSWatch
-
+
+
+
+
diff --git a/www/old_webend/style.css b/www/old_webend/style.css
new file mode 100644
index 0000000..fd88f4c
--- /dev/null
+++ b/www/old_webend/style.css
@@ -0,0 +1,42 @@
+/*navigation*/
+#navi{
+ width: 400px;
+ margin: auto;
+ border: 1px solid black;
+ padding: 5px;
+ font-weight: bold;
+}
+
+#navi a:link { color: red; text-decoration: none;}
+#navi a:visited { color: red; }
+#navi a:hover { color: black; }
+#navi a:active { color: black; }
+
+
+/*table center and border in*/
+table { margin: auto; border-collapse: collapse; }
+
+/*Tabellen mit Rahmen*/
+table, th, td { border: 1px solid black; }
+
+/*alternating line color in table*/
+/*without first line (header)*/
+tr:nth-child(2n+2) { background: #FFF; }
+tr:nth-child(2n+3) { background: #CCC; }
+
+/*table head*/
+.tableHead{
+ color: white;
+ background-color: #BE2F01;
+ font-weight: bold;
+}
+
+
+/*footer*/
+#footer{
+ margin-top: 50px;
+ margin-bottom: 25px;
+ text-align: center;
+ color: gray;
+}
+#footer a{ color: gray; }
diff --git a/www/old_webend/tpl/content.fms.php b/www/old_webend/tpl/content.fms.php
new file mode 100644
index 0000000..541cb21
--- /dev/null
+++ b/www/old_webend/tpl/content.fms.php
@@ -0,0 +1,10 @@
+query("SELECT id, time, fms, status, direction, directionText, tsi, description FROM ".$tableFMS." ORDER BY id DESC");
+ $Rows = array();
+ while ($daten = $db->fetchAssoc())
+ {
+ $Rows[] = $daten;
+ }
+ $tpl['fms'] = $Rows;
+?>
diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php
index dd09404..0818017 100644
--- a/www/old_webend/tpl/content.overview.php
+++ b/www/old_webend/tpl/content.overview.php
@@ -1,27 +1,11 @@
query("SELECT id, time, fms, status, direction, tsi FROM ".$tableFMS." ORDER BY id DESC LIMIT 50");
- $Rows = array();
- while ($daten = $db->fetchAssoc())
- {
- $Rows[] = $daten;
- }
- $tpl['fms'] = $Rows;
- //read ZVEI
- $db->query("SELECT id, time, zvei FROM ".$tableZVEI." ORDER BY id DESC LIMIT 50");
- $Rows = array();
- while ($daten = $db->fetchAssoc())
- {
- $Rows[] = $daten;
- }
- $tpl['zvei'] = $Rows;
- //read POCSAG
- $db->query("SELECT id, time, ric, funktion, text FROM ".$tablePOC." ORDER BY id DESC LIMIT 50");
- $Rows = array();
- while ($daten = $db->fetchAssoc())
- {
- $Rows[] = $daten;
- }
- $tpl['poc'] = $Rows;
-?>
+
+//read all
+$db->query("SELECT id, time, fms as data, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, ric as data, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC");
+$Rows = array();
+while ($daten = $db->fetchAssoc())
+{
+ $Rows[] = $daten;
+}
+$tpl['lastAla'] = $Rows;
diff --git a/www/old_webend/tpl/content.pocsag.php b/www/old_webend/tpl/content.pocsag.php
new file mode 100644
index 0000000..5e0138c
--- /dev/null
+++ b/www/old_webend/tpl/content.pocsag.php
@@ -0,0 +1,10 @@
+query("SELECT id, time, ric, function, functionChar, bitrate, msg, description FROM ".$tablePOC." ORDER BY id DESC");
+ $Rows = array();
+ while ($daten = $db->fetchAssoc())
+ {
+ $Rows[] = $daten;
+ }
+ $tpl['poc'] = $Rows;
+?>
diff --git a/www/old_webend/tpl/content.zvei.php b/www/old_webend/tpl/content.zvei.php
new file mode 100644
index 0000000..2cb5042
--- /dev/null
+++ b/www/old_webend/tpl/content.zvei.php
@@ -0,0 +1,10 @@
+query("SELECT id, time, zvei, description FROM ".$tableZVEI." ORDER BY id DESC");
+ $Rows = array();
+ while ($daten = $db->fetchAssoc())
+ {
+ $Rows[] = $daten;
+ }
+ $tpl['zvei'] = $Rows;
+?>
diff --git a/www/old_webend/tpl/template.fms.php b/www/old_webend/tpl/template.fms.php
new file mode 100644
index 0000000..61ca296
--- /dev/null
+++ b/www/old_webend/tpl/template.fms.php
@@ -0,0 +1,30 @@
+Last FMS alarms
+
+
+ | ID |
+ Datum - Zeit |
+ FMS |
+ Stat. |
+ Richt. |
+ TKI |
+ Beschreibung |
+
+ ";
+ echo "". $fms['id'] . " | ";
+ echo "". $time . " | ";
+ echo "". $fms['fms'] . " | ";
+ echo "". $fms['status'] . " | ";
+ echo "". $fms['direction'] . " = " . $fms['directionText'] . " | ";
+ echo "". $fms['tsi'] . " | ";
+ echo "". $fms['description'] . " | ";
+ echo "";
+ }
+ ?>
+
diff --git a/www/old_webend/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php
index fa4e3e6..544bae5 100644
--- a/www/old_webend/tpl/template.overview.php
+++ b/www/old_webend/tpl/template.overview.php
@@ -1,84 +1,28 @@
-Last alarms for FMS and ZVEI (max. 50)
-
-
-
Last FMS alarms
-
-
+
+
Last 50 alarms
+
+
| ID |
Datum - Zeit |
- FMS |
- Stat. |
- Richt. |
- TKI |
+ Typ |
+ Daten |
+ |
- ";
- echo "". $fms['id'] . " | ";
- echo "". $time . " | ";
- echo "". $fms['fms'] . " | ";
- echo "". $fms['status'] . " | ";
- echo "". $fms['direction'] . " | ";
- echo "". $fms['tsi'] . " | ";
- echo "";
- }
- ?>
-
-
-
Last POCSAG alarms
-
-
- | ID |
- Datum - Zeit |
- RIC |
- Funktion |
- Text |
-
- ";
- echo "". $poc['id'] . " | ";
- echo "". $time . " | ";
- echo "". $poc['ric'] . " | ";
- echo "". $poc['funktion'] . " | ";
- echo "". $poc['text'] . " | ";
- echo "";
- }
- ?>
-
-
-
-
-
Last ZVEI alarms
-
-
- | ID |
- Datum - Zeit |
- Schleife |
-
- ";
- echo "". $zvei['id'] . " | ";
- echo "". $time . " | ";
- echo "". $zvei['zvei'] . " | ";
- echo "";
- }
- ?>
+ echo "";
+ echo "| ". $lastAla['id'] . " | ";
+ echo "". $time . " | ";
+ echo "". $lastAla['typ'] . " | ";
+ echo "". $lastAla['data'] . " | ";
+ echo " | ";
+ echo "
";
+ }
+ ?>
diff --git a/www/old_webend/tpl/template.parser.php b/www/old_webend/tpl/template.parser.php
index e69de29..2e9b6fa 100644
--- a/www/old_webend/tpl/template.parser.php
+++ b/www/old_webend/tpl/template.parser.php
@@ -0,0 +1 @@
+no function yet!
diff --git a/www/old_webend/tpl/template.pocsag.php b/www/old_webend/tpl/template.pocsag.php
new file mode 100644
index 0000000..66277ce
--- /dev/null
+++ b/www/old_webend/tpl/template.pocsag.php
@@ -0,0 +1,30 @@
+Last POCSAG alarms
+
+
+ | ID |
+ Datum - Zeit |
+ RIC |
+ Funktion |
+ Bitrate |
+ Nachricht |
+ Beschreibung |
+
+ ";
+ echo "". $poc['id'] . " | ";
+ echo "". $time . " | ";
+ echo "". $poc['ric'] . " | ";
+ echo "". $poc['function'] . " = " . $poc['functionChar'] . " | ";
+ echo "". $poc['bitrate'] . " | ";
+ echo "". $poc['msg'] . " | ";
+ echo "". $poc['description'] . " | ";
+ echo "";
+ }
+ ?>
+
diff --git a/www/old_webend/tpl/template.zvei.php b/www/old_webend/tpl/template.zvei.php
new file mode 100644
index 0000000..2484f28
--- /dev/null
+++ b/www/old_webend/tpl/template.zvei.php
@@ -0,0 +1,24 @@
+Last ZVEI alarms
+
+
+ | ID |
+ Datum - Zeit |
+ Schleife |
+ Beschreibung |
+
+ ";
+ echo "". $zvei['id'] . " | ";
+ echo "". $time . " | ";
+ echo "". $zvei['zvei'] . " | ";
+ echo "". $zvei['description'] . " | ";
+ echo "";
+ }
+ ?>
+