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

---

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index a9b9bb627..7ba49c280 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -184,12 +184,13 @@ class commonTools {
 		$res .= commonPage::bh();
 		$res.='<form action="' . SITE_PATH . 'tools/makeFavicon" method="post" class="notajax" enctype="multipart/form-data">';
 		$res.='<table class="liste">';
-		$res.='<tr><th colspan="2"><strong>' . __('Générer un favicon') . '</strong></th></tr>';
+		$res.='<tr><th colspan="3"><strong>' . __('Générer un favicon') . '</strong></th></tr>';
 		$res.='<tr><td>' . __('Veuillez charger une image carrée (dimensions optimales : 256x256 px)') . '</td>';
-		$res.='<td><input type="file" name="file" /></td></tr>';
+		$res.='<td colspan="2"><input type="file" name="file" /></td></tr>';
 		$res.='<tr class="odd"><td>' . __('Bord arrondi') . '</td>';
-		$res.='<td><input type="number" name="round" value="0" size="5" />%</td><td>Valeur</td></tr>';
-		$res.='<tr><td class="right" colspan="2"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Générer le favicon')) . '</a></td></td>';
+		$res.='<td><input type="number" name="round" value="0" size="5" />%</td><td>' . __('Valeurs typiques') . ' : <br>iOS : 17.54%<br />' . __('Aucun arrondi') . ' : 0%</td></tr>';
+		$res.='<tr><td colspan="3">' . __("L'arrondi ne sera pas appliqué aux icônes iOS, le système lui même se chargeant d'y appliquer les arrondis et les reflets") . '</td></tr>';
+		$res.='<tr class="odd"><td class="right" colspan="3"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Générer le favicon')) . '</a></td></td>';
 		$res.='</table>';
 		$res.='</form>';
 		$res .= '</div>';
@@ -555,7 +556,6 @@ class commonTools {
 		$openssl->setArg('-outform', 'PEM');
 		$openssl->execute();
 
-
 		// Generate p12 file
 		$openssl = new cubeCommandLine('openssl');
 		$openssl->setPath(CONVERTER_PATH);
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index bcc5d3576..4b60bf244 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -884,6 +884,57 @@ class wsAjax extends cubeAjax {
 		$dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Import from excel', $core->user->utilisateur_id);
 	}
 
+	public static function offsetLinks($args, &$x) {
+		global $core;
+		$book_id = $args[1];
+		$offset = $_POST['offset'];
+		$from = $_POST['from'];
+		$internal = isset($_POST['internal']);
+
+		if ($internal) {
+			$daoBook = new wsDAOBook($core->con);
+			$book = $daoBook->selectById($book_id);
+			$numerotation = explode(',', $book->numerotation);
+		}
+
+
+		$dao = new wsDAODocument($core->con);
+		$dao->getLinksAndRulers($book_id, $links, $rulers);
+		$rlinks = array();
+		foreach ($links as $k => $link) {
+			if ($link['page'] >= $from) {
+				$link['page']+=$offset;
+			}
+			if ($internal && $link['type'] == 5) {
+				if ($link['numerotation'] == 'physical') {
+					if ($link['to'] >= $from) {
+						$link['to']+=$offset;
+					}
+				} else {
+					$ph = array_search($link['to'], $numerotation) + 1;
+					if ($ph >= $from) {
+						$ph+=$offset;
+						$vi = $numerotation[($ph-1)];
+						$link['to'] = $vi;
+					}
+				}
+			}
+
+			$rlinks[$k] = $link;
+		}
+
+		$rrulers = array();
+		foreach ($rulers as $k => $ruler) {
+			if ($ruler['page'] > $from) {
+				$ruler['page']+=$offset;
+			}
+			$rrulers[$k] = $ruler;
+		}
+
+		$dao->setLinksAndRulers($book_id, $rlinks, $rrulers, 'Offset ' . $offset . ' pages from page # ' . $from, $core->user->utilisateur_id);
+		$x->addReload();
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 9e9ad6437..01d3d3898 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -45,9 +45,15 @@ class wsServices extends cubeFlashGateway {
 		}
 
 		$bookmarks = json_decode(base64_decode($this->args['bookmarks']), true);
+		fb($bookmarks);
 		$files = array();
 		foreach ($bookmarks as $b) {
-			$file = $this->getPDFComplex($this->args['id'], $b['page'] . '-' . $b['page'] + $b['nb']);
+			$range = $b['page'];
+			if ($b['nb'] > 1) {
+				$range.='-' . ($b['page'] + $b['nb'] - 1);
+			}
+
+			$file = $this->getPDFComplex($this->args['id'], $range);
 			$files[] = array('name' => $b['name'], 'file' => $file['file']);
 		}
 
@@ -369,8 +375,6 @@ class wsServices extends cubeFlashGateway {
 		$mail->to = 'chequieravantages@gmail.com';
 		$body = '';
 
-
-
 		foreach ($fields as $k => $f) {
 			$body.=$k . ' : ' . $this->args[$f] . "\r\n";
 			$datas[$f] = $this->args[$f];
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 02a5642a4..71045dd4d 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -527,12 +527,30 @@ html{height:100%}' . "\n";
 		$res .= '</head>';
 		$res .= '<body onload="this.focus();">';
 		$res .= '<div id="restoreLinks">';
-		$res.='<div class="center" style="padding:15px;">';
+		$res.='<div>';
+		$res.='<h2>' . __('Import') . '</h2>';
+		$res.='<div class="center">';
 		$res.='<form action="importLinksAsExcel/' . $book_id . '" method="post" enctype="multipart/form-data" class="notajax" id="importLinksAsExcel">';
 		$res.=__("Importer des liens à partir d'un fichier Excel") . ' : <input type="file" name="file" accept="*.xlsx" />';
 		$res.='<input type="submit" value="' . __('Importer') . '" />';
 		$res.='</form>';
 		$res.='</div>';
+		$res.='</div>';
+		$res.='<hr />';
+
+		$res.='<div id="linksOffset">';
+		$res.='<h2>' . __('Décalage de pages') . '</h2>';
+		$res.='<form action="offsetLinks/' . $book_id . '" method="post" id="offsetLinks">';
+		$offset = form::field('offset', 3, 5);
+		$from = form::field('from', 3, 5);
+		$res.=sprintf(__('Décaler les liens de %s pages à partir de la page %s'), $offset, $from) . '<br />';
+		$res.='<label>' . form::checkbox('internal', 1, true) . ' ' . __('Appliquer le décalages sur les numéros de pages dans les liens internes') . '</label><br />';
+		$res.='<input type="submit" value="' . __('Procéder au décalage') . '" />';
+		$res.='</form>';
+		$res.='</div>';
+		$res.='<hr />';
+
+		$res.='<h2>' . __('Historique') . '</h2>';
 		$res .= '<table class="liste" style="width:100%;min-width:0;">';
 		$res .= '<tr>';
 		$res .= '<th>' . __('Date') . '</th>';
@@ -772,6 +790,7 @@ html{height:100%}' . "\n";
 
 		$dao = new wsDAOBook($core->con);
 
+		$dir = '';
 		if ($version == 'a') {
 			$version = '';
 			$dir = 'a';
@@ -782,6 +801,7 @@ html{height:100%}' . "\n";
 			commonDroits::error();
 		}
 
+
 		echo file_get_contents(WS_BOOKS . '/html5' . $dir . '/' . $book_id . '/index' . $version . '.html');
 		exit;
 	}
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 0594a202b..16092c228 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -622,7 +622,7 @@ class wsDAOBook extends commonDAO {
 			}
 		} else if ($version == 'html5') {
 			// HTML5
-			$checks = array($book->changedate, cubeFiles::filemtimeRecursive(WS_COMPILE_ASSETS . '/_html5'), cubeFiles::filemtimeRecursive(ROOT . '/inc/ws/Util/html5'));
+			$checks = array($book->changedate, cubeFiles::filemtimeRecursive(WS_BOOKS . '/working/' . $book->book_id), cubeFiles::filemtimeRecursive(WS_COMPILE_ASSETS . '/_html5'), cubeFiles::filemtimeRecursive(ROOT . '/inc/ws/Util/html5'));
 			foreach ($checks as $check) {
 				if ($check > $book->compilehtml5date) {
 					return false;
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 2d47d3174..74c744e8d 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -71,6 +71,7 @@ class wsHTML5Compiler {
 	);
 	public $pluginCSS = array();
 	public $pluginJs = array();
+	public $htmlmultimedia = array();
 	protected $cssX = array();
 	protected $cssY = array();
 	protected $cssWidths = array();
@@ -81,7 +82,8 @@ class wsHTML5Compiler {
 	protected $numerotation;
 	protected $fontDocs = array();
 	protected $dir;
-	protected $vdir;
+	public $vdir;
+	public $wdir;
 
 	/**
 	 *
@@ -148,6 +150,7 @@ class wsHTML5Compiler {
 			$this->dir = $dir;
 		}
 		$this->vdir = $this->dir;
+		$this->wdir = WS_BOOKS . '/working/' . $this->book_id . '/';
 
 		// Clean the folder
 		`rm -rf $this->vdir`;
@@ -513,12 +516,12 @@ class wsHTML5Compiler {
 	}
 
 	protected function writePrint() {
-		$res='';
-		/*$res .= '<div id="printpages">';
-		for ($i = 1; $i <= $this->book->parametres->pages; $i++) {
-			$res.='<div class="printpage"><img src="data/background/150/t' . $i . '.jpg" alt="" /></div>';
-		}
-		$res.='</div>';*/
+		$res = '';
+		/* $res .= '<div id="printpages">';
+		  for ($i = 1; $i <= $this->book->parametres->pages; $i++) {
+		  $res.='<div class="printpage"><img src="data/background/150/t' . $i . '.jpg" alt="" /></div>';
+		  }
+		  $res.='</div>'; */
 		return $res;
 	}
 
@@ -597,6 +600,7 @@ class wsHTML5Compiler {
 
 		$allpages = range(0, $this->book->parametres->pages + 1);
 		$allpages[] = 'aftersearch';
+		$allpages[] = 'background';
 
 		$this->config->links = array();
 
@@ -682,6 +686,7 @@ class wsHTML5Compiler {
 		$this->config->coquilletteBack = $this->colorToCSS($this->theme->parametres->couleurA);
 		$this->config->coquilletteFront = $this->colorToCSS($this->theme->parametres->arrowsColor);
 		$this->config->videoFormats = $this->getVideosFormats(false);
+		$this->config->htmlmultimedia = $this->htmlmultimedia;
 		foreach ($this->additionalConfig as $k => $v) {
 			$this->config->$k = $v;
 		}
@@ -968,7 +973,7 @@ class wsHTML5Compiler {
 			return;
 		}
 
-		$origDir = WS_BOOKS . '/working/' . $this->book_id . '/';
+		$origDir = $this->wdir;
 		$types = $this->getVideosFormats();
 		if ($video) {
 			wsTools::encodeWebVideos($origDir . $source, null, true);
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index a243977c4..64d616d84 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -64,6 +64,16 @@ class wsHTML5Link {
 				return new imageLink($id, $init, $compiler);
 			case 16:
 				return new fileLink($id, $init, $compiler);
+			case 17:
+				//return new audioLink($id,$init,$compiler);
+				break;
+			case 18:
+			case 19:
+				break;
+			case 20:
+				break;
+			case 21:
+				return new htmlMultimediaLink($id, $init, $compiler);
 			default:
 				return null;
 		}
@@ -101,6 +111,19 @@ class wsHTML5Link {
 		$this->compiler->copyLinkFile($file, 'data/links/', $video);
 	}
 
+	public function unzipFile($file) {
+		$fdir = 'data/links/' . $this->id;
+		$dir = $this->compiler->vdir . '/' . $fdir;
+		if (!file_exists($dir)) {
+			mkdir($dir, 0777, true);
+		}
+		$unzip = new cubeCommandLine('unzip');
+		$unzip->setArg(null, $this->compiler->wdir . '/' . $file);
+		$unzip->setArg('d', $dir);
+		$unzip->execute();
+		return array('dir' => $dir, 'fdir' => $fdir);
+	}
+
 	public function getCSSContainer() {
 
 
@@ -367,6 +390,40 @@ class multimediaLink extends wsHTML5Link {
 
 }
 
+class htmlMultimediaLink extends wsHTML5Link {
+
+	public function getHTMLContent() {
+		$d = $this->unzipFile($this->to);
+		$w = $this->width * $this->compiler->getCssScale();
+		$h = $this->height * $this->compiler->getCssScale();
+
+		$dr = opendir($d['dir']);
+		while ($file = readdir($dr)) {
+			if ($file == '.' || $file == '..') {
+				continue;
+			}
+
+			$ext = files::getExtension($file);
+
+			if ($ext == 'js') {
+				$this->compiler->pluginJs[] = $d['fdir'] . '/' . $file;
+				$e = explode('.', $file);
+				$name = $e[0];
+				$code = '$("#l_' . $this->id . '").' . $name . '();';
+				$this->compiler->htmlmultimedia[] = $code;
+			} else if ($ext == 'css') {
+				$this->compiler->pluginCSS[] = $d['fdir'] . '/' . $file;
+			} else if ($ext == 'html') {
+				$res = file_get_contents($d['dir'] . '/' . $file);
+				unlink($d['dir'] . '/' . $file);
+			}
+		}
+
+		return $res;
+	}
+
+}
+
 class webVideoPopupLink extends videoPopupLink {
 
 	public function getURL() {
diff --git a/js/ws.js b/js/ws.js
index b076075d0..ebb157af4 100644
--- a/js/ws.js
+++ b/js/ws.js
@@ -30,7 +30,7 @@ function load_ws(){
 		});
 	}
 	
-	$("#importLinksAsExcel").submit(function(){
+	$("#importLinksAsExcel,#offsetLinks").submit(function(){
 		$(this).ajaxSubmit({
 			url		:	SITE_PATH+'ajax/'+$(this).attr('action'),
 			success	:	function(data){
@@ -41,6 +41,8 @@ function load_ws(){
 		return false;
 	});
 
+
+
 	$(".restoreLink").click(restoreLink);
 	
 	$(".hide_new_value").change(function(){
diff --git a/style/ws/style.css b/style/ws/style.css
index 2956a4ba9..d5c8382a4 100644
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -489,4 +489,16 @@ th.stats_col{
 
 #accepteDemandes{
 	padding:10px;
+}
+
+#restoreLinks{
+	margin:10px;
+}
+
+#restoreLinks hr{
+	margin:10px 0;
+}
+
+#restoreLinks h2{
+	margin:5px 0 10px 0;
 }
\ No newline at end of file
diff --git a/typo/ws/small-r-download.png b/typo/ws/small-r-download.png
index aa1987603..5273f250a 100644
Binary files a/typo/ws/small-r-download.png and b/typo/ws/small-r-download.png differ