(no commit message)

diff --git a/images/ws/android.png b/images/ws/android.png
new file mode 100644 (file)
index 0000000..d5b4b05
Binary files /dev/null and b/images/ws/android.png differ

diff --git a/images/ws/ios.png b/images/ws/ios.png
new file mode 100644 (file)
index 0000000..0d17b48
Binary files /dev/null and b/images/ws/ios.png differ

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 0d86eb554f213b5119022a6318704fa1825531fd..44e1c2d0f818272fb019f552a2a97ad0c68a7e5d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -201,8 +201,9 @@ class wsUrl {
                        $versions = array();\r
                        $versions['hosting'] = array('title' => __("Le serveur d'hébergement"), 'icon' => cubeMedia::silk('server_go.png'));\r
                        $versions['references'] = array('title' => __("L'espace références"), 'icon' => cubeMedia::silk('server_add.png'));\r
-                       $versions['macbook_phonegap_ios'] = array('title' => __("Projet Phonegap IOS"), 'icon' => cubeMedia::silk('server_add.png'));\r
                        $versions['external'] = array('title' => __("Serveur FTP"), 'icon' => cubeMedia::silk('server_add.png'));\r
+                       $versions['macbook_phonegap_ios'] = array('title' => __("Projet Phonegap IOS"), 'icon' => cubeMedia::image(IMG . '/ios.png'));\r
+                       $versions['phonegap_android'] = array('title' => __("Projet Phonegap Android"), 'icon' => cubeMedia::image(IMG . '/android.png'));\r
 \r
                        foreach ($versions as $k => $v) {\r
                                $res .= '<li><a href="#" rel="instbook/$1/' . $k . '" class="ajax">' . $v['icon'] . $v['title'] . '</a></li>';\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 0a2c6672bd819d90ce8d5630157cd4d6619ace57..42dcf44232f0cf6fd9f0d947d8db993068d6a322 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -45,6 +45,7 @@ class wsDAOBook extends commonDAO {
                $book->dir_references = $r->dir_references;\r
                $book->dir_hosting = $r->dir_hosting;\r
                $book->dir_macbook_phonegap_ios = $r->dir_macbook_phonegap_ios;\r
+               $book->dir_phonegap_android = $r->dir_macbook_phonegap_android;\r
                $book->dir_external = $r->dir_external;\r
 \r
                return $book;\r

diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 164ff7d4fcc10a7b2e083c6819da5632ca0753e4..15c0a3e4135f0e89d0aaa9f056da583c181ff7d2 100644 (file)
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -35,6 +35,7 @@ class wsBook extends cubeMetier {
        protected $dir_references;\r
        protected $dir_hosting;\r
        protected $dir_macbook_phonegap_ios;\r
+       protected $dir_phonegap_android;\r
        protected $dir_external;\r
 \r
        public function __get($varname) {\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 2574ec83bb6ec2bdc230bd7b5a3d216747aee8b4..36d8cb5b8248e2f318da20d0d3d1c33bd1bc85fc 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -639,7 +639,7 @@ class wsHTML5Compiler {
 
                file_put_contents($this->vdir . '/data/datas.js', $config);
                if ($this->phonegap) {
-                       $this->copy($this->assets . '/js/libs/phonegap/cordova.js', $this->vdir . '/data/cordova.js');
+                       $this->copy($this->assets . '/js/libs/phonegap/cordova-' . $this->phonegap . '.js', $this->vdir . '/data/cordova.js');
                }
        }