(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index d480fc9e85260727d30b999e8cf6b1d803ef1e74..9d47c58587e0391b01a75b78ffc1907c16b8262b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -268,7 +268,7 @@ class wsAjax extends cubeAjax {
 \r
                fb(time(), 'start transfert');\r
                if ($server == 'references') {\r
-                       $root = '/home/fluidbook/dev/references';\r
+                       $root = '/home/fluidbook/www/references';\r
                        $url = 'http://www.fluidbook.com/references/';\r
                        $protocol = 'rsync';\r
                } else if ($server == 'hosting') {\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index a82a13eca7836356f31e74c0b7553d286e53ec9f..ab79954a87bc718f752d4aad0a0f476df0d47e78 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -608,18 +608,11 @@ class wsFlash extends cubeFlashGateway {
                $size = $firstDoc->generalInfos['size'];\r
                $this->xml->addChild('width', $size[0]);\r
                $this->xml->addChild('height', $size[1]);\r
-               $res = __('Nombre de pages') . ' : ' . "\n";\r
+               $res = '<b>'.__('Nombre de pages') . '</b> : ' ;\r
                $res .= $nb_pages . ' ' . __('pages') . "\n";\r
                $res .= "\n";\r
-               $res .= __('Dimensions') . ' : ' . "\n";\r
+               $res .= '<b>'.__('Dimensions') . '</b> : ' . "\n";\r
                $res .= round($size[0], 3) . ' x ' . round($size[1], 3) . ' pts' . "\n";\r
-               $res .= "\n";\r
-               $res .= __('Taille totale des pages') . ' : ' . "\n";\r
-               $res .= $total . "\n";\r
-               $res .= "\n";\r
-               $res .= __('Taille moyenne des pages') . ' : ' . "\n";\r
-               $res .= $average . "\n";\r
-               $res .= "\n";\r
                $this->xml->addChild('infos', $res);\r
        }\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 45894e8e0c35e5775e15f2edd65166f29cbcefa3..450aee9cb386c53e68f4ed42a08cdf01a780b46e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -95,6 +95,8 @@ class wsServices extends cubeFlashGateway {
                        if ($total > 1) {\r
                                $s = ' (' . ($i + 1) . '/' . $total . ')';\r
                        }\r
+                       \r
+                       \r
 \r
                        // Send the email\r
                        $mail = new cubeMail();\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index fe41809b2850866a790a86c9ef14881a8ce4938c..9984044246ba6f3001d627bfaec11c8602a11ae9 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -86,13 +86,14 @@ class wsBookParametres extends wsParametres {
                $this->fields['centerBook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Centrer la publication sur les couvertures'), 'grade' => 2);\r
                $this->fields['correctCenter'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Corriger les lignes blanches entre les pages'), 'grade' => 2);\r
                $this->forms['3d_mode'] = array('label' => __('Options de visualisation'),\r
-                       'fieldsnames' => array('visualisationMode', 'antialiasReading','correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));\r
+                       'fieldsnames' => array('visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));\r
 \r
+               $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3);\r
                $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'));\r
                $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 5);\r
                $this->fields['tooltipTimer'] = array('type' => 'float', 'default' => 3, "editable" => true, 'label' => __("Temps maximum d'apparition des infos-bulles (en secondes)"));\r
                $this->forms['general'] = array('label' => __('Fonctionnalités générales'),\r
-                       'fieldsnames' => array('fullscreen', 'navOrder', 'tooltipTimer', 'pages', 'width', 'height'));\r
+                       'fieldsnames' => array('fullscreen', 'navOrder', 'tooltipTimer', 'preload', 'pages', 'width', 'height'));\r
                //.\r
                //\r
                \r
@@ -108,7 +109,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage"));\r
                $this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes"));\r
                $this->forms['help'] = array('label' => __('Aide'),\r
-                       'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime','|','helpBookmarks'));\r
+                       'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime', '|', 'helpBookmarks'));\r
                // .\r
                //              \r
                $this->fields['indexAutoScroll'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le scroll automatique'));\r
@@ -147,10 +148,6 @@ class wsBookParametres extends wsParametres {
                $this->forms['sound'] = array('label' => __('Effets sonores'),\r
                        'fieldsnames' => array('soundTheme', 'soundOn'));\r
                // .\r
-               $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3);\r
-               $this->forms['general_settings'] = array('label' => __('Paramètres généraux'),\r
-                       'fieldsnames' => array('preload'));\r
-               // .\r
                $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les fonctions de téléchargement"));\r
                $this->fields['pdfName'] = array('type' => 'text', 'default' => 'document.pdf', 'editable' => true, 'label' => __("Nom du fichier PDF"));\r
                $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), "hint" => __("Permet à l'utilisateur de sélectionner les pages qu'il souhaite télécharger"), 'grade' => 3);\r
@@ -159,7 +156,7 @@ class wsBookParametres extends wsParametres {
                        'label' => __('PDF de remplacement'), 'grade' => 3, 'fileFilter' => $pdfFilter);\r
                $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), "hint" => __('Valable si le téléchargement avancé est activé'), 'grade' => 3);\r
                $this->forms['pdf'] = array('label' => __('Fonction de téléchargement'),\r
-                       'fieldsnames' => array('pdf', 'pdfName', 'pdfReplace','pdfCompress', 'pdfComplex', 'offlineExport'));\r
+                       'fieldsnames' => array('pdf', 'pdfName', 'pdfReplace', 'pdfCompress', 'pdfComplex', 'offlineExport'));\r
                // .\r
                $this->fields['zoomMode'] = array('type' => 'combo', 'default' => '0', 'editable' => true, 'label' => __("Mode de zoom"), 'grade' => 3,\r
                        'datas' => array(__('Normal') => '0',\r