(no commit message)

diff --git a/.htaccess b/.htaccess
index cce222941d352509dd6d40bbe016ef632eb96c70..fcd44da2450b8e413682e65ccbd9992977955864 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -18,6 +18,9 @@ AddCharset UTF-8 log
        RewriteEngine on\r
        RewriteBase /\r
 \r
+       RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com\r
+       RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301,L]\r
+\r
        # Favicon\r
        RewriteCond %{HTTP_HOST} cubedesigners\r
        RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 7e16ce0b5d7c06e21c0dc17272b0aef5017d8241..3919055c88333c2e903f460f2cda52bac665e565 100644 (file)
--- 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',\r
                                __('Tourner') => 'flip')\r
                );\r
+               $this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,\r
+                       'datas' => array(__('Normal (livre)') => 'book',\r
+                               __('Magazine tablette') => 'tab')\r
+               );\r
                $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));\r
 \r
                $this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Utiliser les icônes vectorielles'));\r
@@ -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);\r
 \r
                $this->forms['mobile'] = array('label' => __('Version mobile'),\r
-                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace'));\r
+                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', 'mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace'));\r
 \r
                $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');\r
                $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');\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 6bdf65266ec7d55cf961ee9310b8705e99de9abe..607d468991717d706af52111b7e02c9f231a6f27 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -330,6 +330,9 @@ class wsDocument extends cubeMetier {
        }\r
 \r
        public function optimizeSVG() {\r
+\r
+\r
+\r
                $scour = new cubeCommandLine('scour.php');\r
                $scour->setPath(CONVERTER_PATH);\r
                $scour->setNohup(true);\r
@@ -571,16 +574,9 @@ class wsDocument extends cubeMetier {
 \r
        public function makeSVGFile($page) {\r
                $svgFile = $this->out . '/html/p' . $page . '.svg';\r
+               //$svgSimplified = $this->out . '/html/s' . $page . '.svg';\r
                $svgOpt = $this->out . '/html/o' . $page . '.svg';\r
 \r
-               /* $pdf2svg = new cubeCommandLine('pdf2svg');\r
-                 $pdf2svg->setPath(CONVERTER_PATH);\r
-                 $pdf2svg->setArg(null, $this->cropped);\r
-                 $pdf2svg->setArg(null, $svgFile);\r
-                 $pdf2svg->setArg(null, $page);\r
-                 $pdf2svg->execute();\r
-                 $this->addToLog($pdf2svg, true, $page); */\r
-\r
                $pdftocairo = new cubeCommandLine('pdftocairo');\r
                $pdftocairo->setPath(CONVERTER_PATH);\r
                $pdftocairo->setArg('f', $page);\r
@@ -592,7 +588,6 @@ class wsDocument extends cubeMetier {
                $pdftocairo->execute();\r
                $this->addToLog($pdftocairo, true, $page);\r
 \r
-\r
                $svg = new DOMDocument();\r
                $svg->preserveWhiteSpace = false;\r
                $svg->load($svgFile);\r
@@ -630,6 +625,19 @@ class wsDocument extends cubeMetier {
 \r
                $this->addToLog(implode("\n", $svglog), false, $page);\r
                file_put_contents($svgFile, $svg->saveXML());\r
+\r
+               // Simplify\r
+               /*              copy($svgFile, $svgSimplified);\r
+                 $inkscape = new cubeCommandLine('inkscape');\r
+                 $inkscape->setPath(CONVERTER_PATH);\r
+                 // --verb=EditSelectAll --verb=SelectionSimplify --verb=FileSave --verb=FileClose\r
+                 $inkscape->setArg('file', $svgSimplified);\r
+                 $inkscape->setArg('verb', 'EditSelectAll');\r
+                 $inkscape->setArg('verb', 'SelectionSimplify');\r
+                 $inkscape->setArg('verb', 'FileSave');\r
+                 $inkscape->setArg('verb', 'FileClose');\r
+                 $inkscape->execute();\r
+                 $this->addToLog($inkscape, false, $page); */\r
        }\r
 \r
        protected function checkObjectsNumber($file, $maxObjects, $page) {\r
@@ -746,7 +754,6 @@ class wsDocument extends cubeMetier {
                }\r
 \r
                if (!in_array($method, array(self::BARBARE_PNM, self::BARBARE_GS))) {\r
-\r
                        if (in_array($version, array('legacy', 'stable', 'latest', 'git'))) {\r
                                $program = '/usr/local/swftools/' . $version . '/bin/pdf2swf';\r
                        } else {\r
@@ -769,7 +776,6 @@ class wsDocument extends cubeMetier {
                                $pdf2swf->setArg('set poly2bitmap');\r
                                $multiply = self::$resolution2multiply[$resolution];\r
                                $pdf2swf->setArg('set multiply', $multiply);\r
-                               \r
                        } elseif ($method == self::BITMAP) {\r
                                // Raster all\r
                                $pdf2swf->setArg('set bitmap');\r
@@ -796,11 +802,7 @@ class wsDocument extends cubeMetier {
                                $pdf2swf->setArg(null, '-T7');\r
                                $pdf2swf->setArg('set alignfonts');\r
                        }\r
-                       /* if(file_exists($this->rgb)){\r
-                         $pdf2swf->setArg(null, $this->rgb);\r
-                         }else{ */\r
                        $pdf2swf->setArg(null, $this->cropped);\r
-                       //}\r
                        $pdf2swf->setArg('output', $this->out . $prefix . '%.swf');\r
                        $pdf2swf->execute();\r
 \r