diff --git a/www/new_webend/Alarm.php b/www/enhanched_webend/Alarm.php similarity index 100% rename from www/new_webend/Alarm.php rename to www/enhanched_webend/Alarm.php diff --git a/www/new_webend/LICENSE.txt b/www/enhanched_webend/LICENSE.txt similarity index 100% rename from www/new_webend/LICENSE.txt rename to www/enhanched_webend/LICENSE.txt diff --git a/www/new_webend/config.php b/www/enhanched_webend/config.php similarity index 100% rename from www/new_webend/config.php rename to www/enhanched_webend/config.php diff --git a/www/new_webend/css/font-awesome.min.css b/www/enhanched_webend/css/font-awesome.min.css similarity index 100% rename from www/new_webend/css/font-awesome.min.css rename to www/enhanched_webend/css/font-awesome.min.css diff --git a/www/new_webend/css/ie/PIE.htc b/www/enhanched_webend/css/ie/PIE.htc similarity index 100% rename from www/new_webend/css/ie/PIE.htc rename to www/enhanched_webend/css/ie/PIE.htc diff --git a/www/new_webend/css/ie/backgroundsize.min.htc b/www/enhanched_webend/css/ie/backgroundsize.min.htc similarity index 100% rename from www/new_webend/css/ie/backgroundsize.min.htc rename to www/enhanched_webend/css/ie/backgroundsize.min.htc diff --git a/www/new_webend/css/ie/html5shiv.js b/www/enhanched_webend/css/ie/html5shiv.js similarity index 100% rename from www/new_webend/css/ie/html5shiv.js rename to www/enhanched_webend/css/ie/html5shiv.js diff --git a/www/new_webend/css/ie/v8.css b/www/enhanched_webend/css/ie/v8.css similarity index 100% rename from www/new_webend/css/ie/v8.css rename to www/enhanched_webend/css/ie/v8.css diff --git a/www/new_webend/css/images/overlay.png b/www/enhanched_webend/css/images/overlay.png similarity index 100% rename from www/new_webend/css/images/overlay.png rename to www/enhanched_webend/css/images/overlay.png diff --git a/www/new_webend/css/images/shadow.png b/www/enhanched_webend/css/images/shadow.png similarity index 100% rename from www/new_webend/css/images/shadow.png rename to www/enhanched_webend/css/images/shadow.png diff --git a/www/new_webend/css/skel.css b/www/enhanched_webend/css/skel.css similarity index 100% rename from www/new_webend/css/skel.css rename to www/enhanched_webend/css/skel.css diff --git a/www/new_webend/css/style-1000px.css b/www/enhanched_webend/css/style-1000px.css similarity index 100% rename from www/new_webend/css/style-1000px.css rename to www/enhanched_webend/css/style-1000px.css diff --git a/www/new_webend/css/style-desktop.css b/www/enhanched_webend/css/style-desktop.css similarity index 100% rename from www/new_webend/css/style-desktop.css rename to www/enhanched_webend/css/style-desktop.css diff --git a/www/new_webend/css/style-mobile.css b/www/enhanched_webend/css/style-mobile.css similarity index 100% rename from www/new_webend/css/style-mobile.css rename to www/enhanched_webend/css/style-mobile.css diff --git a/www/new_webend/css/style.css b/www/enhanched_webend/css/style.css similarity index 100% rename from www/new_webend/css/style.css rename to www/enhanched_webend/css/style.css diff --git a/www/new_webend/css/usermod.css b/www/enhanched_webend/css/usermod.css similarity index 100% rename from www/new_webend/css/usermod.css rename to www/enhanched_webend/css/usermod.css diff --git a/www/new_webend/eintragen.html b/www/enhanched_webend/eintragen.html similarity index 100% rename from www/new_webend/eintragen.html rename to www/enhanched_webend/eintragen.html diff --git a/www/new_webend/eintragen.php b/www/enhanched_webend/eintragen.php similarity index 100% rename from www/new_webend/eintragen.php rename to www/enhanched_webend/eintragen.php diff --git a/www/new_webend/fonts/FontAwesome.otf b/www/enhanched_webend/fonts/FontAwesome.otf similarity index 100% rename from www/new_webend/fonts/FontAwesome.otf rename to www/enhanched_webend/fonts/FontAwesome.otf diff --git a/www/new_webend/fonts/fontawesome-webfont.eot b/www/enhanched_webend/fonts/fontawesome-webfont.eot similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.eot rename to www/enhanched_webend/fonts/fontawesome-webfont.eot diff --git a/www/new_webend/fonts/fontawesome-webfont.svg b/www/enhanched_webend/fonts/fontawesome-webfont.svg similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.svg rename to www/enhanched_webend/fonts/fontawesome-webfont.svg diff --git a/www/new_webend/fonts/fontawesome-webfont.ttf b/www/enhanched_webend/fonts/fontawesome-webfont.ttf similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.ttf rename to www/enhanched_webend/fonts/fontawesome-webfont.ttf diff --git a/www/new_webend/fonts/fontawesome-webfont.woff b/www/enhanched_webend/fonts/fontawesome-webfont.woff similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.woff rename to www/enhanched_webend/fonts/fontawesome-webfont.woff diff --git a/www/new_webend/gfx/logo.png b/www/enhanched_webend/gfx/logo.png similarity index 100% rename from www/new_webend/gfx/logo.png rename to www/enhanched_webend/gfx/logo.png diff --git a/www/new_webend/images/banner.jpg b/www/enhanched_webend/images/banner.jpg similarity index 100% rename from www/new_webend/images/banner.jpg rename to www/enhanched_webend/images/banner.jpg diff --git a/www/new_webend/images/pic01.jpg b/www/enhanched_webend/images/pic01.jpg similarity index 100% rename from www/new_webend/images/pic01.jpg rename to www/enhanched_webend/images/pic01.jpg diff --git a/www/new_webend/images/pic02.jpg b/www/enhanched_webend/images/pic02.jpg similarity index 100% rename from www/new_webend/images/pic02.jpg rename to www/enhanched_webend/images/pic02.jpg diff --git a/www/new_webend/images/pic03.jpg b/www/enhanched_webend/images/pic03.jpg similarity index 100% rename from www/new_webend/images/pic03.jpg rename to www/enhanched_webend/images/pic03.jpg diff --git a/www/new_webend/images/pic04.jpg b/www/enhanched_webend/images/pic04.jpg similarity index 100% rename from www/new_webend/images/pic04.jpg rename to www/enhanched_webend/images/pic04.jpg diff --git a/www/new_webend/images/pic05.jpg b/www/enhanched_webend/images/pic05.jpg similarity index 100% rename from www/new_webend/images/pic05.jpg rename to www/enhanched_webend/images/pic05.jpg diff --git a/www/new_webend/images/pic06.jpg b/www/enhanched_webend/images/pic06.jpg similarity index 100% rename from www/new_webend/images/pic06.jpg rename to www/enhanched_webend/images/pic06.jpg diff --git a/www/new_webend/images/pic07.jpg b/www/enhanched_webend/images/pic07.jpg similarity index 100% rename from www/new_webend/images/pic07.jpg rename to www/enhanched_webend/images/pic07.jpg diff --git a/www/new_webend/images/pic08.jpg b/www/enhanched_webend/images/pic08.jpg similarity index 100% rename from www/new_webend/images/pic08.jpg rename to www/enhanched_webend/images/pic08.jpg diff --git a/www/new_webend/images/pic09.jpg b/www/enhanched_webend/images/pic09.jpg similarity index 100% rename from www/new_webend/images/pic09.jpg rename to www/enhanched_webend/images/pic09.jpg diff --git a/www/new_webend/images/pic10.jpg b/www/enhanched_webend/images/pic10.jpg similarity index 100% rename from www/new_webend/images/pic10.jpg rename to www/enhanched_webend/images/pic10.jpg diff --git a/www/new_webend/index.php b/www/enhanched_webend/index.php similarity index 100% rename from www/new_webend/index.php rename to www/enhanched_webend/index.php diff --git a/www/new_webend/js/init.js b/www/enhanched_webend/js/init.js similarity index 100% rename from www/new_webend/js/init.js rename to www/enhanched_webend/js/init.js diff --git a/www/new_webend/js/jquery.dropotron.min.js b/www/enhanched_webend/js/jquery.dropotron.min.js similarity index 100% rename from www/new_webend/js/jquery.dropotron.min.js rename to www/enhanched_webend/js/jquery.dropotron.min.js diff --git a/www/new_webend/js/jquery.min.js b/www/enhanched_webend/js/jquery.min.js similarity index 100% rename from www/new_webend/js/jquery.min.js rename to www/enhanched_webend/js/jquery.min.js diff --git a/www/new_webend/js/skel-layers.min.js b/www/enhanched_webend/js/skel-layers.min.js similarity index 100% rename from www/new_webend/js/skel-layers.min.js rename to www/enhanched_webend/js/skel-layers.min.js diff --git a/www/new_webend/js/skel.min.js b/www/enhanched_webend/js/skel.min.js similarity index 100% rename from www/new_webend/js/skel.min.js rename to www/enhanched_webend/js/skel.min.js diff --git a/www/new_webend/login.php b/www/enhanched_webend/login.php similarity index 100% rename from www/new_webend/login.php rename to www/enhanched_webend/login.php diff --git a/www/new_webend/prefs.php b/www/enhanched_webend/prefs.php similarity index 100% rename from www/new_webend/prefs.php rename to www/enhanched_webend/prefs.php diff --git a/www/new_webend/show_fms.php b/www/enhanched_webend/show_fms.php similarity index 100% rename from www/new_webend/show_fms.php rename to www/enhanched_webend/show_fms.php diff --git a/www/new_webend/show_pocsag.php b/www/enhanched_webend/show_pocsag.php similarity index 100% rename from www/new_webend/show_pocsag.php rename to www/enhanched_webend/show_pocsag.php diff --git a/www/new_webend/show_zvei.php b/www/enhanched_webend/show_zvei.php similarity index 100% rename from www/new_webend/show_zvei.php rename to www/enhanched_webend/show_zvei.php diff --git a/www/new_webend/tpl/a_footer.php b/www/enhanched_webend/tpl/a_footer.php similarity index 100% rename from www/new_webend/tpl/a_footer.php rename to www/enhanched_webend/tpl/a_footer.php diff --git a/www/new_webend/tpl/a_header.php b/www/enhanched_webend/tpl/a_header.php similarity index 100% rename from www/new_webend/tpl/a_header.php rename to www/enhanched_webend/tpl/a_header.php diff --git a/www/new_webend/tpl/content.overview.php b/www/enhanched_webend/tpl/content.overview.php similarity index 100% rename from www/new_webend/tpl/content.overview.php rename to www/enhanched_webend/tpl/content.overview.php diff --git a/www/new_webend/tpl/content.parser.php b/www/enhanched_webend/tpl/content.parser.php similarity index 100% rename from www/new_webend/tpl/content.parser.php rename to www/enhanched_webend/tpl/content.parser.php diff --git a/www/new_webend/tpl/fms.php b/www/enhanched_webend/tpl/fms.php similarity index 100% rename from www/new_webend/tpl/fms.php rename to www/enhanched_webend/tpl/fms.php diff --git a/www/new_webend/tpl/mysql.class.php b/www/enhanched_webend/tpl/mysql.class.php similarity index 100% rename from www/new_webend/tpl/mysql.class.php rename to www/enhanched_webend/tpl/mysql.class.php diff --git a/www/new_webend/tpl/parser.php b/www/enhanched_webend/tpl/parser.php similarity index 100% rename from www/new_webend/tpl/parser.php rename to www/enhanched_webend/tpl/parser.php diff --git a/www/new_webend/tpl/pocsag.php b/www/enhanched_webend/tpl/pocsag.php similarity index 100% rename from www/new_webend/tpl/pocsag.php rename to www/enhanched_webend/tpl/pocsag.php diff --git a/www/new_webend/tpl/template.overview.php b/www/enhanched_webend/tpl/template.overview.php similarity index 100% rename from www/new_webend/tpl/template.overview.php rename to www/enhanched_webend/tpl/template.overview.php diff --git a/www/new_webend/tpl/template.parser.php b/www/enhanched_webend/tpl/template.parser.php similarity index 100% rename from www/new_webend/tpl/template.parser.php rename to www/enhanched_webend/tpl/template.parser.php diff --git a/www/new_webend/tpl/zvei.php b/www/enhanched_webend/tpl/zvei.php similarity index 100% rename from www/new_webend/tpl/zvei.php rename to www/enhanched_webend/tpl/zvei.php diff --git a/www/new_webend/tpl_old/content.overview.php b/www/enhanched_webend/tpl_old/content.overview.php similarity index 100% rename from www/new_webend/tpl_old/content.overview.php rename to www/enhanched_webend/tpl_old/content.overview.php diff --git a/www/new_webend/tpl_old/content.parser.php b/www/enhanched_webend/tpl_old/content.parser.php similarity index 100% rename from www/new_webend/tpl_old/content.parser.php rename to www/enhanched_webend/tpl_old/content.parser.php diff --git a/www/new_webend/tpl_old/template.overview.php b/www/enhanched_webend/tpl_old/template.overview.php similarity index 100% rename from www/new_webend/tpl_old/template.overview.php rename to www/enhanched_webend/tpl_old/template.overview.php diff --git a/www/new_webend/tpl_old/template.overview.php+ b/www/enhanched_webend/tpl_old/template.overview.php+ similarity index 100% rename from www/new_webend/tpl_old/template.overview.php+ rename to www/enhanched_webend/tpl_old/template.overview.php+ diff --git a/www/new_webend/tpl_old/template.overview.php.temp b/www/enhanched_webend/tpl_old/template.overview.php.temp similarity index 100% rename from www/new_webend/tpl_old/template.overview.php.temp rename to www/enhanched_webend/tpl_old/template.overview.php.temp diff --git a/www/new_webend/tpl_old/template.parser.php b/www/enhanched_webend/tpl_old/template.parser.php similarity index 100% rename from www/new_webend/tpl_old/template.parser.php rename to www/enhanched_webend/tpl_old/template.parser.php diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php deleted file mode 100644 index 88a5f8c..0000000 --- a/www/old_webend/tpl/content.overview.php +++ /dev/null @@ -1,11 +0,0 @@ -query("SELECT id, time, concat(fms, ' Stat:', status, ' Dir:', directionText) as data, description, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, description, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, concat(ric, ' ', functionChar) as data, description, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); -$Rows = array(); -while ($daten = $db->fetchAssoc()) -{ - $Rows[] = $daten; -} -$tpl['lastAla'] = $Rows; diff --git a/www/old_webend/config.php b/www/simple_webend/config.php similarity index 100% rename from www/old_webend/config.php rename to www/simple_webend/config.php diff --git a/www/old_webend/gfx/logo.png b/www/simple_webend/gfx/logo.png similarity index 100% rename from www/old_webend/gfx/logo.png rename to www/simple_webend/gfx/logo.png diff --git a/www/old_webend/gfx/lupe.png b/www/simple_webend/gfx/lupe.png similarity index 100% rename from www/old_webend/gfx/lupe.png rename to www/simple_webend/gfx/lupe.png diff --git a/www/old_webend/index.php b/www/simple_webend/index.php similarity index 85% rename from www/old_webend/index.php rename to www/simple_webend/index.php index 737d621..b144d41 100644 --- a/www/old_webend/index.php +++ b/www/simple_webend/index.php @@ -65,7 +65,10 @@ $db = new Database($dbhost, $dbuser, $dbpassword, $database, 1); //Show Error = ?> - + diff --git a/www/old_webend/mysql.class.php b/www/simple_webend/mysql.class.php similarity index 100% rename from www/old_webend/mysql.class.php rename to www/simple_webend/mysql.class.php diff --git a/www/old_webend/parser.php b/www/simple_webend/parser.php similarity index 100% rename from www/old_webend/parser.php rename to www/simple_webend/parser.php diff --git a/www/old_webend/style.css b/www/simple_webend/style.css similarity index 94% rename from www/old_webend/style.css rename to www/simple_webend/style.css index fd88f4c..c2ef6ff 100644 --- a/www/old_webend/style.css +++ b/www/simple_webend/style.css @@ -39,4 +39,4 @@ tr:nth-child(2n+3) { background: #CCC; } text-align: center; color: gray; } -#footer a{ color: gray; } +#footer a{ color: gray; font-weight: bold;} diff --git a/www/old_webend/tpl/content.fms.php b/www/simple_webend/tpl/content.fms.php similarity index 100% rename from www/old_webend/tpl/content.fms.php rename to www/simple_webend/tpl/content.fms.php diff --git a/www/simple_webend/tpl/content.overview.php b/www/simple_webend/tpl/content.overview.php new file mode 100644 index 0000000..c70c765 --- /dev/null +++ b/www/simple_webend/tpl/content.overview.php @@ -0,0 +1,11 @@ +query("SELECT id, time, concat(fms, ' Stat:', status, ' (', directionText, ')') as data, description, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, description, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, concat(ric, ' ', functionChar) as data, description, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); +$Rows = array(); +while ($daten = $db->fetchAssoc()) +{ + $Rows[] = $daten; +} +$tpl['lastAla'] = $Rows; diff --git a/www/old_webend/tpl/content.parser.php b/www/simple_webend/tpl/content.parser.php similarity index 100% rename from www/old_webend/tpl/content.parser.php rename to www/simple_webend/tpl/content.parser.php diff --git a/www/old_webend/tpl/content.pocsag.php b/www/simple_webend/tpl/content.pocsag.php similarity index 100% rename from www/old_webend/tpl/content.pocsag.php rename to www/simple_webend/tpl/content.pocsag.php diff --git a/www/old_webend/tpl/content.zvei.php b/www/simple_webend/tpl/content.zvei.php similarity index 100% rename from www/old_webend/tpl/content.zvei.php rename to www/simple_webend/tpl/content.zvei.php diff --git a/www/old_webend/tpl/template.fms.php b/www/simple_webend/tpl/template.fms.php similarity index 100% rename from www/old_webend/tpl/template.fms.php rename to www/simple_webend/tpl/template.fms.php diff --git a/www/old_webend/tpl/template.overview.php b/www/simple_webend/tpl/template.overview.php similarity index 100% rename from www/old_webend/tpl/template.overview.php rename to www/simple_webend/tpl/template.overview.php diff --git a/www/old_webend/tpl/template.parser.php b/www/simple_webend/tpl/template.parser.php similarity index 100% rename from www/old_webend/tpl/template.parser.php rename to www/simple_webend/tpl/template.parser.php diff --git a/www/old_webend/tpl/template.pocsag.php b/www/simple_webend/tpl/template.pocsag.php similarity index 100% rename from www/old_webend/tpl/template.pocsag.php rename to www/simple_webend/tpl/template.pocsag.php diff --git a/www/old_webend/tpl/template.zvei.php b/www/simple_webend/tpl/template.zvei.php similarity index 100% rename from www/old_webend/tpl/template.zvei.php rename to www/simple_webend/tpl/template.zvei.php