Merged in dev (pull request #11)

Dev

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">

panels/departure/config/oh14.json

@@ -10,9 +10,9 @@
             "type": [
                 "H-Bahn"
             ],
-	    "destination": [
-		"Dortmund Otto-Hahn-Straße"
-		]
+	    	"destination": [
+			"Dortmund Otto-Hahn-Straße"
+			]
         }
     }
 }

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');

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;
 				}

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");