Merge branch 'master' of bitbucket.org:FsInformatikDortmund/infoscreen

config/layouts/default.json

@@ -18,6 +18,9 @@
 			"duration": 5,
 			"panels": [
 				{
+					"type": "panel",
+					"name": "mensaPlan"
+				},{
 					"type": "panel",
 					"name": "werbung",
 					"config": {

index.html

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="favicon.png" type="image/x-icon" rel="icon"/>
     <link rel="stylesheet" href="css/font.css"/>
-    <link rel="stylesheet" href="less/style.php?name=css/design.less"/>
-    <link rel="stylesheet" href="less/style.php?name=css/marquee.less"/>
+    <link rel="stylesheet" href="css/design.css"/>
+    <link rel="stylesheet" href="css/marquee.css"/>
     <link rel="stylesheet" href="css/jquery.ui.css"/>
     <script type="text/javascript" src="js/jquery-2.1.4.min.js"></script>
     <script type="text/javascript" src="js/jquery-ui.min.js"></script>

js/layoutloader.js

@@ -347,7 +347,7 @@ layout.insertTemplate = function (wrap) {
                 });
 
 
-            t.css = $("<link>").attr("rel", "stylesheet").attr("href", "less/style.php?name=panels/" + n + "/style.less").attr("data-template", t.name);
+            t.css = $("<link>").attr("rel", "stylesheet").attr("href", "panels/" + n + "/style.css").attr("data-template", t.name);
 
 
             t.css.on("load", function () {