(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 3138295ad401ca2c8581537bebc1130b944c0494..465b436f6c4a66b1d281acd5409fe1ee55520578 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -294,6 +294,7 @@ class wsUrl {
                        $res.='<h3>' . __('Contenus') . ' [' . $l . ']</h3>';
                        $res.='<table class="max">';
                        $res.='<tr><td class="min nowrap">' . __('Titre') . '</td><td>' . form::field(array('contents[' . $l . '][titre]', 'contents_' . $l . '_titre'), 64, 64, $collection->contents[$l]['titre']) . '</td></tr>';
+                       $res.='<tr><td class="min nowrap">' . __("Titre sur l'écran d'accueil") . '</td><td>' . form::field(array('contents[' . $l . '][titrehome]', 'contents_' . $l . '_titrehome'), 64, 64, $collection->contents[$l]['titrehome']) . '</td></tr>';
                        $res.='<tr><td class="min nowrap">' . __('A propos') . '</td><td>' . form::textarea(array('contents[' . $l . '][apropos]', 'contents_' . $l . '_apropos'), 60, 10, $collection->contents[$l]['apropos']) . '</td></tr>';
                        //'splash' =>
                        $res.='<tr><td class="min nowrap">' . __('Ecran de lancement') . ' (2048x2048px)</td><td><input type="file" name="splash_' . $l . '" />' . form::hidden(array('theme[splash_' . $l . ']', 'splash_' . $l), $collection->theme['splash_' . $l]) . '</td></tr>';
@@ -1689,6 +1690,7 @@ html{height:100%}' . "\n";
                commonDroits::min(3);
                $settings = is_null($settings) ? $core->user->getSettings('clients_ws') : $settings;
                $change = is_null($dashboard) ? 'Client' : 'Dashboard/' . $dashboard;
+
                $dao = new commonDAOEntreprise($core->con);
                if (isset($settings['search']) && !is_null($settings['search'])) {
                        $dao->setSearch($settings['search']);

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index fd5a373d8d0f02200cd376f12591968b58126337..5967e78b9dca79259f254730e1bd6d00249d1090 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -46,11 +46,15 @@ class wsExporter {
                $phonegap->setNamespace($collection->settings['namespace']);
                $phonegap->setActivity($collection->settings['activity']);
 
+               $appNames = array();
+
                foreach ($compiler->langs as $l) {
                        $src = $compiler->wdir . '/' . $collection->theme['splash_' . $l];
                        $phonegap->setSplash($src, $l);
                        $phonegap->setIcon($compiler->wdir . '/' . $collection->theme['icon'], $l);
+                       $appNames[$l] = $collection->contents[$l]['titrehome'];
                }
+               $phonegap->setAppName($appNames);
                $phonegap->setWWWDirectory($dir);
                if ($os == 'ios') {
                        $phonegap->setDistantCompiler('paris.cubedesigners.com', 'vincent', 'iquique', '/Phonegap/Projects/' . $d, '/mnt/macbox/Phonegap/Projects/' . $d, 22022, SSH_KEY);
@@ -59,6 +63,7 @@ class wsExporter {
                        $phonegap->setManifest(WS_COMPILE_ASSETS . '/_html5app/_android/AndroidManifest' . $manifestType . '.xml');
                        $phonegap->setMain(WS_COMPILE_ASSETS . '/_html5app/_android/Main' . $manifestType . '.java');
                        $phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', 'iquique', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY);
+                       $phonegap->setSourceVariables(array('background' => '0xff' . $collection->settings['couleurD']));
                }
                $phonegap->setPreference('orientation', CubeIT_Mobile_Phonegap::ORIENTATION_PORTRAIT);
                $phonegap->setPreference('target-device', CubeIT_Mobile_Phonegap::TARGET_TABLET);

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 7e2e287b64c1d334ed536a2a6310f5eaf96ef6c0..d113e98917c7698fb2bfdc2faddba4a1e26a1481 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
@@ -264,5 +264,3 @@ class wsHTML5AppCompiler {
        }
 
 }
-
-?>