From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 24 Apr 2012 14:29:15 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=302428f2a05e5713bf2d3b22aaa20441d7526c7f;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index b784fec9e..8f8d625be 100644
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -134,6 +134,20 @@ function _isMobile(devices){
 	return false;
 }
 
+function redirectPDF(){
+	window.location='data/document.pdf';
+}
+
+function redirectMobile(){
+	var get=parseGet();
+	var page='index.html';
+	if(get['widget']!=undefined && get['widget']=='1'){
+		page='widget.html';
+	}
+	window.location='m/'+page;
+}
+
+
 function wheel(event){
 	var delta = 0;
 	if (!event) /* For IE. */
diff --git a/fluidbook/compile/fluidbook.js b/fluidbook/compile/fluidbook.js
index deeb6ef9f..a4e6c8314 100644
--- a/fluidbook/compile/fluidbook.js
+++ b/fluidbook/compile/fluidbook.js
@@ -69,6 +69,8 @@ function getCookie(nom)
 	}
 	return null;
 }
+
+
 function setCookie(nom, valeur)
 {
 	var argv=setCookie.arguments;
diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 2925fffee..388ebfbbe 100644
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -17,7 +17,6 @@
 		<style type="text/css" media="print">*{ visibility: hidden; display: none }</style>
 		<script type="text/javascript" src="fluidbook.js?junk=$junk"></script>
 		<script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>
-		$redirectScript
 		$ga
 		<script type="text/javascript">
 			if(isMobile()){
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index cdb64c6c9..a048a334c 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -127,7 +127,7 @@ class wsUrl {
 			}
 			if ($book->version > 1 || $droits->admin) {
 				if ($droits->admin) {
-					$res .= '<td class="bouton"><a href="#" class="openContextMenu" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '">' . $btVoir . '</a></td>';
+					$res .= '<td class="bouton"><a href="#" class="openContextMenu" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '§' . TIME . '">' . $btVoir . '</a></td>';
 				} else {
 					$viewURL = SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash;
 					if ($book->parametres->version == 1) {
@@ -233,11 +233,12 @@ class wsUrl {
 		global $core;
 
 		if (wsDroits::admin()) {
-			$viewers = array('viewer' => array('title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),
-				'viewerh' => array('title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),
-				'vieweru' => array('title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),
-				'viewerht' => array('title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),
-				'viewer1' => array('title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))
+			$viewers = array(array('version' => 'viewer', 'title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),
+				array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),
+				array('version' => 'vieweru', 'title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),
+				array('version' => 'viewerhu', 'title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),
+				array('version' => 'viewerhu', 'title' => __('Widget HTML5'), 'icon' => cubeMedia::image(IMG . '/html5bug.png'), 'file' => 'widget.html', 'pattern' => '$1_$2_$3'),
+				array('version' => 'viewer1', 'title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))
 			);
 		}
 
@@ -245,8 +246,14 @@ class wsUrl {
 		$res .= '<ul>';
 		$res .= '<li class="head">' . __("Sélectionnez la version") . '</li>';
 		if (isset($viewers)) {
-			foreach ($viewers as $v => $infos) {
-				$res .= '<li><a class="popupFSBar" rel="toolbar=yes" rev="' . $v . '_$1" href="' . SITE_PATH . $v . '/$1_$2/">' . $infos['icon'] . $infos['title'] . '</a></li>';
+			foreach ($viewers as $infos) {
+				if (!isset($infos['file'])) {
+					$infos['file'] = '';
+				}
+				if (!isset($infos['pattern'])) {
+					$infos['pattern'] = '$1_$2';
+				}
+				$res .= '<li><a class="popupFSBar" rel="toolbar=yes" rev="' . $infos['version'] . '_$1" href="' . SITE_PATH . $infos['version'] . '/' . $infos['pattern'] . '/' . $infos['file'] . '">' . $infos['icon'] . $infos['title'] . '</a></li>';
 			}
 		}
 		$res .= '</ul></div>';
@@ -671,18 +678,21 @@ html{height:100%}' . "\n";
 
 	public static function viewerhu($args) {
 		global $core;
-		
+
 		commonDroits::min(5);
 		$args = cubePage::getArgs($args);
+		if (!isset($args[1])) {
+			$args[1] = '';
+		}
 
-		$dao=new wsDAOBook($core->con);
+		$dao = new wsDAOBook($core->con);
 		$e = explode('_', $args[0]);
 		$dao->compile($e[0], 'html5');
 		$time = self::getHTML5CacheTime($e[0]);
 
 		if (count($e) == 2 || $e[2] != $time) {
 			$e[2] = $time;
-			http::redirect(SITE_PATH . 'viewerhu/' . implode('_', $e) . '/');
+			http::redirect(SITE_PATH . 'viewerhu/' . implode('_', $e) . '/' . $args[1]);
 			exit;
 		}
 
@@ -813,7 +823,7 @@ html{height:100%}' . "\n";
 		}
 
 		fb($version);
-		$dao->compile($book_id, (string)$version);
+		$dao->compile($book_id, (string) $version);
 
 		$daoTheme = new wsDAOTheme($core->con);
 		$theme = $daoTheme->selectById($book->theme, 'themes');
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index ffba9ef1b..af63fd321 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -68,11 +68,11 @@ class wsPackagerHTML extends wsPackager {
 			$favicon = '<link rel="shortcut icon" href="data/fluidbook.ico">';
 		}
 
-		$redirectPDF = 'window.location="data/document.pdf";';
+		$redirectPDF = 'redirectPDF();';
 		if ($this->book->parametres->mobileVersion == 'pdf') {
 			$redirectMobile = $redirectPDF;
 		} else {
-			$redirectMobile = 'window.location="m/index.html";';
+			$redirectMobile = 'redirectMobile();';
 			$this->prepareHTML5();
 		}