fix #1957 @1

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 88f2f6403fbc3da1c259af0653435d0f662122d0..0505a4dbf472f3f55bc4dde23d0c766318c776b6 100644 (file)
--- 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 eebdb5975615eff7298d7fa637ba56ed90e93ae7..af350ae197be8254566a75a8e7ef7f9b5bc9dba8 100644 (file)
--- 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 77a8d4d81edb50f94c0f73beff78cd88e2814486..5585ecbd5bdb51ed0f98a6e812ffb774b681ffc2 100644 (file)
--- 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 a35a02df0d891dbe0a6705d21d94e48d733ad56c..9d8d3721abd5c2ee8f2b804ee648025fa7afddfc 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -91,7 +91,7 @@
   <!-- Executed before build -->\r
   <preBuildCommand />\r
   <!-- Executed after build -->\r
-  <postBuildCommand alwaysRun="False">"C:\ProgramData\chocolatey\lib\kitty\tools\kscp.exe" -agent -batch "$(OutputDir)\$(OutputName)" extranet@extranet.cubedesigners.com:/home/extranet/www/swf</postBuildCommand>\r
+  <postBuildCommand alwaysRun="False">"C:\ProgramData\chocolatey\lib\kitty\tools\kscp.exe" -agent -batch "$(OutputDir)\$(OutputName)" extranet@alien.cubedesigners.com:/home/extranet/www/swf</postBuildCommand>\r
   <!-- Other project options -->\r
   <options>\r
     <option showHiddenPaths="False" />\r