(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 1a55cf31550812a63a66dd7ba82ba6e4dace03c9..2b7b17abcca77817dead65f8979a4a35769cb6be 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -123,12 +123,46 @@ html{height:100%}' . "\n";
        public static function testAS()\r
        {\r
                global $core;\r
-               $dao=new wsDAOBook($core->con);\r
+               $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
                ob_clean();\r
-               echo $dao->compile(2963,3);\r
+               echo $dao->compile(2963, 3);\r
                exit;\r
        }\r
+\r
+       public static function getParamsHelp()\r
+       {\r
+               $res = '';\r
+\r
+               $theme = new wsThemeParametres(new wsTheme());\r
+               $res .= self::formatHelp($theme->getHelp());\r
+\r
+               $book = new wsBookParametres(new wsBook());\r
+               $res .= self::formatHelp($book->getHelp());\r
+\r
+               header('Content-type: text/plain; charset=UTF-8');\r
+               ob_clean();\r
+               echo $res;\r
+               exit;\r
+       }\r
+\r
+       public static function formatHelp($rubriques)\r
+       {\r
+               $res = '';\r
+               foreach($rubriques as $label => $fields) {\r
+                       $res .= "\n" . '-------------------------' . "\n" ;\r
+                       $res .= $label . "\n";\r
+                       $res .= '-------------------------' . "\n\n";\r
+                       foreach($fields as $name => $label) {\r
+                               if ($label == '|') {\r
+                                       $res .= '--' . "\n";\r
+                               } else {\r
+                                       $res .= $name . str_repeat("\t", 4 - floor(strlen($name) / 8)) . ': ' . $label . "\n";\r
+                               }\r
+                       }\r
+               }\r
+               return $res;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 6bedc633b9eb871b1c03a6a25d8355f8c8ae62db..baaef8d1f222e97d1d73c4fd8e38d57e24a5d1b0 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -432,6 +432,7 @@ class wsDAOBook extends extranetDAO {
                foreach($pages as $i => $infos) {\r
                        $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
                }\r
+               // Theme assets\r
                $themeRoot = ROOT . '/themes/' . $theme->theme_id . '/';\r
                if ($theme->parametres->useBackgroundImage) {\r
                        $flex->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background');\r
@@ -440,6 +441,11 @@ class wsDAOBook extends extranetDAO {
                        $flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu');\r
                }\r
                $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
+               // Library\r
+               $flex->addSWF(ROOT . '/swf/fluidbook3dLibrary.swf', 'library');\r
+               // Fonts\r
+               $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'Atlantis', 'ASCII');\r
+               $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'DinMedium', 'Latin');\r
                return $flex->compile();\r
        }\r
 }\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 75770f27d981d4e04c17e6f2ce9d978803f7be6c..ec08478b6ac4b821c8e6858cc8328c783bbc3331 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -5,6 +5,11 @@ class wsBookParametres extends wsParametres {
                parent::__construct($parent);\r
        }\r
 \r
+       /**\r
+        * wsBookParametres::initFields()\r
+        *\r
+        * @return\r
+        */\r
        protected function initFields()\r
        {\r
                parent::initFields();\r
@@ -32,12 +37,14 @@ class wsBookParametres extends wsParametres {
                $this->fields['width'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Largeur'), 'extra' => false, 'grade' => 0);\r
                $this->fields['height'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Hauteur'), 'extra' => false, 'grade' => 0);\r
                // .\r
-               $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Impression'), 'extra' => false, 'grade' => 1);\r
-               $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Moteur de recherche'), 'extra' => false, 'grade' => 1);\r
-               $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Marques-pages'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['twoDmode'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Activer le mode 2D"), 'extra' => false, 'grade' => 1);\r
+               $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'impression"), 'extra' => false, 'grade' => 1);\r
+               $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le moteur de recherche'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'), 'extra' => false, 'grade' => 1);\r
                $this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site"), 'extra' => false, 'grade' => 1);\r
                $this->forms['general'] = array('label' => __('Fonctionnalités générales'),\r
-                       'fieldsnames' => array('print', 'search', 'bookmark'));\r
+                       'fieldsnames' => array('print', 'search', 'bookmark', 'fullscreen','twoDmode', 'pages', 'width', 'height'));\r
                // .\r
                $this->fields['first_page_nr'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('La numérotation débute à la page'), 'extra' => false, 'grade' => 1);\r
                $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'extra' => false, 'grade' => 1);\r
@@ -48,10 +55,11 @@ class wsBookParametres extends wsParametres {
                        'fieldsnames' => array('preload', 'reading_dir'));\r
                // .\r
                $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Export PDF'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['pdfName'] = array('type' => 'text', 'default' => 'document.pdf', 'editable' => true, 'label' => __('Nom du fichier PDF'), 'extra' => false, 'grade' => 1);\r
                $this->fields['optimizepdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Optimiser le PDF'), 'extra' => false, 'grade' => 4, 'hint' => "Permet de réduire la taille du document PDF");\r
                $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Export PDF avancé'), 'extra' => false, 'grade' => 3);\r
                $this->forms['pdf'] = array('label' => __('Fonction Export PDF'),\r
-                       'fieldsnames' => array('pdf', 'optimizepdf', 'pdfComplex'));\r
+                       'fieldsnames' => array('pdf', 'pdfName', 'optimizepdf', 'pdfComplex'));\r
                // .\r
                $this->fields['zoom'] = array('type' => 'integer', 'default' => 200, 'editable' => true, 'label' => __('Zoom par défaut (atteint au clic)'), 'extra' => false, 'grade' => 1);\r
                $this->fields['zoomw'] = array('type' => 'integer', 'default' => 300, 'editable' => true, 'label' => __("Zoom maximal (atteint à l'aide de la molette)"), 'extra' => false, 'grade' => 1);\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 8b2b1d876a2241ef857bd7136f687f46d92674a9..9fc8c0e9d0df4baf4edbf25b1a45b49b4646a4e0 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -209,6 +209,24 @@ class wsParametres extends cubeMetier implements Iterator {
                }\r
                return $res;\r
        }\r
+\r
+       public function getHelp()\r
+       {\r
+               $rubriques = array();\r
+               foreach($this->forms as $name => $form) {\r
+                       $rub = array();\r
+                       foreach($form['fieldsnames'] as $f) {\r
+                               if ($f == '|') {\r
+                                       $rub[] = '|';\r
+                               } else {\r
+                                       $field = $this->fields[$f];\r
+                                       $rub[$f] = '('.$field['type'].')'.str_repeat("\t", 2 - floor((strlen($field['type'])+2) / 12)).$field['label'];\r
+                               }\r
+                       }\r
+                       $rubriques[$form['label']] = $rub;\r
+               }\r
+               return $rubriques;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index f5dc908a4fd280ae589e80eec7374f59765acc04..4e6577371ed458b7b6776cd877d514ba6cd7a412 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -106,9 +106,10 @@ class wsThemeParametres extends wsParametres {
                        'label' => __('Couleur des numéros de page'), 'extra' => true, 'grade' => 4);\r
                $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
                        'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4);\r
-               $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
-                       'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1);\r
-\r
+               $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r
+                       'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r
+                       'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1);\r
                /* Regroupement des champs par formulaire */\r
 \r
                $this->forms['background'] = array('label' => __('Personnalisation du fond'),\r
@@ -125,7 +126,8 @@ class wsThemeParametres extends wsParametres {
                                '|', 'usePageEdges', 'pageEdgeColor',\r
                                '|', 'bookShadeColor',\r
                                '|', 'displayPageNumber', 'colorPageNumber',\r
-                               '|', 'linksColor'));\r
+                               '|', 'linksColor',\r
+                               '|', 'extraXSpace', 'extraYSpace'));\r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
                        'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition'));\r
                $this->forms['menu'] = array('label' => __('Personnalisation des menus'),\r