Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

templates/client/static_client/js/rejs/banners.js

@@ -59,18 +59,37 @@
         var parent = document.getElementById(banner.id);
 
         if (parent) {
-            if (banner.is_img) {
-                var a = document.createElement("a");
-                a.href = banner.url;
-
-                var img = document.createElement("img");
-                img.src = banner.img;
-                img.alt = banner.alt;
-
-                a.appendChild(img);
-                parent.appendChild(a);
-            } else if (banner.is_html) {
-                parent.innerHTML = banner.text;
+            if (banner.is_popup) {
+                if (banner.is_img) {
+                    parent.innerHTML =
+                        "<header class=\"clearfix\"><div class=\"pw-title\"></div></header><div class=\"pw-body clearfix\">" +
+                        "<a href=\""+ banner.url + "\"><img src=\"" + banner.img + "\" alt=\"" + banner.alt + "\" /></a></div>";
+                } else if (banner.is_html) {
+                    parent.innerHTML = banner.text;
+                }
+
+                $("#expo-form-popup").on("submit", function(e) {
+                    e.preventDefault();
+                    window.location = $("#expo-form-popup").attr("action");
+                });
+
+                setTimeout(function(){
+                    $.fancybox.open([{"href": "#" + banner.id}], {});
+                }, 5000);
+            } else {
+                if (banner.is_img) {
+                    var a = document.createElement("a");
+                    a.href = banner.url;
+
+                    var img = document.createElement("img");
+                    img.src = banner.img;
+                    img.alt = banner.alt;
+
+                    a.appendChild(img);
+                    parent.appendChild(a);
+                } else if (banner.is_html) {
+                    parent.innerHTML = banner.text;
+                }
             }
         }