From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 9 Nov 2012 15:01:33 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fa454a5fd6203b870a7fb3afc8a868d0022feccb;p=cubeextranet.git

---

diff --git a/images/ws/android.png b/images/ws/android.png
new file mode 100644
index 000000000..d5b4b05db
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
index 000000000..0d17b4874
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 0d86eb554..44e1c2d0f 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -201,8 +201,9 @@ class wsUrl {
 			$versions = array();
 			$versions['hosting'] = array('title' => __("Le serveur d'hébergement"), 'icon' => cubeMedia::silk('server_go.png'));
 			$versions['references'] = array('title' => __("L'espace références"), 'icon' => cubeMedia::silk('server_add.png'));
-			$versions['macbook_phonegap_ios'] = array('title' => __("Projet Phonegap IOS"), 'icon' => cubeMedia::silk('server_add.png'));
 			$versions['external'] = array('title' => __("Serveur FTP"), 'icon' => cubeMedia::silk('server_add.png'));
+			$versions['macbook_phonegap_ios'] = array('title' => __("Projet Phonegap IOS"), 'icon' => cubeMedia::image(IMG . '/ios.png'));
+			$versions['phonegap_android'] = array('title' => __("Projet Phonegap Android"), 'icon' => cubeMedia::image(IMG . '/android.png'));
 
 			foreach ($versions as $k => $v) {
 				$res .= '<li><a href="#" rel="instbook/$1/' . $k . '" class="ajax">' . $v['icon'] . $v['title'] . '</a></li>';
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 0a2c6672b..42dcf4423 100644
--- 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;
 		$book->dir_hosting = $r->dir_hosting;
 		$book->dir_macbook_phonegap_ios = $r->dir_macbook_phonegap_ios;
+		$book->dir_phonegap_android = $r->dir_macbook_phonegap_android;
 		$book->dir_external = $r->dir_external;
 
 		return $book;
diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 164ff7d4f..15c0a3e41 100644
--- 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;
 	protected $dir_hosting;
 	protected $dir_macbook_phonegap_ios;
+	protected $dir_phonegap_android;
 	protected $dir_external;
 
 	public function __get($varname) {
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 2574ec83b..36d8cb5b8 100644
--- 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');
 		}
 	}