diff --git a/js/layoutloader.js b/js/layoutloader.js
index 042551c567df91b8de61a979cf53e0f9b2c86678..730b126670f17ea6263f2bd579fcc6c03b59a4f8 100755
--- a/js/layoutloader.js
+++ b/js/layoutloader.js
@@ -69,7 +69,11 @@ layout.createCycler = function (dom, panels, duration_, forceDuration) {
for (var i = 1; i <= panels.length; i++) {
var j = (i + panelIdx) % panels.length;
var panelDuration = panels[j].inner.checkShowCondition();
- if (panelDuration >= 0) {
+ if (panelDuration == 0) {
+ console.log("Layout: Panel skipped");
+ } else if(panelDuration < 0){
+ // TODO access default Duration
+ } else if (panelDuration > 0) {
gefunden = true;
panels[panelIdx].inner.hide();
@@ -83,13 +87,13 @@ layout.createCycler = function (dom, panels, duration_, forceDuration) {
var realDuration = (realForceDuration || (panelDuration == 0)) ? (panels[j].inner.json.duration || this.duration) : panelDuration;
panels[panelIdx].inner.show(realDuration);
- console.log(realDuration);
+ console.log("Layout: Panelduration " + realDuration);
interval = setTimeout(doTick.bind(c), realDuration * 1000);
break;
}
}
if (!gefunden) {
- layout.error("no panel found to show in cycler D: search again in " + layout.defaultCycleTime + " seconds");
+ console.error("Layout: No panel found to show in cycler. Try again in " + layout.defaultCycleTime + " seconds.");
interval = setTimeout(doTick.bind(c), layout.defaultCycleTime * 1000);
}
@@ -184,7 +188,7 @@ layout.processLayout = function (json, container) {
$(container).append(dom);
json.panels.forEach(function (subpanel) {
- console.log(subpanel);
+ console.log("Layout: Subpanel "+ subpanel);
var subcont = $("<div>").attr("data-container", "cycleContainer");
$(dom).append(subcont);
var subsubpanel = layout.processLayout(subpanel, subcont);
@@ -200,7 +204,7 @@ layout.processLayout = function (json, container) {
return thisCycler;
case "panel":
if (json.name == "") {
- layout.error(json);
+ console.error("Layout: " + json);
}
var innerDOM = $("<div>")
@@ -216,7 +220,7 @@ layout.processLayout = function (json, container) {
return panelWrapper;
default:
- layout.error(json);
+ console.error("Layout: " + json);
break;
}
}
@@ -267,7 +271,7 @@ layout.insertTemplate = function (wrap) {
try {
panel.js.hide.call(panel.js);
} catch (ex) {
- console.log("Layout: exception when running hide for " + panel.name + "\n" + ex);
+ console.log("Layout: Exception when running hide for " + panel.name + "\n" + ex);
}
}
//show function
@@ -334,12 +338,12 @@ layout.insertTemplate = function (wrap) {
}
var n = this.name;
$.get("panels/" + n + "/template.html", function (k) {
- console.log("get success of template " + n)
+ console.log("Layout: Get success for template " + n + ".")
e.template = k;
doMore();
}, "text")
.fail(function () {
- layout.error("get fail of template " + n);
+ console.error("Layout: Get failed for template " + n + ".");
});
@@ -347,26 +351,26 @@ layout.insertTemplate = function (wrap) {
t.css.on("load", function () {
- console.log("get success of style " + n);
+ console.log("Layout: Get success for style " + n + ".");
e.css = t.css;
doMore();
});
/*.fail(function() {
- layout.error("get fail of style " + n);
+ console.error("Layout: Get fail for style " + n + ".");
});*/
$("head").append(t.css);
$.get("panels/" + n + "/script.js", function (k) {
- console.log("get success of script " + n)
+ console.log("Layout: Get success for script " + n + ".")
e.js = k;
doMore();
}, "text")
.fail(function (e) {
- layout.error("get fail of script " + n);
- console.log(e);
+ console.error("Layout: Get fail for script " + n + ".");
+ console.log("Layout: " + e);
});
}
@@ -376,7 +380,7 @@ layout.insertTemplate = function (wrap) {
layout.loadLayout = function (layoutname) {
var w = "config/layouts/" + layoutname + ".json";
- console.log(w);
+ console.log("Layout: " + w);
$.get(w, function (e) {
var mainLayout = layout.processLayout(e, $("[data-container=main]"));
@@ -391,11 +395,6 @@ layout.loadLayout = function (layoutname) {
}
}).fail(function () {
- layout.error("get fail");
+ console.error("Layout: Get fail");
});
}
-
-
-layout.error = function (e) {
- console.error("Layout: Error " + e);
-}
diff --git a/panels/clock/script.js b/panels/clock/script.js
index 2ca8bed6e4613d9682fa3149421eeb16a1101b81..c3fd23261c54a97612211338b76fcff4a4c19952 100755
--- a/panels/clock/script.js
+++ b/panels/clock/script.js
@@ -292,7 +292,6 @@ this.loaded = function(panel, config) {
renderAnalBackground = function() {
abgc.fillStyle = bgColor;
- console.log(analBGImg);
var
bc = document.createElement('canvas'),
steps = Math.ceil(Math.log(analBGImg.width / (analogRad * 2)) / Math.log(2)) - 1,
diff --git a/panels/departure/script.js b/panels/departure/script.js
index 75fd5f9a19619b685083df503c64f5f2ca35329d..6717c732494197bd24c922faa7f63de69e8a532e 100755
--- a/panels/departure/script.js
+++ b/panels/departure/script.js
@@ -34,7 +34,7 @@
*/
this.loaded = function(panel, config) {
- console.log("departures: register with config [" + config + "]");
+ console.log("Departure: register with config [" + config + "]");
// TODO load config
var
tplDeparture = $(panel).find('template[data-departure]').html(),
@@ -61,10 +61,10 @@ this.loaded = function(panel, config) {
}
var update = function(config, fields) {
- console.log("departures: get data [" + config + "]");
+ console.log("Departure: get data [" + config + "]");
$.get("panels/departure/departures.php?config=" + config , function(decodedData) {
- console.log("departures: check vrrf errors [" + config + "]");
+ console.log("Departure: check vrrf errors [" + config + "]");
if (!!decodedData.errors) {
var msg = "";
for (var i in decodedData.errors) {
@@ -80,7 +80,7 @@ var update = function(config, fields) {
$(fields.vrrf.msge).css("display", "none");
}
- console.log("departures: check error [" + config + "]");
+ console.log("Departure: check error [" + config + "]");
if (!!decodedData.error) {
$(fields.erro.ttle).html('InfoBoard - Error');
$(fields.erro.msge).html(decodedData.error);
@@ -90,7 +90,7 @@ var update = function(config, fields) {
$(fields.erro.msge).css("display", "none");
}
- console.log("departures: check information [" + config + "]");
+ console.log("Departure: check information [" + config + "]");
if (!!decodedData.info) {
$(fields.info.ttle).html('Information');
$(fields.info.msge).html(decodedData.info);
@@ -101,7 +101,7 @@ var update = function(config, fields) {
//$(fields.info.msge).css("display", "none");
}
- console.log("departures: updating elements [" + config + "]");
+ console.log("Departure: updating elements [" + config + "]");
if (!!decodedData.lines) {
for (var i = 0; i < 20; ++i) {
var
@@ -211,7 +211,7 @@ var getStringWidth = function(fontSize, string) {
}
var generate = function(config, stations, departs, tplDeparture, tplStop, tplMsg) {
- console.log("departures: generating structure [" + config + "]");
+ console.log("Departure: generating structure [" + config + "]");
var
buffer = null,
fields = {
@@ -279,7 +279,7 @@ var generate = function(config, stations, departs, tplDeparture, tplStop, tplMsg
}
var buildDOM = function(config, fields) {
- console.log("departures: building dom [" + config + "]");
+ console.log("Departure: building dom [" + config + "]");
var elements = [];
elements.push(fields.info.self);
elements.push(fields.erro.self);
diff --git a/panels/lsfView/script.js b/panels/lsfView/script.js
index 6563a80f0f6c4f8a1e4b3ab7ff4bac0edd193b08..257edaeb92b3e01ec33bc9db6f0dea9b61f01d67 100755
--- a/panels/lsfView/script.js
+++ b/panels/lsfView/script.js
@@ -14,7 +14,7 @@ this.checkShowCondition = function() {
return 0;
} else {
console.log("LSF-View: Out Of Time");
- return 0; //Skip Panel?
+ return 0; //Skip Panel
}
}
@@ -31,7 +31,7 @@ this.loaded = function(panel, config) {
fillTable(lsfViewJson);
}).fail(function(jqxhr, textStatus, error) {
var err = textStatus + ", " + error;
- console.log("Request Failed: " + err);
+ console.error("LSF-View: Request Failed: " + err);
});
}
diff --git a/panels/mensaPlan/script.js b/panels/mensaPlan/script.js
index a68ac408a278991b7f9f3dfdd21761ae7a10b91d..010bd982a136475c5676b1f2d83b15db381c1ee5 100755
--- a/panels/mensaPlan/script.js
+++ b/panels/mensaPlan/script.js
@@ -43,7 +43,7 @@ this.loaded = function(panel, config) {
fillTable(json);
}).fail(function(jqxhr, textStatus, error) {
var err = textStatus + ", " + error;
- console.log("Request Failed: " + err);
+ console.error("MensaPlan: Request Failed: " + err);
});
}
diff --git a/panels/ufc/script.js b/panels/ufc/script.js
index 4ebd978ebb721455daa1e5df89348bdd06a9e275..3361e08541525712aa2ab3905cca97c398ab25d5 100755
--- a/panels/ufc/script.js
+++ b/panels/ufc/script.js
@@ -55,7 +55,7 @@ this.show=function() {
film = semester[film];
if (new Date(film.date).getTime() > now) {
nextMovie = film;
- console.log(film);
+ console.log("UFC: " + film);
break;
}
}
diff --git a/panels/werbung/script.js b/panels/werbung/script.js
index 9613dedf82193ac49aa0904d2d6370efc5966a40..2e98c0ede1d7fb55eb956150c9859f7fd78648e9 100755
--- a/panels/werbung/script.js
+++ b/panels/werbung/script.js
@@ -36,7 +36,6 @@ this.checkShowCondition = function() {
setNextWerbung()
}
while(nextWerbung != werbungOriginalNext){
- console.log("Werbung: IN LOOP");
enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
if(Date.now() <= Date.UTC(enddateEl[2], enddateEl[1], enddateEl[0])) {
return 20;