From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 22 Aug 2013 14:14:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c98ab8020e6072cc81ff331a8e2278742083edce;p=cubeextranet.git

---

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index f5302fc4c..71ef634d2 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -497,8 +497,8 @@ class htmlMultimediaLink extends wsHTML5Link {
 			$w = $this->width * $this->getCssScale();
 			$h = $this->height * $this->getCssScale();
 
-			$iw = $this->_config['width'] * $this->getCssScale();
-			$ih = $this->_config['height'] * $this->getCssScale();
+			$iw = $this->_config['width'];
+			$ih = $this->_config['height'];
 
 			$res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $d['fdir'] . '/' . $this->_config['html'] . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>';
 			$this->copyExternalDir($d['dir']);
@@ -517,9 +517,23 @@ class htmlMultimediaLink extends wsHTML5Link {
 		}
 	}
 
+	public function getCSSContainer() {
+		if (!($this instanceof contentLink) && $this->page % 2 == 1) {
+			$this->page--;
+			$this->left+=$this->compiler->width;
+		}
+
+		$css = '#l_' . $this->id . '{';
+		$css.='left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;';
+		$css.='width:' . $this->_config['width'] . 'px;height:' . $this->_config['height'] . 'px;';
+		$css.=$this->getCSS();
+		$css.='}';
+		return $css;
+	}
+	
 	public function getCSS() {
-		$sx = $this->width / ($this->_config['width'] * $this->getCssScale());
-		$sy = $this->height / ($this->_config['height'] * $this->getCssScale());
+		$sx = ($this->width / ($this->_config['width'])) * $this->getCssScale();
+		$sy = ($this->height / ($this->_config['height'])) * $this->getCssScale();
 
 		$res = wsHTML5Compiler::writeCSSUA('transform', 'scale(' . $sx . ',' . $sy . ')');
 		$res.= wsHTML5Compiler::writeCSSUA('transform-origin', '0% 0%');