From 3b0a13f0e942204b774995e435cca2e0fe214e42 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 6 Mar 2018 14:45:46 +0000
Subject: [PATCH] fix #1957 @1

---
 inc/ws/Util/class.ws.exporter.php                     | 2 +-
 inc/ws/Util/html5/app/class.ws.html5.app.compiler.php | 2 +-
 inc/ws/Util/html5/master/class.ws.html5.links.php     | 3 ++-
 swf/_src/WSComposer.as3proj                           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 88f2f6403..0505a4dbf 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -72,6 +72,7 @@ class wsExporter {
 			$phonegap->setMainDir(WS_COMPILE_ASSETS . '/_html5app/_android/');
 			$phonegap->addLibrary(WS_COMPILE_ASSETS . '/_html5app/_android/lib');
 			$phonegap->addLibrary(array('from' => WS_COMPILE_ASSETS . '/_html5app/_android/fluidbook-dependencies', 'to' => '/fluidbook-dependencies'));
+			$phonegap->addLibrary(array('from' => WS_COMPILE_ASSETS . '/_html5app/_android/res', 'to' => '/res'));
 			$phonegap->setDistantCompiler(self::VINCENT, 'Vincent', 's77vpo*wu5', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY);
 			$phonegap->setSourceVariables(array('background' => '0xff' . $collection->settings['couleurD'],
 			                                    'orientation' => $collection->settings['orientation'])
@@ -451,7 +452,6 @@ class wsExporter {
 		$cl = new CubeIT_CommandLine_Rsync($src, $dest, $erase);
 		$cl->setProg('/usr/bin/rsync');
 		$cl->execute();
-		//$cl->debug();
 		if (!is_null($chown)) {
 			`chown -R $chown $dest`;
 		}
diff --git a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
index eebdb5975..af350ae19 100644
--- a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
+++ b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
@@ -231,7 +231,7 @@ class wsHTML5AppCompiler {
 
 		$svg = array('interface-back-arrow');
 		foreach ($svg as $icon) {
-			wsTools::colorizeAndRasterizeIcon(1, $icon, $text, $this->vdir . '/images/', $w, $h);
+			wsTools::colorizeAndRasterizeIcon(1, $icon, $text, $this->vdir . '/images/', 4, $w, $h);
 		}
 
 
diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 77a8d4d81..5585ecbd5 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -390,6 +390,7 @@ class htmlMultimediaPopupImage extends normalLink {
 
 
 	public function getAdditionnalContent() {
+		$res = parent::getAdditionnalContent();
 		$dim = getimagesize($this->wdir . '/' . $this->alternative);
 
 		$markup = '<div class="multimediaContainer "><img data-width="' . $dim[0] . '" data-height="' . $dim[1] . '" src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $dim[0] . '" height="' . $dim[1] . '" class="multimedia" /></div>';
@@ -397,7 +398,7 @@ class htmlMultimediaPopupImage extends normalLink {
 		if ($this->read_mode) {
 			$read = ' data-readmode="1"';
 		}
-		return $read . ' data-multimedia="' . rawurlencode($markup) . '" ';
+		return $res . ' ' . $read . ' data-multimedia="' . rawurlencode($markup) . '" ';
 	}
 
 	public function keep() {
diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index a35a02df0..9d8d3721a 100644
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -91,7 +91,7 @@
   <!-- Executed before build -->
   <preBuildCommand />
   <!-- Executed after build -->
-  <postBuildCommand alwaysRun="False">"C:\ProgramData\chocolatey\lib\kitty\tools\kscp.exe" -agent -batch "$(OutputDir)\$(OutputName)" extranet@extranet.cubedesigners.com:/home/extranet/www/swf</postBuildCommand>
+  <postBuildCommand alwaysRun="False">"C:\ProgramData\chocolatey\lib\kitty\tools\kscp.exe" -agent -batch "$(OutputDir)\$(OutputName)" extranet@alien.cubedesigners.com:/home/extranet/www/swf</postBuildCommand>
   <!-- Other project options -->
   <options>
     <option showHiddenPaths="False" />
-- 
2.39.5