diff --git a/config/layouts/default.json b/config/layouts/default.json new file mode 100755 index 0000000000000000000000000000000000000000..6ff84303fe68fa34627046cb8b1815c6b5db726c --- /dev/null +++ b/config/layouts/default.json @@ -0,0 +1,83 @@ +{ + "type": "xsplit", + "cut": 35, + "left": { + "type": "panel", + "name": "departure", + "config": "oh14" + }, + "right": { + "type": "ysplit", + "cut": 30, + "up": { + "type": "panel", + "name": "clock" + }, + "down": { + "type": "cycler", + "duration": 5, + "panels": [ + { + "type": "panel", + "name": "werbung", + "config": { + "files": [ + { + "filename": "OpenSourceInfoscreen.jpg", + "startdate": "NEVER", + "enddate": "NEVER" + }, + { + "filename": "Folie1.png", + "startdate": "NEVER", + "enddate": "11.11.2017" + }, + { + "filename": "Folie2.png", + "startdate": "NEVER", + "enddate": "11.11.2017" + }, + { + "filename": "Folie3.png", + "startdate": "NEVER", + "enddate": "11.11.2017" + }, + { + "filename": "Folie4.png", + "startdate": "NEVER", + "enddate": "11.11.2017" + }, + { + "filename": "MK_DD_Poster_quer.png", + "startdate": "NEVER", + "enddate": "16.12.2017" + }, + { + "filename": "Hackathon2017.png", + "startdate": "NEVER", + "enddate": "9.12.2017" + }, + { + "filename": "xmas17small.png", + "startdate": "NEVER", + "enddate": "15.12.2017" + } + ] + } + }, + { + "type": "panel", + "name": "ufc" + }, + { + "type": "panel", + "name": "mensaPlan" + }, + { + "type": "panel", + "name": "lsfView" + } + ] + } + } +} diff --git a/index.html b/index.html index 64b48a12a2b3d54e970b3060f6c0e829ec81a557..030ef8946edda1263190735a7961de0ffdb6bc4c 100755 --- a/index.html +++ b/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="css/design.less"/> - <link rel="stylesheet" href="css/marquee.less"/> + <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/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> diff --git a/js/layoutloader.js b/js/layoutloader.js index 730b126670f17ea6263f2bd579fcc6c03b59a4f8..4191c0c11cd03178f9cca41b3964e2a7bffe410f 100755 --- a/js/layoutloader.js +++ b/js/layoutloader.js @@ -347,7 +347,7 @@ layout.insertTemplate = function (wrap) { }); - t.css = $("<link>").attr("rel", "stylesheet").attr("href", "panels/" + n + "/style.less").attr("data-template", t.name); + t.css = $("<link>").attr("rel", "stylesheet").attr("href", "less/style.php?name=panels/" + n + "/style.less").attr("data-template", t.name); t.css.on("load", function () { diff --git a/panels/ufc/script.js b/panels/ufc/script.js index 193d566b355d1f6d0fe6b78831ef00e18e457dd7..217c705589e138ff640b7b799a9b0f0c670988a5 100755 --- a/panels/ufc/script.js +++ b/panels/ufc/script.js @@ -13,7 +13,7 @@ this.loaded=function(panel,config) { } else { semesterString = "winter"+new Date().getFullYear(); } - $.ajax("https://ufc.tu-dortmund.de/semesters/"+semesterString+".json",{ + $.ajax("https://ufc.tu-dortmund.de/semesters/current.json",{ async:false }) .done(function(e) {