From fa454a5fd6203b870a7fb3afc8a868d0022feccb Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 9 Nov 2012 15:01:33 +0000 Subject: [PATCH] --- images/ws/android.png | Bin 0 -> 657 bytes images/ws/ios.png | Bin 0 -> 1761 bytes inc/ws/Controlleur/class.ws.url.php | 3 ++- inc/ws/DAO/class.ws.dao.book.php | 1 + inc/ws/Metier/class.ws.book.php | 1 + inc/ws/Util/html5/class.ws.html5.compiler.php | 2 +- 6 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 images/ws/android.png create mode 100644 images/ws/ios.png diff --git a/images/ws/android.png b/images/ws/android.png new file mode 100644 index 0000000000000000000000000000000000000000..d5b4b05dbbfecccdda348955fb48ecc5ff59cacc GIT binary patch literal 657 zcmV;C0&e|@P)*RzVhXrhH^mqTBDfho&c4)s zNc+@PW*YMVWZPrw*C+a0_v$W#2r&kNxua(Lrb6e;O`i9=b;T!}9nPP=fvOz9nmh8e z*Y;*B)!K$T;u-rABWyO$~&y} zFLI~*nHOJ|5D`?BWU6Qupv8&SS&F^#Nac&YlKI(lRpk^gRZ><%RB=}vrzrE0>QC;< zGJ{028p+hqEM(nfFx#oc=Wad!0P$}tLqB@Jbrfpyuz3{nzhnE)j;;!cB;ksJ@`%>Pj_ed z6A9x#;9h|MRY&f=KAB^bIMpp?Rh1B=jzf?-o*Y%zU}n7on`nl+gH)rN_W#G3Subd| r70tG3YSdFAPTkx)bCmffx|LfSq7x7bcTQ0}u#?KnMY0#1Uq)oe?$!0TU0EjD|}i z*+D$-iCCn?p+*seiVcDZ2?+S|gsQPPTtfCE(sq(e*6!!!>-NZb$+3ofd{W5U zvQog~iZplT?e&ccM@^ejyAsZg9>`g;SBfO=IaV$joqpOSV(Nl^&l2-em*S^SJ!#vl z9Tu6|5cgNrm>zkQZ(Uw^aI;~t;o(`y^tMKmV9CK7J0p>sIW3(9vMn3H^_n*=Yl;L`{&Nyw^1HV9if0(%2?ga2QQx^TVMAr>YEqa3W>^DNrlY??SmEd zZG8mt!i~nlST4go~uMgeYHdOEXL+bgED{(Z3qkkXUb2VbgCZTXd200ooiq2sEvuvS>M&O^mb3%Sp&86kGbPx^Ir)iz6Z0S?_4T+ zX)inW&39$ZdfC+>PwF(PP1XLK^V-wGsN6vFeNQfT8_NgcwfU!fOvfFr>RH;A{?=ji z08UK1J9H#trp^1g`0?ZW%@b%oF9K}EmB0Hgre!SPhh;X*VZ>TVDqh)~+<&&fCRRU2 z*wSngrpe>)cMcDzJ>Be?VOW2oy+XEoPeb&@&<)cH9oLNVIq?qyyV&tPp8XHh*B5ua zSXqq)7_KR=tloL=TBh5zOyOA3U>sfWn3;7V!M*n7opC)Q%F;6d&xZ2{N_9US0pFi@ J!gJl`e*srr(a8V+ literal 0 HcmV?d00001 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 .= '
  • ' . $v['icon'] . $v['title'] . '
    • '; 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'); } } -- 2.39.5