*fixed PanelSkip *Pretty Log

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