(no commit message)

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 7a2b9d70bba8d15d01f25034400c60ac53cc90de..77931327ebcac7119a87444f98baa1d4e8f5c964 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -28,11 +28,10 @@ class wsExporter {
                $phonegap->setId($collection->settings['namespace']);
                $phonegap->setAuthor('Fluidbook', 'contact@fluidbook.com', 'http://www.fluidbook.com');
                $phonegap->setVersion('1.0.0');
-               $phonegap->setIcon($compiler->wdir . '/' . $collection->theme['icon']);
                foreach ($compiler->langs as $l) {
                        $src = $compiler->wdir . '/' . $collection->theme['splash_' . $l];
-                       $phonegap->setSplash($src);
-                       break;
+                       $phonegap->setSplash($src, $l);
+                       $phonegap->setIcon($compiler->wdir . '/' . $collection->theme['icon'], $l);
                }
                $phonegap->setWWWDirectory($dir);
                if ($os == 'ios') {
@@ -44,6 +43,7 @@ class wsExporter {
                $phonegap->setPreference('target-device', CubeIT_Mobile_Phonegap::TARGET_TABLET);
                $phonegap->setPreference('show-splash-screen-spinner', false);
                $phonegap->setPreference('auto-hide-splash-screen', false);
+               $phonegap->setPreference('ios-statusbarstyle', CubeIT_Mobile_Phonegap::BARSTYLE_TRANSLUCENT);
                $phonegap->addFeatures(array(
                        CubeIT_Mobile_Phonegap::FEATURE_CONNECTION,
                        CubeIT_Mobile_Phonegap::FEATURE_DEVICE,
@@ -54,7 +54,9 @@ class wsExporter {
                        CubeIT_Mobile_Phonegap::FEATURE_INAPPBROWSER,
                        CubeIT_Mobile_Phonegap::FEATURE_SPLASHSCREEN,
                        CubeIT_Mobile_Phonegap::FEATURE_GLOBALIZATION,
-                       CubeIT_Mobile_Phonegap::FEATURE_PUSHNOTIFICATION
+                       CubeIT_Mobile_Phonegap::FEATURE_PUSHNOTIFICATION,
+                       CubeIT_Mobile_Phonegap::FEATURE_DEBUG,
+                       CubeIT_Mobile_Phonegap::FEATURE_EXTERNALFILEUTIL
                                )
                );
 

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 3f1834c18ff297b6a5e70c820beb7e68465cbc08..2ebb0de3b92aff144ce0e6de6c4815334df02aa2 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
@@ -110,6 +110,10 @@ class wsHTML5AppCompiler {
                $this->vdir = $this->dir = WS_COLLECTIONS . '/app/' . $this->collectionId . '/';
                $this->wdir = WS_COLLECTIONS . '/working/' . $this->collectionId;
                $this->sdir = WS_COMPILE_ASSETS . '/_html5app/';
+               
+               if(file_exists($this->vdir)){
+                       
+               }
 
                $this->copyRecursive($this->sdir, $this->vdir);
 
@@ -126,8 +130,6 @@ class wsHTML5AppCompiler {
                $config['couleurA'] = $this->collection->settings['couleurA'];
                $config['couleurB'] = $this->collection->settings['couleurB'];
                $config['couleurC'] = $this->collection->settings['couleurC'];
-
-               $this->copy(WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap/' . $this->phonegapVersion . '/cordova-' . $this->os . '.js', $this->vdir . '/js/cordova.js');
                file_put_contents($this->vdir . '/data/app.js', 'DATAS = ' . CubeIT_Util_Json::encode($config) . ';');
        }
 

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 2018bb8469afbde06f0618ae4f83d90350aed953..189c75fffbc021db349d80698b483e6a9eca2900 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -21,13 +21,13 @@ class wsHTML5Compiler {
        protected $maxRes = 300;
        protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');
        public $jsFiles = array(
+               'js/libs/modernizr/modernizr.js',
+               'js/libs/modernizr/tests.js',
                'js/libs/fix/ios-orientation.js',
                'js/libs/fix/detect-zoom.js',
                'js/libs/cube/fb.js',
                'js/libs/cube/util.js',
                'js/libs/fastclick/fastclick.js',
-               'js/libs/modernizr/modernizr.js',
-               'js/libs/modernizr/tests.js',
                'js/libs/json2.js',
                'js/libs/flashdetect.js',
                'js/libs/screenfull.js',
@@ -1023,18 +1023,18 @@ class wsHTML5Compiler {
                $res[] = $shade;
 
                // Search field
-               $searchColor=self::colorToCSS($this->theme->parametres->couleurS);
-               $searchBackColor=self::colorToCSS($this->theme->parametres->searchFieldColor);
+               $searchColor = self::colorToCSS($this->theme->parametres->couleurS);
+               $searchBackColor = self::colorToCSS($this->theme->parametres->searchFieldColor);
                $search = '#q{';
-               $search.='color:' .$searchColor  . ';';
+               $search.='color:' . $searchColor . ';';
                $search.='background-color:' . $searchBackColor . ';';
                if ($this->theme->parametres->searchShadeAlpha > 0) {
                        $search.=self::writeCSSUA('box-shadow', '1px 1px 4px rgba(0,0,0,' . ($this->theme->parametres->searchShadeAlpha / 100) . ')') . ' inset;';
                }
                $search.='}';
-               $search.='#searchHints,.hint{color:'.$searchColor.';background-color:'.$searchBackColor.';}';
-               $search.='.hint:hover{color:'.$searchBackColor.';background-color:'.$searchColor.';}';
-                               
+               $search.='#searchHints,.hint{color:' . $searchColor . ';background-color:' . $searchBackColor . ';}';
+               $search.='.hint:hover{color:' . $searchBackColor . ';background-color:' . $searchColor . ';}';
+
                $res[] = $search;
 
                // Background