diff --git a/config/panel/departure/default.json b/config/panel/departure/default.json deleted file mode 100755 index 60e85c17f8eda109f95f1bf1d47933d4bbf5ecff..0000000000000000000000000000000000000000 --- a/config/panel/departure/default.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "max":"20", - "stops": [ - "Dortmund:Hbf" - ], - "filter": { - "bl": { - "type": [ - "Bus" - ] - } - } -} \ No newline at end of file diff --git a/config/panel/departure/oh14.json b/config/panel/departure/oh14.json deleted file mode 100755 index 5c726da15ea33fbb3464ea1ea32188634aa0a28b..0000000000000000000000000000000000000000 --- a/config/panel/departure/oh14.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "max":"20", - "stops": [ - "Dortmund:Universität S", - "Dortmund:Josef-von-Fraunhover Straße", - "Dortmund:Meitnerweg" - ], - "filter": { - "bl": { - "type": [ - "H-Bahn" - ] - } - } -} \ No newline at end of file diff --git a/index.php b/index.php index 8c1ab589a96458cfdc2d2a4c22f754b119a32247..f422a7212ed1a4479e0e960e2eb959810299b018 100755 --- a/index.php +++ b/index.php @@ -4,33 +4,34 @@ <title>Infoboard</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link href="favicon.ico" type="image/x-icon" rel="icon"> - <link href="favicon.ico" type="image/x-icon" rel="shortcut icon"> +<!-- <link href="favicon.ico" type="image/x-icon" rel="icon"> + <link href="favicon.ico" type="image/x-icon" rel="shortcut icon"> --> <link rel="stylesheet" href="css/font.css"> <link rel="stylesheet" href="css/design.css"> <link rel="stylesheet" href="css/marquee.css"> <script type="text/javascript" src="js/jquery-2.1.4.min.js"></script> - <script type="text/javascript" src="js/jquery.textfill.min.js"></script> <script type="text/javascript" src="js/marquee.js"></script> <script type="text/javascript" src="js/panelAPI.js"></script> + <script type="text/javascript" src="js/webfontloader.js"></script> + <script type="text/javascript"> //<![CDATA[ - var fontsReady = false; - WebFontConfig = { + $(document).ready(function(){ + window.fontsReady = false; + WebFont.load( { custom : { families : ['time-medium', 'time-fat', 'vrr'], urls : ['css/font.css'] }, active : function() { - fontsReady = true; + window.fontsReady = true; } - }; - $(document).ready(function(){ + }); + layout.loadLayout("<?= isset( $_GET["layout"] ) ? $_GET["layout"] : "oh14" ?>"); }); //]]> </script> - <script src="js/webfontloader.js"></script> </head> <body> <div data-container="main"> diff --git a/style.php b/style.php index 12e171754d4acfc4377e48643594bf7df6ce2169..9e7f53ec9348abbc114f5331e1f98fad98743489 100755 --- a/style.php +++ b/style.php @@ -14,15 +14,15 @@ echo $less_file." not found"; return; } -if ( !file_exists($css_file)) -{ +//if ( !file_exists($css_file)) +//{ $code = $less->compile( "[data-template=$style] {" . file_get_contents( $less_file ) . "}" ); -} +//} file_put_contents("tmp/" . $style . ".css", $code);