From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 17 Jul 2012 11:58:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c195b8cc7023894568e655b643bee9a9e0ca499f;p=cubeextranet.git

---

diff --git a/images/ws/phonegap.png b/images/ws/phonegap.png
new file mode 100644
index 000000000..a5447b228
Binary files /dev/null and b/images/ws/phonegap.png differ
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index dd1bd3ea3..b199b1b91 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -186,6 +186,9 @@ class wsUrl {
 		$versions['win-ins'] = array('title' => __('Version offline') . ' - ' . __('Installeur Auto-executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
 		$versions['mac-exe'] = array('title' => __('Version offline') . ' - ' . __('Exécutable Mac OS X'), 'icon' => cubeMedia::image(IMG . '/macos.png'));
 		$versions['win-cd'] = array('title' => __('Version offline') . ' - ' . __('CD-ROM') . ' / ' . __('Clé USB'), 'icon' => cubeMedia::silk('cd.png'));
+		if ($droits->admin) {
+			$versions['phonegap'] = array('title' => __('Version offline') . ' - ' . __('Application mobile'), 'icon' => cubeMedia::image(IMG . '/phonegap.png'));
+		}
 
 		$res = '<div class="contextMenu downbookContextMenu" id="' . $id . '">';
 		$res .= '<ul>';
@@ -1024,7 +1027,7 @@ html{height:100%}' . "\n";
 
 		header('Content-type: text/plain');
 		ob_end_clean();
-		echo $dao->compile($args[1], 3, false,true);
+		echo $dao->compile($args[1], 3, false, true);
 		exit;
 	}
 
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 97f41fcbf..389cfba8b 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -2,11 +2,18 @@
 
 class wsHTML5Compiler {
 
-	public static function factory($book_id, $version = 'stable') {
+	public static function factory($book_id, $version = 'stable', $phonegap = false, $dir = null) {
+		if (is_null($version)) {
+			global $core;
+			$dao = new wsDAOBook($core->con);
+			$book = $dao->selectById($book_id);
+			$version = $book->parametres->mobileLVersion;
+		}
+
 		if ($version == 'stable') {
-			return new wsHTML5Compiler($book_id, $version);
+			return new wsHTML5Compiler($book_id, $version, $phonegap, $dir);
 		} else {
-			return new wsHTML5CompilerDev($book_id, $version);
+			return new wsHTML5CompilerDev($book_id, $version, $phonegap, $dir);
 		}
 	}
 
@@ -37,6 +44,7 @@ class wsHTML5Compiler {
 		'js/libs/fluidbook/fluidbook.help.js',
 		'js/libs/fluidbook/fluidbook.resize.js',
 		'js/libs/fluidbook/fluidbook.coquillette.js',
+		'js/libs/fluidbook/fluidbook.stats.js',
 		'js/libs/fluidbook/fluidbook.js',
 		'js/main.js');
 	protected static $debugJsFiles = array(
@@ -106,8 +114,9 @@ class wsHTML5Compiler {
 	protected $svg = true;
 	protected $config = array();
 	protected $assets = '';
+	protected $phonegap = false;
 
-	function __construct($book_id, $version = 'stable') {
+	function __construct($book_id, $version = 'stable', $phonegap = false, $dir = null) {
 		global $core;
 
 		if ($version == 'stable') {
@@ -116,6 +125,7 @@ class wsHTML5Compiler {
 		} else {
 			$this->assets = WS_COMPILE_ASSETS . '/_html5';
 		}
+		$this->phonegap = $phonegap;
 
 		cubePHP::set_memory('4G');
 
@@ -124,7 +134,12 @@ class wsHTML5Compiler {
 		}
 		$this->book_id = $book_id;
 
-		$this->vdir = $this->dir = WS_BOOKS . '/html5/' . $book_id . '/';
+		if (is_null($dir)) {
+			$this->dir = WS_BOOKS . '/html5/' . $book_id . '/';
+		} else {
+			$this->dir = $dir;
+		}
+		$this->vdir = $this->dir;
 
 		// Clean the folder
 		`rm -rf $this->vdir`;
@@ -347,7 +362,11 @@ class wsHTML5Compiler {
 
 		$pagesContents = '';
 
-		$script = '<script type="text/javascript" src="data/fluidbook.js"></script>' . "\n";
+		$script = '';
+		if ($this->phonegap) {
+			$script .= '<script type="text/javascript" src="data/cordova.js"></script>' . "\n";
+		}
+		$script .= '<script type="text/javascript" src="data/fluidbook.js"></script>' . "\n";
 		$script .= '<script type="text/javascript" src="data/search.js"></script>' . "\n";
 
 		$description = '';
@@ -498,6 +517,9 @@ 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');
+		}
 	}
 
 	public function writeTexts() {
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index bcc811807..bef5f7780 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -137,7 +137,11 @@ class normalLink extends wsHTML5Link {
 		if (count($class)) {
 			$c = ' class="' . implode(' ', $class) . '"';
 		}
-		return '<a href="' . $this->getURL() . '" target="' . $this->getTarget() . '"' . $c . $this->getAdditionnalContent() . '></a>';
+		return '<a href="' . $this->getURL() . '" target="' . $this->getTarget() . '"' . $c . $this->getAdditionnalContent() . $this->getTrack() . '></a>';
+	}
+
+	public function getTrack() {
+		return '';
 	}
 
 	public function getURL() {
@@ -164,6 +168,10 @@ class webLink extends normalLink {
 		return $this->target;
 	}
 
+	public function getTrack() {
+		return ' data-track="' . $this->getURL() . '"';
+	}
+
 	public function getCSS() {
 		
 	}
@@ -176,6 +184,10 @@ class mailLink extends normalLink {
 		return 'mailto:' . $this->to;
 	}
 
+	public function getTrack() {
+		return ' data-track="' . $this->to . '"';
+	}
+
 	public function getTarget() {
 		return '_self';
 	}
diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php
index 94ebde2d9..bf7d8836b 100644
--- a/inc/ws/Util/packager/_common.php
+++ b/inc/ws/Util/packager/_common.php
@@ -8,4 +8,5 @@ $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.
 $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php';
 $__autoload['wsPackagerAIR'] = dirname(__FILE__) . '/class.ws.packager.air.php';
 $__autoload['wsPackagerV1'] = dirname(__FILE__) . '/class.ws.packager.v1.php';
+$__autoload['wsPackagerPhonegap'] = dirname(__FILE__) . '/class.ws.packager.phonegap.php';
 ?>
\ No newline at end of file
diff --git a/inc/ws/Util/packager/class.ws.packager.phonegap.php b/inc/ws/Util/packager/class.ws.packager.phonegap.php
new file mode 100644
index 000000000..8b2a443fb
--- /dev/null
+++ b/inc/ws/Util/packager/class.ws.packager.phonegap.php
@@ -0,0 +1,26 @@
+<?php
+
+class wsPackagerPhonegap extends wsPackager {
+
+	public function __construct($book_id, $vdir = null, $whole = true) {
+		parent::__construct($book_id, $vdir, $whole);
+		$this->version = 'phonegap';
+	}
+
+	protected function preparePackage() {
+		parent::preparePackage();
+		
+		$compiler = wsHTML5Compiler::factory($this->book_id, null, true, $this->vdir);
+		$compiler->compile();
+	}
+
+	public function makePackage($zip) {
+		parent::makePackage($zip);
+		$res = $this->zip();
+		$this->postPackage();
+		return $res;
+	}
+
+}
+
+?>
diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index d166ac2d3..c8c15a8a8 100644
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -31,6 +31,8 @@ class wsPackager {
 			$packager = new wsPackagerMacEXE($book_id);
 		} elseif ($version == 'v1') {
 			$packager = new wsPackagerV1($book_id);
+		} else if ($version == 'phonegap') {
+			$packager = new wsPackagerPhonegap($book_id);
 		}
 
 		return $packager->makePackage($zip);
diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.php b/inc/ws/Util/packager/class.ws.packager.win.exe.php
index 76f836d66..fb9bfbb6c 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.php
@@ -19,7 +19,7 @@ class wsPackagerWinEXE extends wsPackager {
 	}
 
 	public function makePackage($zip) {
-		parent::makePackage();
+		parent::makePackage($zip);
 		$res = $this->zip();
 		$this->postPackage();
 		return $res;