From 648c5bffbc1990865498f7ec2d4bf709b81fd51c Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 18 Dec 2017 17:47:00 +0000 Subject: [PATCH] #1762 @6 --- fluidbook/icones/15/interface.svg | 30 +++++++++++++++++ inc/ws/Metier/class.ws.book.parametres.php | 33 +++++++++++++++---- inc/ws/Util/class.ws.links.php | 4 ++- .../burgermenu/class.ws.html5.compiler.php | 2 +- .../centerbook/class.ws.html5.compiler.php | 2 +- .../html5/centerbook/class.ws.html5.links.php | 3 +- .../html5/master/class.ws.html5.compiler.php | 2 +- .../class.ws.html5.compiler.php | 2 +- 8 files changed, 66 insertions(+), 12 deletions(-) diff --git a/fluidbook/icones/15/interface.svg b/fluidbook/icones/15/interface.svg index f20703857..207fbf688 100644 --- a/fluidbook/icones/15/interface.svg +++ b/fluidbook/icones/15/interface.svg @@ -149,4 +149,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index e6e6e3fa4..d535d974c 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -64,6 +64,10 @@ class wsBookParametres extends wsParametres { $branches[$b . ' : git'] = $b . '|git'; $branches[$b . ' : local'] = $b . '|local'; } + $extraVisibility = [ + __('Navigation horizontale') => 'horizontal', + __('Navigation burger') => 'burger', + __('Navigations horizontale et burger') => 'both']; $this->fields['mobileLVersion'] = array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' => 1, @@ -137,19 +141,36 @@ class wsBookParametres extends wsParametres { $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3); - $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, search, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help, lang', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 3); + $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, search, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, extra, extra1, extra2, extra3, extra4, extra5, help, lang', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 3); $this->fields['tooltipTimer'] = array('type' => 'float', 'default' => 3, "editable" => true, 'label' => __("Temps maximum d'apparition des infos-bulles (en secondes)")); - $this->fields['navExtraImage'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Nav extra image (desktop)'), 'fileFilter' => $imageExtraFilter); - $this->fields['navExtraImageMobile'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Nav extra image (mobile, optional)'), 'fileFilter' => $imageExtraFilter); - $this->fields['navExtraLink'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("URL for Nav extra image")); - $this->fields['navExtraTooltip'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Tooltip for Nav extra image")); $this->forms['general'] = array('label' => __('Fonctionnalités générales'), - 'fieldsnames' => array('navOrder', 'navExtraImage', 'navExtraImageMobile', 'navExtraLink', 'navExtraTooltip', 'tooltipTimer', 'preload', 'pages', 'width', 'height')); + 'fieldsnames' => array('navOrder', 'tooltipTimer', 'preload', 'pages', 'width', 'height')); //. // + $this->forms['menu'] = array('label' => __('Menu'), 'fieldsnames' => ['afterSearchDisplayForHTML', '|']); + $this->fields['afterSearchDisplayForHTML'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher l\'image après le moteur de recherche sur la version HTML5'), 'grade' => 1); + $extraNum = 5; + for ($i = 0; $i <= $extraNum; $i++) { + if ($i > 0) { + $j = $i; + $this->fields['navExtraIcon' . $j] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Icône supplémentaire') . ' ' . $j, 'fileFilter' => $imageExtraFilter); + $this->fields['navExtraLink' . $j] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("URL") . ' ' . $j); + $this->fields['navExtraVisibility' . $j] = array('type' => 'combo', 'datas' => $extraVisibility, 'default' => 'both', 'editable' => true, 'label' => __("Visible") . ' ' . $j); + $this->forms['menu']['fieldsnames'] = array_merge($this->forms['menu']['fieldsnames'], ['navExtraIcon' . $j, 'navExtraLink' . $j, 'navExtraVisibility' . $j, '|']); + } else { + $j = ''; + $this->fields['navExtraImage' . $j] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Image pour navigation'), 'fileFilter' => $imageExtraFilter); + $this->fields['navExtraImageMobile' . $j] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Image pour mobile'), 'fileFilter' => $imageExtraFilter); + $this->fields['navExtraLink' . $j] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("URL")); + $this->fields['navExtraTooltip' . $j] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Infobulle ou label")); + $this->forms['menu']['fieldsnames'] = array_merge($this->forms['menu']['fieldsnames'], ['navExtraImage' . $j, 'navExtraImageMobile' . $j, 'navExtraLink' . $j, 'navExtraTooltip' . $j, '|']); + } + } + + $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran')); $this->fields['fullscreenAuto'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Lancer la publication en mode plein écran (lorsque possible)')); $this->forms['fs'] = array('label' => __('Plein écran'), diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php index ffa711141..45030d876 100644 --- a/inc/ws/Util/class.ws.links.php +++ b/inc/ws/Util/class.ws.links.php @@ -17,6 +17,7 @@ class wsLinks { set_time_limit(0); $cols = array( + 'uid'=>__('Identifiant unique'), 'page' => __('Page de la publication'), 'left' => __('x'), 'top' => __('y'), 'width' => __('Largeur'), 'height' => __('Hauteur'), 'rot' => __('Rotation'), 'type' => __('Type'), 'to' => __('Destination'), 'target' => __('Cible'), 'infobulle' => __('Infobulle'), 'numerotation' => __('Numérotation'), @@ -341,7 +342,8 @@ class wsLinks { $numerotation = 'physical'; } - $links[] = array('page' => $page, + $links[] = array( + 'page' => $page, 'left' => $left, 'top' => $top, 'width' => $width, 'height' => $height, 'rot' => '', 'type' => $type, 'to' => $to, 'target' => $target, 'infobulle' => '', 'numerotation' => $numerotation, 'display_area' => '1'); diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php index ace9c99ca..6cb2892c6 100644 --- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php @@ -1335,7 +1335,7 @@ class wsHTML5Compiler { $menuColor = new CubeIT_Graphics_Color($this->theme->parametres->couleurB); $menuColor->setAlpha(1); $menuTextColor = wsHTML5::colorToCSS($this->theme->parametres->subTextColor); - $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1080px' : $this->book->parametres->menuBreakpoint; + $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1023px' : $this->book->parametres->menuBreakpoint; $lessVariables['menu-breakpoint'] = $menuBreakpoint; $lessVariables['menu-background'] = $menuColor->toCSS(); diff --git a/inc/ws/Util/html5/centerbook/class.ws.html5.compiler.php b/inc/ws/Util/html5/centerbook/class.ws.html5.compiler.php index b8fc35271..418add26a 100644 --- a/inc/ws/Util/html5/centerbook/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/centerbook/class.ws.html5.compiler.php @@ -1397,7 +1397,7 @@ class wsHTML5Compiler { $menuColor = new CubeIT_Graphics_Color($this->theme->parametres->couleurB); $menuColor->setAlpha(1); $menuTextColor = wsHTML5::colorToCSS($this->theme->parametres->subTextColor); - $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1080px' : $this->book->parametres->menuBreakpoint; + $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1023px' : $this->book->parametres->menuBreakpoint; $lessVariables['menu-breakpoint'] = $menuBreakpoint; $lessVariables['menu-background'] = $menuColor->toCSS(); diff --git a/inc/ws/Util/html5/centerbook/class.ws.html5.links.php b/inc/ws/Util/html5/centerbook/class.ws.html5.links.php index 57650bc5c..e45ff4176 100644 --- a/inc/ws/Util/html5/centerbook/class.ws.html5.links.php +++ b/inc/ws/Util/html5/centerbook/class.ws.html5.links.php @@ -28,6 +28,7 @@ class wsHTML5Link { public $id; public $rot; public $class; + public $uid; protected $_init; @@ -198,7 +199,7 @@ class wsHTML5Link { } public function getHTMLContainer() { - return '
' . $this->getHTMLContent() . '
'; + return '
' . $this->getHTMLContent() . '
'; } public function getHTMLContainerClass() { diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php index 2811fec69..067626e1f 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -1397,7 +1397,7 @@ class wsHTML5Compiler { $menuColor = new CubeIT_Graphics_Color($this->theme->parametres->couleurB); $menuColor->setAlpha(1); $menuTextColor = wsHTML5::colorToCSS($this->theme->parametres->subTextColor); - $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1080px' : $this->book->parametres->menuBreakpoint; + $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1023px' : $this->book->parametres->menuBreakpoint; $lessVariables['menu-breakpoint'] = $menuBreakpoint; $lessVariables['menu-background'] = $menuColor->toCSS(); diff --git a/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php b/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php index 0aa3ba708..6f02bfd48 100644 --- a/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php @@ -1385,7 +1385,7 @@ class wsHTML5Compiler { $menuColor = new CubeIT_Graphics_Color($this->theme->parametres->couleurB); $menuColor->setAlpha(1); $menuTextColor = wsHTML5::colorToCSS($this->theme->parametres->subTextColor); - $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1080px' : $this->book->parametres->menuBreakpoint; + $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1023px' : $this->book->parametres->menuBreakpoint; $lessVariables['menu-breakpoint'] = $menuBreakpoint; $lessVariables['menu-background'] = $menuColor->toCSS(); -- 2.39.5