(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index f333abff5fe94230001a6a9e8edaf7904f0e1382..fe0496b45a9695379c2c8e7f86b3fb4b3a82efeb 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -253,13 +253,15 @@ class wsBookParametres extends wsParametres {
                $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));\r
 \r
                $this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Utiliser les icônes vectorielles'));\r
+               $this->fields['mobileServerConfig'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Inclure les fichiers de configuration serveur'), 'grade' => 5);\r
 \r
                $this->fields['mobilePlugins'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Plugin'), 'grade' => 5);\r
 \r
                $this->fields['mobileVideosPath'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Chemin vers les vidéos'), 'grade' => 5);\r
 \r
+\r
                $this->forms['mobile'] = array('label' => __('Version mobile'),\r
-                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'mobileIconVector', 'mobilePlugins', '|', 'mobileVideosPath'));\r
+                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath'));\r
 \r
                $this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');\r
                $this->fields['phonegapVersion'] = array('type' => 'text', 'default' => '1.0.0', 'editable' => true, 'label' => __("Version de l'application"), 'grade' => 5, 'hint' => __('De la forme') . ' 1.2.3');\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 8bcbd734c4f8714b15100caa13eb23fde84f8227..2574ec83bb6ec2bdc230bd7b5a3d216747aee8b4 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -666,9 +666,10 @@ class wsHTML5Compiler {
                foreach ($this->additionalConfig as $k => $v) {
                        $this->config->$k = $v;
                }
-               if($this->phonegap){
-                       $this->config->twitter=$this->config->facebook=false;
+               if ($this->phonegap) {
+                       $this->config->twitter = $this->config->facebook = false;
                }
+               $this->config->standalone = $this->phonegap;
                return 'var DATAS=' . json_encode($this->config) . ';' . "\n";
        }
 

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 0554ac599156c377fca3fc82af4d56814c690bd4..4a2771928ccd582346cddb1970f057d68e4edc71 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -197,7 +197,9 @@ class wsPackagerHTML extends wsPackager {
                $cp->setArg(null, $dest);\r
                $cp->execute();\r
 \r
-               $filesToAdd = array('.htaccess', 'web.config');\r
+               if ($this->book->parametres->mobileServerConfig) {\r
+                       $filesToAdd = array('.htaccess', 'web.config');\r
+               }\r
                foreach ($filesToAdd as $f) {\r
                        $this->copy(WS_COMPILE_ASSETS . '/_html5/' . $f, $dest . '/' . $f);\r
                }\r