diff --git a/favicon.png b/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..a694960094e795631e2af505c157c336d5804c2e Binary files /dev/null and b/favicon.png differ diff --git a/index.html b/index.html index 4fdb2eab1288481ab1e97b8c99e8b5daeb38ebde..1296b72b14b98e14749e7c936b00cd5be8df5d94 100755 --- a/index.html +++ b/index.html @@ -4,8 +4,7 @@ <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.png" type="image/x-icon" rel="icon"> <link rel="stylesheet" href="css/font.css"> <link rel="stylesheet" href="css/design.css"> <link rel="stylesheet" href="css/marquee.css"> diff --git a/panels/departure/config/oh14.json b/panels/departure/config/oh14.json index 585cb326281f5f32d4ca09653cc96b5d372322bd..437e4b11a1f10f7cadc98376bc8eb006d3aae5b9 100755 --- a/panels/departure/config/oh14.json +++ b/panels/departure/config/oh14.json @@ -10,9 +10,9 @@ "type": [ "H-Bahn" ], - "destination": [ - "Dortmund Otto-Hahn-Straße" - ] + "destination": [ + "Dortmund Otto-Hahn-Straße" + ] } } } diff --git a/panels/departure/script.js b/panels/departure/script.js index 167826aa2785c75dcf75b18214921287c50a5350..75fd5f9a19619b685083df503c64f5f2ca35329d 100755 --- a/panels/departure/script.js +++ b/panels/departure/script.js @@ -169,12 +169,16 @@ var resize = function(panel, config, cont) { lineHedH = scale * 5, // überschriften der linien lineStpH = scale * 4, // haltestellen der linien infoTtlH = scale * 6, // überschriften der informationen - infoMsgH = scale * 5; // die eigentliche nachricht der information + infoMsgH = scale * 5, // die eigentliche nachricht der information + // berechne string breite + timeWidth = getStringWidth((lineStpH-2), "00:00"), + delayWidth = getStringWidth((lineStpH-2), "+00"); + // setze linien überschriften größe $(lineHed).css('height', lineHedH + 'px'); $(lineHed).css('fontSize', (lineHedH-2) + 'px'); $(lineHed).css('lineHeight', lineHedH + 'px'); - $(lineLin).css('width', getStringWidth((lineHedH-2), "00000")); + $(lineLin).css('width', (timeWidth+delayWidth) + 'px'); // setze linien haltestellen größe $(lineStp).css('height', lineStpH + 'px'); @@ -182,8 +186,8 @@ var resize = function(panel, config, cont) { $(lineStp).css('lineHeight', lineStpH + 'px'); // setze zeit und delay breite - $(stopTme).css('width', getStringWidth((lineStpH-2), "00:00") + 'px'); - $(stopDly).css('width', getStringWidth((lineStpH-2), "+00") + 'px'); + $(stopTme).css('width', timeWidth + 'px'); + $(stopDly).css('width', delayWidth + 'px'); // setze info überschriften größe $(infoTtl).css('height', infoTtlH + 'px'); diff --git a/panels/departure/style.less b/panels/departure/style.less index 690ddae3c47e1288093e58762cfca59fd5ebe70c..e94afccea0aedaea802466fab6590842349ba227 100755 --- a/panels/departure/style.less +++ b/panels/departure/style.less @@ -23,13 +23,13 @@ [data-transport] { position: relative; - display: inline-table; + display: flex; width: 100%; white-space: nowrap; [data-line] { position: relative; - display: inline-table; + display: block; background-color: #FFFFFF; color: #0000A0; /*width: 10%;*/ @@ -40,7 +40,8 @@ [data-name] { position: relative; - display: inline-table; + display: block; + flex: 1; /* background-color: #0000A0; */ color: #FFFFFF; height: 100%; @@ -71,7 +72,7 @@ position: relative; height: 100%; overflow: hidden; - text-align: right; + text-align: left; padding: 0px 5px 0px 0px; font-weight: bold; color: #B8860B; @@ -80,6 +81,7 @@ [data-name] { position: relative; flex: 1; + padding-left: 5px; height: 100%; overflow: hidden; } diff --git a/panels/mensaPlan/script.js b/panels/mensaPlan/script.js index 78027a203952795a417c8b05f3e916fe1817a303..94390700616d675dc3da596010575d4f30f1e6f9 100755 --- a/panels/mensaPlan/script.js +++ b/panels/mensaPlan/script.js @@ -16,7 +16,7 @@ this.loaded = function(panel, config) { var day = new Date(); switch(day.getDay()){ case 0: - var gerichte = json.sonntag.gerichte; + var gerichte = json.montag.gerichte; break; case 1: var gerichte = json.montag.gerichte; @@ -34,7 +34,7 @@ this.loaded = function(panel, config) { var gerichte = json.freitag.gerichte; break; case 6: - var gerichte = json.samstag.gerichte; + var gerichte = json.montag.gerichte; break; } var tableBody = document.getElementById("mensaPlanTable1Body");