wip #3375 @2

diff --git a/framework/application/views/helpers/BackgroundBlock.php b/framework/application/views/helpers/BackgroundBlock.php
index dead3212eaef6214f1730c35cce44dcd508062ab..3be23e454ec1373f4976ee733ffe80db67d23c87 100644 (file)
--- a/framework/application/views/helpers/BackgroundBlock.php
+++ b/framework/application/views/helpers/BackgroundBlock.php
@@ -35,7 +35,7 @@ class Fluidbook_View_Helper_BackgroundBlock extends CubeIT_View_Helper_Abstract
                 // Image will be cropped to 900px wide so ensure that we have 45% extra and then determine the target height\r
                 $target_height = ($mobile_max_width / 0.55) * $image_ratio;\r
 \r
-                if (stripos($image_path, '.oam') !== false) {\r
+                if (stripos($image_path, '.oam') !== false || stripos($image_path, '.zip') !== false) {\r
                     if (!isset($data['backgroundmobileimage'])) {\r
                         $pict = $this->view->imageCms($image_path);\r
                     } else {\r

diff --git a/js/002-common.js b/js/002-common.js
index 8c16c807f2d46039d032bb5155dad0cf77188649..c06956559a79c80f8d7660b9996897b051f3847b 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -115,7 +115,7 @@ function resize() {
 }\r
 \r
 function resize_oam() {\r
-    $('iframe.oam').each(function () {\r
+    $('iframe.oam,iframe.zip').each(function () {\r
         var p = $(this).parent();\r
         var pw = $(p).outerWidth();\r
         var ph = $(p).outerHeight();\r

diff --git a/less/002-common.less b/less/002-common.less
index 2d3814905d46d9cfe5cff340c304f676e4853710..c7a36697a89ad7812716b290d239e034b5aa47a8 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -144,7 +144,7 @@ a {
       width: 100%;\r
       height: 100%;\r
 \r
-      iframe.oam {\r
+      iframe.oam, iframe.zip {\r
         position: absolute;\r
       }\r
     }\r
@@ -162,7 +162,7 @@ a {
       }\r
     }\r
 \r
-    iframe.oam {\r
+    iframe.oam, iframe.zip {\r
       overflow: hidden;\r
       pointer-events: none;\r
       transform-origin: 0 0 0;\r