From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 3 Jun 2013 09:43:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3365070bab54218698fc60deab68085ca2b24092;p=cubeextranet.git

---

diff --git a/.htaccess b/.htaccess
index cce222941..fcd44da24 100644
--- a/.htaccess
+++ b/.htaccess
@@ -18,6 +18,9 @@ AddCharset UTF-8 log
 	RewriteEngine on
 	RewriteBase /
 
+	RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com
+	RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301,L]
+
 	# Favicon
 	RewriteCond %{HTTP_HOST} cubedesigners
 	RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 7e16ce0b5..3919055c8 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -279,6 +279,10 @@ class wsBookParametres extends wsParametres {
 				__('Glisser') => 'slide',
 				__('Tourner') => 'flip')
 		);
+		$this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,
+			'datas' => array(__('Normal (livre)') => 'book',
+				__('Magazine tablette') => 'tab')
+		);
 		$this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));
 
 		$this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Utiliser les icônes vectorielles'));
@@ -290,7 +294,7 @@ class wsBookParametres extends wsParametres {
 		$this->fields['mobileExtraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
 
 		$this->forms['mobile'] = array('label' => __('Version mobile'),
-			'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace'));
+			'fieldsnames' => array('mobileLVersion', 'mobileVersion', 'mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace'));
 
 		$this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');
 		$this->fields['phonegapVersion'] = array('type' => 'text', 'default' => '1.0.0', 'editable' => true, 'label' => __("Version de l'application"), 'grade' => 5, 'hint' => __('De la forme') . ' 1.2.3');
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 6bdf65266..607d46899 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -330,6 +330,9 @@ class wsDocument extends cubeMetier {
 	}
 
 	public function optimizeSVG() {
+
+
+
 		$scour = new cubeCommandLine('scour.php');
 		$scour->setPath(CONVERTER_PATH);
 		$scour->setNohup(true);
@@ -571,16 +574,9 @@ class wsDocument extends cubeMetier {
 
 	public function makeSVGFile($page) {
 		$svgFile = $this->out . '/html/p' . $page . '.svg';
+		//$svgSimplified = $this->out . '/html/s' . $page . '.svg';
 		$svgOpt = $this->out . '/html/o' . $page . '.svg';
 
-		/* $pdf2svg = new cubeCommandLine('pdf2svg');
-		  $pdf2svg->setPath(CONVERTER_PATH);
-		  $pdf2svg->setArg(null, $this->cropped);
-		  $pdf2svg->setArg(null, $svgFile);
-		  $pdf2svg->setArg(null, $page);
-		  $pdf2svg->execute();
-		  $this->addToLog($pdf2svg, true, $page); */
-
 		$pdftocairo = new cubeCommandLine('pdftocairo');
 		$pdftocairo->setPath(CONVERTER_PATH);
 		$pdftocairo->setArg('f', $page);
@@ -592,7 +588,6 @@ class wsDocument extends cubeMetier {
 		$pdftocairo->execute();
 		$this->addToLog($pdftocairo, true, $page);
 
-
 		$svg = new DOMDocument();
 		$svg->preserveWhiteSpace = false;
 		$svg->load($svgFile);
@@ -630,6 +625,19 @@ class wsDocument extends cubeMetier {
 
 		$this->addToLog(implode("\n", $svglog), false, $page);
 		file_put_contents($svgFile, $svg->saveXML());
+
+		// Simplify
+		/* 		copy($svgFile, $svgSimplified);
+		  $inkscape = new cubeCommandLine('inkscape');
+		  $inkscape->setPath(CONVERTER_PATH);
+		  // --verb=EditSelectAll --verb=SelectionSimplify --verb=FileSave --verb=FileClose
+		  $inkscape->setArg('file', $svgSimplified);
+		  $inkscape->setArg('verb', 'EditSelectAll');
+		  $inkscape->setArg('verb', 'SelectionSimplify');
+		  $inkscape->setArg('verb', 'FileSave');
+		  $inkscape->setArg('verb', 'FileClose');
+		  $inkscape->execute();
+		  $this->addToLog($inkscape, false, $page); */
 	}
 
 	protected function checkObjectsNumber($file, $maxObjects, $page) {
@@ -746,7 +754,6 @@ class wsDocument extends cubeMetier {
 		}
 
 		if (!in_array($method, array(self::BARBARE_PNM, self::BARBARE_GS))) {
-
 			if (in_array($version, array('legacy', 'stable', 'latest', 'git'))) {
 				$program = '/usr/local/swftools/' . $version . '/bin/pdf2swf';
 			} else {
@@ -769,7 +776,6 @@ class wsDocument extends cubeMetier {
 				$pdf2swf->setArg('set poly2bitmap');
 				$multiply = self::$resolution2multiply[$resolution];
 				$pdf2swf->setArg('set multiply', $multiply);
-				
 			} elseif ($method == self::BITMAP) {
 				// Raster all
 				$pdf2swf->setArg('set bitmap');
@@ -796,11 +802,7 @@ class wsDocument extends cubeMetier {
 				$pdf2swf->setArg(null, '-T7');
 				$pdf2swf->setArg('set alignfonts');
 			}
-			/* if(file_exists($this->rgb)){
-			  $pdf2swf->setArg(null, $this->rgb);
-			  }else{ */
 			$pdf2swf->setArg(null, $this->cropped);
-			//}
 			$pdf2swf->setArg('output', $this->out . $prefix . '%.swf');
 			$pdf2swf->execute();