(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 865570c411bb92287ad851446e683fc5a40c2071..290ca4c6856e37107f88cd69fe8c00a5646d59e0 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -239,11 +239,9 @@ class wsUrl {
                $res.='<a href="#" id="newGroup">' . $core->typo->Ajouter(__('Nouveau groupe')) . '</a><br /><br />';\r
                $res .= '<ul>';\r
 \r
-\r
                $dao = new wsDAOCollection($core->con);\r
                $books = $dao->getPublications($collection->collection_id);\r
 \r
-\r
                $datas = $collection->datas;\r
                $datas['new_'] = $dao->_emptyGroup();\r
 \r
@@ -301,7 +299,6 @@ class wsUrl {
                $res.='<tr><td class="min nowrap">' . __('Certificat APNS') . ' Prod (' . __('Fichier .pem') . ')</td><td><input type="file" name="apns_prod" /></td></tr>';\r
                $res.='</table>';\r
 \r
-\r
                $res.='<h3>' . __('Thème') . '</h3>';\r
                $res.='<table class="max">';\r
                $images = array('back' => __('Image de fond'), 'etagere' => __("Image de l'étagère"), 'icon' => __("Icône de l'application") . ' (1024x1024px)', 'splash' => __('Ecran de lancement') . ' (2048x2048px)');\r
@@ -310,7 +307,6 @@ class wsUrl {
                }\r
                $res.='</table>';\r
 \r
-\r
                $res.='<a href="#" class="submit right">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>';\r
                $res.='</form>';\r
                $res.='<p class="clear"></p>';\r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 2180570a017ecdaa5693508170127ad12ea1ddce..d8983693f56b3b0d536f046bf1936cf970c10a60 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -180,6 +180,7 @@ class wsExporter {
 
                $packager = new wsPackagerPhonegap($this->book_id, $d, true, false, $this->version);
                $packager->ignoreCache = false;
+               $packager->home=true;
                return $packager->makePackage(false);
        }
 

diff --git a/inc/ws/Util/packager/class.ws.packager.phonegap.php b/inc/ws/Util/packager/class.ws.packager.phonegap.php
index 52b5276f1c00e35836f923271a5cfc4ccd286409..4b61d3c70afbf19b70b1de46a32c05c4835a6490 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.phonegap.php
+++ b/inc/ws/Util/packager/class.ws.packager.phonegap.php
@@ -7,6 +7,7 @@ class wsPackagerPhonegap extends wsPackager {
        protected $os = 'all';
        protected $supportedOS = array('ios', 'android');
        public $ignoreCache = true;
+       public $home = false;
 
        public function __construct($book_id, $vdir = null, $whole = true, $makeResources = true, $os = 'all') {
                $this->makeResources = $makeResources;
@@ -30,7 +31,7 @@ class wsPackagerPhonegap extends wsPackager {
                                $vdir.='/' . $os;
                        }
 
-                       $compiler = wsHTML5Compiler::factory($this->book_id, null, $os, 'latest', $vdir,false,!$this->ignoreCache);
+                       $compiler = wsHTML5Compiler::factory($this->book_id, null, $os, 'latest', $vdir, false, !$this->ignoreCache, $this->home);
                        $compiler->compile();
 
                        unlink($vdir . '/indext.html');