Merge branch 'dev'

config/layouts/default.json

@@ -24,7 +24,12 @@
         {
           "type": "panel",
           "name": "mensaPlan"
-        }
+        },
+	{
+	  "type": "panel",
+	  "name": "werbung",
+	  "config": "ophase_party_1617.jpg"
+	}
       ]
     }
   }

panels/werbung/script.js

 var lastWerbung=0;
-var werbung_img = ["reality1.png", "reality2.png"];
+var werbung = null;
 var werbung_img_display = null;
 this.loaded=function(panel,config) {
-	werbung_display= $(panel).find("#werbung_display");
+	$(panel).find("#werbung_display").attr("src", config);
 }
 
 this.show=function() {
-	if (lastWerbung+1==werbung_img.length) {
-		lastWerbung=0;
-	} else {
-		lastWerbung += 1;
-	}
-	var img = "/panels/werbung/img/" + werbung_img[lastWerbung];
-	werbung_display.attr("src", img);
 }
 
 this.resize=function() {