From 732d0548bdb9b2800c7557240b3916d4bd42669e Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 9 Jul 2010 17:42:40 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.url.php | 38 +++++++++++++++++++-- inc/ws/DAO/class.ws.dao.book.php | 6 ++++ inc/ws/Metier/class.ws.book.parametres.php | 18 +++++++--- inc/ws/Metier/class.ws.parametres.php | 18 ++++++++++ inc/ws/Metier/class.ws.theme.parametres.php | 10 +++--- 5 files changed, 79 insertions(+), 11 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 1a55cf315..2b7b17abc 100644 --- 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() { global $core; - $dao=new wsDAOBook($core->con); + $dao = new wsDAOBook($core->con); header('Content-type: text/plain'); ob_clean(); - echo $dao->compile(2963,3); + echo $dao->compile(2963, 3); exit; } + + public static function getParamsHelp() + { + $res = ''; + + $theme = new wsThemeParametres(new wsTheme()); + $res .= self::formatHelp($theme->getHelp()); + + $book = new wsBookParametres(new wsBook()); + $res .= self::formatHelp($book->getHelp()); + + header('Content-type: text/plain; charset=UTF-8'); + ob_clean(); + echo $res; + exit; + } + + public static function formatHelp($rubriques) + { + $res = ''; + foreach($rubriques as $label => $fields) { + $res .= "\n" . '-------------------------' . "\n" ; + $res .= $label . "\n"; + $res .= '-------------------------' . "\n\n"; + foreach($fields as $name => $label) { + if ($label == '|') { + $res .= '--' . "\n"; + } else { + $res .= $name . str_repeat("\t", 4 - floor(strlen($name) / 8)) . ': ' . $label . "\n"; + } + } + } + return $res; + } } ?> \ 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 6bedc633b..baaef8d1f 100644 --- 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) { $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i); } + // Theme assets $themeRoot = ROOT . '/themes/' . $theme->theme_id . '/'; if ($theme->parametres->useBackgroundImage) { $flex->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background'); @@ -440,6 +441,11 @@ class wsDAOBook extends extranetDAO { $flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu'); } $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo'); + // Library + $flex->addSWF(ROOT . '/swf/fluidbook3dLibrary.swf', 'library'); + // Fonts + $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'Atlantis', 'ASCII'); + $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'DinMedium', 'Latin'); return $flex->compile(); } } diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 75770f27d..ec08478b6 100644 --- 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); } + /** + * wsBookParametres::initFields() + * + * @return + */ protected function initFields() { parent::initFields(); @@ -32,12 +37,14 @@ class wsBookParametres extends wsParametres { $this->fields['width'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Largeur'), 'extra' => false, 'grade' => 0); $this->fields['height'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Hauteur'), 'extra' => false, 'grade' => 0); // . - $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Impression'), 'extra' => false, 'grade' => 1); - $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Moteur de recherche'), 'extra' => false, 'grade' => 1); - $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Marques-pages'), 'extra' => false, 'grade' => 1); + $this->fields['twoDmode'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Activer le mode 2D"), 'extra' => false, 'grade' => 1); + $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'impression"), 'extra' => false, 'grade' => 1); + $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le moteur de recherche'), 'extra' => false, 'grade' => 1); + $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'), 'extra' => false, 'grade' => 1); + $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'), 'extra' => false, 'grade' => 1); $this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site"), 'extra' => false, 'grade' => 1); $this->forms['general'] = array('label' => __('Fonctionnalités générales'), - 'fieldsnames' => array('print', 'search', 'bookmark')); + 'fieldsnames' => array('print', 'search', 'bookmark', 'fullscreen','twoDmode', 'pages', 'width', 'height')); // . $this->fields['first_page_nr'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('La numérotation débute à la page'), 'extra' => false, 'grade' => 1); $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'extra' => false, 'grade' => 1); @@ -48,10 +55,11 @@ class wsBookParametres extends wsParametres { 'fieldsnames' => array('preload', 'reading_dir')); // . $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Export PDF'), 'extra' => false, 'grade' => 1); + $this->fields['pdfName'] = array('type' => 'text', 'default' => 'document.pdf', 'editable' => true, 'label' => __('Nom du fichier PDF'), 'extra' => false, 'grade' => 1); $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"); $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Export PDF avancé'), 'extra' => false, 'grade' => 3); $this->forms['pdf'] = array('label' => __('Fonction Export PDF'), - 'fieldsnames' => array('pdf', 'optimizepdf', 'pdfComplex')); + 'fieldsnames' => array('pdf', 'pdfName', 'optimizepdf', 'pdfComplex')); // . $this->fields['zoom'] = array('type' => 'integer', 'default' => 200, 'editable' => true, 'label' => __('Zoom par défaut (atteint au clic)'), 'extra' => false, 'grade' => 1); $this->fields['zoomw'] = array('type' => 'integer', 'default' => 300, 'editable' => true, 'label' => __("Zoom maximal (atteint à l'aide de la molette)"), 'extra' => false, 'grade' => 1); diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php index 8b2b1d876..9fc8c0e9d 100644 --- 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 { } return $res; } + + public function getHelp() + { + $rubriques = array(); + foreach($this->forms as $name => $form) { + $rub = array(); + foreach($form['fieldsnames'] as $f) { + if ($f == '|') { + $rub[] = '|'; + } else { + $field = $this->fields[$f]; + $rub[$f] = '('.$field['type'].')'.str_repeat("\t", 2 - floor((strlen($field['type'])+2) / 12)).$field['label']; + } + } + $rubriques[$form['label']] = $rub; + } + return $rubriques; + } } ?> \ 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 f5dc908a4..4e6577371 100644 --- 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); $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, 'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4); - $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true, - 'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1); - + $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, + 'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1); + $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, + 'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1); /* Regroupement des champs par formulaire */ $this->forms['background'] = array('label' => __('Personnalisation du fond'), @@ -125,7 +126,8 @@ class wsThemeParametres extends wsParametres { '|', 'usePageEdges', 'pageEdgeColor', '|', 'bookShadeColor', '|', 'displayPageNumber', 'colorPageNumber', - '|', 'linksColor')); + '|', 'linksColor', + '|', 'extraXSpace', 'extraYSpace')); $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'), 'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition')); $this->forms['menu'] = array('label' => __('Personnalisation des menus'), -- 2.39.5