From: vincent@cubedesigners.com Date: Wed, 4 Oct 2017 14:14:19 +0000 (+0000) Subject: #1719 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e26ce6ce9ad894835460e540d4910358f85c117d;p=cubeextranet.git #1719 --- diff --git a/fluidbook/icones/10/mobile/nav-sommaire.svg b/fluidbook/icones/10/mobile/nav-sommaire.svg index d20f8be39..2655f2aa5 100644 --- a/fluidbook/icones/10/mobile/nav-sommaire.svg +++ b/fluidbook/icones/10/mobile/nav-sommaire.svg @@ -2,10 +2,11 @@ + width="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve"> - + diff --git a/fluidbook/icones/13/mobile/nav-archives.svg b/fluidbook/icones/13/mobile/nav-archives.svg index e27a85544..4baa8e05b 100644 --- a/fluidbook/icones/13/mobile/nav-archives.svg +++ b/fluidbook/icones/13/mobile/nav-archives.svg @@ -2,13 +2,13 @@ + width="24px" height="20px" viewBox="0 -2 24 20" enable-background="new 0 -2 24 20" xml:space="preserve"> - - - - + - \ No newline at end of file + + + + diff --git a/fluidbook/icones/13/mobile/nav-bookmark.svg b/fluidbook/icones/13/mobile/nav-bookmark.svg index 69448824e..df5de97d7 100644 --- a/fluidbook/icones/13/mobile/nav-bookmark.svg +++ b/fluidbook/icones/13/mobile/nav-bookmark.svg @@ -2,14 +2,14 @@ - + width="16px" height="20px" viewBox="0 -2 16 20" enable-background="new 0 -2 16 20" xml:space="preserve"> + diff --git a/fluidbook/icones/13/mobile/nav-friend.svg b/fluidbook/icones/13/mobile/nav-friend.svg index b87ee7b2b..778adb1ee 100644 --- a/fluidbook/icones/13/mobile/nav-friend.svg +++ b/fluidbook/icones/13/mobile/nav-friend.svg @@ -2,7 +2,7 @@ - + width="17px" height="20px" viewBox="0 0 17 20" enable-background="new 0 0 17 20" xml:space="preserve"> + diff --git a/fluidbook/icones/13/mobile/nav-fullscreen.svg b/fluidbook/icones/13/mobile/nav-fullscreen.svg index 11b686275..ec8fce0f7 100644 --- a/fluidbook/icones/13/mobile/nav-fullscreen.svg +++ b/fluidbook/icones/13/mobile/nav-fullscreen.svg @@ -2,15 +2,15 @@ + width="16px" height="20px" viewBox="0 0 16 20" enable-background="new 0 0 16 20" xml:space="preserve"> - - - - + + + + diff --git a/fluidbook/icones/13/mobile/nav-help.svg b/fluidbook/icones/13/mobile/nav-help.svg index 014cd0953..46f7f5bb2 100644 --- a/fluidbook/icones/13/mobile/nav-help.svg +++ b/fluidbook/icones/13/mobile/nav-help.svg @@ -2,8 +2,11 @@ - + width="9px" height="20px" viewBox="0 0 9 20" enable-background="new 0 0 9 20" xml:space="preserve"> + + + + diff --git a/fluidbook/icones/13/mobile/nav-home.svg b/fluidbook/icones/13/mobile/nav-home.svg index 01739f4fe..2f4cd2de3 100644 --- a/fluidbook/icones/13/mobile/nav-home.svg +++ b/fluidbook/icones/13/mobile/nav-home.svg @@ -2,13 +2,11 @@ + width="16px" height="20px" viewBox="0 0 16 20" enable-background="new 0 0 16 20" xml:space="preserve"> - + + + diff --git a/fluidbook/icones/13/mobile/nav-index.svg b/fluidbook/icones/13/mobile/nav-index.svg index eb7b8e735..44b1639a0 100644 --- a/fluidbook/icones/13/mobile/nav-index.svg +++ b/fluidbook/icones/13/mobile/nav-index.svg @@ -2,12 +2,17 @@ + width="22px" height="20px" viewBox="0 0 22 20" enable-background="new 0 0 22 20" xml:space="preserve"> - - + + + + + diff --git a/fluidbook/icones/13/mobile/nav-map.svg b/fluidbook/icones/13/mobile/nav-map.svg index 8a327abef..a11f1ae0e 100644 --- a/fluidbook/icones/13/mobile/nav-map.svg +++ b/fluidbook/icones/13/mobile/nav-map.svg @@ -2,16 +2,7 @@ - - - + width="12px" height="20px" viewBox="0 0 12 20" enable-background="new 0 0 12 20" xml:space="preserve"> + diff --git a/fluidbook/icones/13/mobile/nav-print-pdf.svg b/fluidbook/icones/13/mobile/nav-print-pdf.svg index 6ab8f7701..5e65566bc 100644 --- a/fluidbook/icones/13/mobile/nav-print-pdf.svg +++ b/fluidbook/icones/13/mobile/nav-print-pdf.svg @@ -2,20 +2,8 @@ - - - - - - - - + width="19px" height="20px" viewBox="0 0 19 20" enable-background="new 0 0 19 20" xml:space="preserve"> + diff --git a/fluidbook/icones/13/mobile/nav-print.svg b/fluidbook/icones/13/mobile/nav-print.svg index 710863c8b..e8e775c5c 100644 --- a/fluidbook/icones/13/mobile/nav-print.svg +++ b/fluidbook/icones/13/mobile/nav-print.svg @@ -2,14 +2,13 @@ + width="16px" height="20px" viewBox="0 0 16 20" enable-background="new 0 0 16 20" xml:space="preserve"> - + diff --git a/fluidbook/icones/13/mobile/nav-sommaire.svg b/fluidbook/icones/13/mobile/nav-sommaire.svg index c4fd6811c..f02773987 100644 --- a/fluidbook/icones/13/mobile/nav-sommaire.svg +++ b/fluidbook/icones/13/mobile/nav-sommaire.svg @@ -2,21 +2,19 @@ + width="19px" height="20px" viewBox="0 0 19 20" enable-background="new 0 0 19 20" xml:space="preserve"> - - - + diff --git a/fluidbook/icones/13/mobile/nav-tag.svg b/fluidbook/icones/13/mobile/nav-tag.svg index c1b0c5375..98e2ba97d 100644 --- a/fluidbook/icones/13/mobile/nav-tag.svg +++ b/fluidbook/icones/13/mobile/nav-tag.svg @@ -2,19 +2,18 @@ + width="19.064px" height="20px" viewBox="0 0 19.064 20" enable-background="new 0 0 19.064 20" xml:space="preserve"> - - + + diff --git a/fluidbook/icones/13/mobile/nav-zoomin.svg b/fluidbook/icones/13/mobile/nav-zoomin.svg index db397d17a..9c676a8fa 100644 --- a/fluidbook/icones/13/mobile/nav-zoomin.svg +++ b/fluidbook/icones/13/mobile/nav-zoomin.svg @@ -2,11 +2,9 @@ - - - + width="16.037px" height="20px" viewBox="0 0 16.037 20" enable-background="new 0 0 16.037 20" xml:space="preserve"> + diff --git a/fluidbook/icones/13/mobile/nav-zoomout.svg b/fluidbook/icones/13/mobile/nav-zoomout.svg index 0df062698..4ce5c53be 100644 --- a/fluidbook/icones/13/mobile/nav-zoomout.svg +++ b/fluidbook/icones/13/mobile/nav-zoomout.svg @@ -2,10 +2,9 @@ - - + width="16.037px" height="20px" viewBox="0 0 16.037 20" enable-background="new 0 0 16.037 20" xml:space="preserve"> + diff --git a/fluidbook/icones/14/mobile/nav-archives.svg b/fluidbook/icones/14/mobile/nav-archives.svg new file mode 100644 index 000000000..e27a85544 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-archives.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/icones/14/mobile/nav-bookmark.svg b/fluidbook/icones/14/mobile/nav-bookmark.svg new file mode 100644 index 000000000..69448824e --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-bookmark.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-friend.svg b/fluidbook/icones/14/mobile/nav-friend.svg new file mode 100644 index 000000000..9c45a27b9 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-friend.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-fullscreen.svg b/fluidbook/icones/14/mobile/nav-fullscreen.svg new file mode 100644 index 000000000..11b686275 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-fullscreen.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-help.svg b/fluidbook/icones/14/mobile/nav-help.svg new file mode 100644 index 000000000..014cd0953 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-help.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-home.svg b/fluidbook/icones/14/mobile/nav-home.svg new file mode 100644 index 000000000..01739f4fe --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-home.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-index.svg b/fluidbook/icones/14/mobile/nav-index.svg new file mode 100644 index 000000000..eb7b8e735 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-index.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-map.svg b/fluidbook/icones/14/mobile/nav-map.svg new file mode 100644 index 000000000..8a327abef --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-map.svg @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-print-pdf.svg b/fluidbook/icones/14/mobile/nav-print-pdf.svg new file mode 100644 index 000000000..6ab8f7701 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-print-pdf.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-print.svg b/fluidbook/icones/14/mobile/nav-print.svg new file mode 100644 index 000000000..710863c8b --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-print.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-sommaire.svg b/fluidbook/icones/14/mobile/nav-sommaire.svg new file mode 100644 index 000000000..c4fd6811c --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-sommaire.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-tag.svg b/fluidbook/icones/14/mobile/nav-tag.svg new file mode 100644 index 000000000..c1b0c5375 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-tag.svg @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-zoomin.svg b/fluidbook/icones/14/mobile/nav-zoomin.svg new file mode 100644 index 000000000..db397d17a --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-zoomin.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/fluidbook/icones/14/mobile/nav-zoomout.svg b/fluidbook/icones/14/mobile/nav-zoomout.svg new file mode 100644 index 000000000..0df062698 --- /dev/null +++ b/fluidbook/icones/14/mobile/nav-zoomout.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/fluidbook/icones/14/nav-2d.png b/fluidbook/icones/14/nav-2d.png new file mode 100644 index 000000000..dc5733cf1 Binary files /dev/null and b/fluidbook/icones/14/nav-2d.png differ diff --git a/fluidbook/icones/14/nav-3d.png b/fluidbook/icones/14/nav-3d.png new file mode 100644 index 000000000..a6a4a4504 Binary files /dev/null and b/fluidbook/icones/14/nav-3d.png differ diff --git a/fluidbook/icones/14/nav-archives.png b/fluidbook/icones/14/nav-archives.png new file mode 100644 index 000000000..a7d293a59 Binary files /dev/null and b/fluidbook/icones/14/nav-archives.png differ diff --git a/fluidbook/icones/14/nav-basket.png b/fluidbook/icones/14/nav-basket.png new file mode 100644 index 000000000..d4c4baa9d Binary files /dev/null and b/fluidbook/icones/14/nav-basket.png differ diff --git a/fluidbook/icones/14/nav-bookmark.png b/fluidbook/icones/14/nav-bookmark.png new file mode 100644 index 000000000..1baf9d9ec Binary files /dev/null and b/fluidbook/icones/14/nav-bookmark.png differ diff --git a/fluidbook/icones/14/nav-friend.png b/fluidbook/icones/14/nav-friend.png new file mode 100644 index 000000000..cb51e8b0a Binary files /dev/null and b/fluidbook/icones/14/nav-friend.png differ diff --git a/fluidbook/icones/14/nav-fullscreen.png b/fluidbook/icones/14/nav-fullscreen.png new file mode 100644 index 000000000..b2022e00c Binary files /dev/null and b/fluidbook/icones/14/nav-fullscreen.png differ diff --git a/fluidbook/icones/14/nav-help.png b/fluidbook/icones/14/nav-help.png new file mode 100644 index 000000000..c081a0de9 Binary files /dev/null and b/fluidbook/icones/14/nav-help.png differ diff --git a/fluidbook/icones/14/nav-home.png b/fluidbook/icones/14/nav-home.png new file mode 100644 index 000000000..99ff755b3 Binary files /dev/null and b/fluidbook/icones/14/nav-home.png differ diff --git a/fluidbook/icones/14/nav-index.png b/fluidbook/icones/14/nav-index.png new file mode 100644 index 000000000..38d584f13 Binary files /dev/null and b/fluidbook/icones/14/nav-index.png differ diff --git a/fluidbook/icones/14/nav-normal.png b/fluidbook/icones/14/nav-normal.png new file mode 100644 index 000000000..98422e690 Binary files /dev/null and b/fluidbook/icones/14/nav-normal.png differ diff --git a/fluidbook/icones/14/nav-normalscreen.png b/fluidbook/icones/14/nav-normalscreen.png new file mode 100644 index 000000000..0bb6040ca Binary files /dev/null and b/fluidbook/icones/14/nav-normalscreen.png differ diff --git a/fluidbook/icones/14/nav-previous.png b/fluidbook/icones/14/nav-previous.png new file mode 100644 index 000000000..6f67e155c Binary files /dev/null and b/fluidbook/icones/14/nav-previous.png differ diff --git a/fluidbook/icones/14/nav-print.png b/fluidbook/icones/14/nav-print.png new file mode 100644 index 000000000..5b2d44c73 Binary files /dev/null and b/fluidbook/icones/14/nav-print.png differ diff --git a/fluidbook/icones/14/nav-save.png b/fluidbook/icones/14/nav-save.png new file mode 100644 index 000000000..2bdb35750 Binary files /dev/null and b/fluidbook/icones/14/nav-save.png differ diff --git a/fluidbook/icones/14/nav-sommaire.png b/fluidbook/icones/14/nav-sommaire.png new file mode 100644 index 000000000..17c5e7849 Binary files /dev/null and b/fluidbook/icones/14/nav-sommaire.png differ diff --git a/fluidbook/icones/14/nav-soundoff.png b/fluidbook/icones/14/nav-soundoff.png new file mode 100644 index 000000000..7b9b7a30c Binary files /dev/null and b/fluidbook/icones/14/nav-soundoff.png differ diff --git a/fluidbook/icones/14/nav-soundon.png b/fluidbook/icones/14/nav-soundon.png new file mode 100644 index 000000000..c96abc15c Binary files /dev/null and b/fluidbook/icones/14/nav-soundon.png differ diff --git a/fluidbook/icones/14/nav-zoomin.png b/fluidbook/icones/14/nav-zoomin.png new file mode 100644 index 000000000..c2effa4b0 Binary files /dev/null and b/fluidbook/icones/14/nav-zoomin.png differ diff --git a/fluidbook/icones/14/nav-zoomout.png b/fluidbook/icones/14/nav-zoomout.png new file mode 100644 index 000000000..bc05b8afa Binary files /dev/null and b/fluidbook/icones/14/nav-zoomout.png differ diff --git a/fluidbook/icones/15/interface.svg b/fluidbook/icones/15/interface.svg new file mode 100644 index 000000000..a09ec3f6a --- /dev/null +++ b/fluidbook/icones/15/interface.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fluidbook/icones/interface/interface-previous.svg b/fluidbook/icones/interface/interface-previous.svg index a7025781d..d68cb27d1 100644 --- a/fluidbook/icones/interface/interface-previous.svg +++ b/fluidbook/icones/interface/interface-previous.svg @@ -1,4 +1,5 @@ + 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 4475a3ce6..5df3a888c 100644 --- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php @@ -88,9 +88,9 @@ class wsHTML5Compiler { 'js/widget.js' ); - // Collection of LESS files to be compiled - // Filename with no extension, relative to the /style directory in the player build folder - public $lessFiles = ['fluidbook']; + // Collection of LESS files to be compiled + // Filename with no extension, relative to the /style directory in the player build folder + public $lessFiles = ['fluidbook']; public $specialCSS = array(); public $phonegapStandardPlugins = array('ios' => array('ExternalFileUtil'), @@ -528,7 +528,7 @@ class wsHTML5Compiler { } } - $svgfiles = array($this->assets . '/images/interface.svg'); + $svgfiles = array($this->assets . '/images/interface.svg', WS_ICONS . '/' . $this->theme->parametres->iconSet . '/interface.svg'); $svg = ''; foreach ($svgfiles as $svgfile) { if (file_exists($svgfile)) { @@ -702,13 +702,13 @@ class wsHTML5Compiler { $this->vdir->copy($this->wdir . '/' . $this->book->parametres->externalArchives, 'data/images/' . $this->book->parametres->externalArchives); } - if ($this->book->parametres->navExtraImage != '') { - $this->vdir->copy($this->wdir . '/' . $this->book->parametres->navExtraImage, 'data/images/' . $this->book->parametres->navExtraImage); - } + if ($this->book->parametres->navExtraImage != '') { + $this->vdir->copy($this->wdir . '/' . $this->book->parametres->navExtraImage, 'data/images/' . $this->book->parametres->navExtraImage); + } - if ($this->book->parametres->navExtraImageMobile != '') { - $this->vdir->copy($this->wdir . '/' . $this->book->parametres->navExtraImageMobile, 'data/images/' . $this->book->parametres->navExtraImageMobile); - } + if ($this->book->parametres->navExtraImageMobile != '') { + $this->vdir->copy($this->wdir . '/' . $this->book->parametres->navExtraImageMobile, 'data/images/' . $this->book->parametres->navExtraImageMobile); + } } @@ -766,10 +766,10 @@ class wsHTML5Compiler { } // Make old "aftersearch" link compatible with new "extra" menu option by extracting link URL - if ($link->page == 'aftersearch') { - $this->config->afterSearchLink = $link->to; - $this->config->afterSearchTooltip = $link->infobulle; - } + if ($link->page == 'aftersearch') { + $this->config->afterSearchLink = $link->to; + $this->config->afterSearchTooltip = $link->infobulle; + } $c = $link->getHTMLContainer(); @@ -962,21 +962,21 @@ class wsHTML5Compiler { } // We need to be able to reference both navOrder and navOrderH so convert both to arrays - // We also make sure there are no empty items in the arrays (see: http://php.net/manual/en/function.array-filter.php#111091) - $this->config->navOrder = array_filter(array_map('trim', explode(',', $this->config->navOrder)), 'strlen'); - $this->config->navOrderH = array_filter(array_map('trim', explode(',', $this->config->navOrderH)), 'strlen'); - -// $o = trim($this->config->navOrderH) != '' ? $this->config->navOrderH : $this->config->navOrder; -// $navOrder = array(); -// $oo = explode(',', $o); -// foreach ($oo as $ooo) { -// $ooo = trim($ooo); -// if ($ooo == '') { -// continue; -// } -// $navOrder[] = $ooo; -// } -// $this->config->navOrder = $navOrder; + // We also make sure there are no empty items in the arrays (see: http://php.net/manual/en/function.array-filter.php#111091) + $this->config->navOrder = array_filter(array_map('trim', explode(',', $this->config->navOrder)), 'strlen'); + $this->config->navOrderH = array_filter(array_map('trim', explode(',', $this->config->navOrderH)), 'strlen'); + + // $o = trim($this->config->navOrderH) != '' ? $this->config->navOrderH : $this->config->navOrder; + // $navOrder = array(); + // $oo = explode(',', $o); + // foreach ($oo as $ooo) { + // $ooo = trim($ooo); + // if ($ooo == '') { + // continue; + // } + // $navOrder[] = $ooo; + // } + // $this->config->navOrder = $navOrder; $this->config->standalone = $this->standalone; if ($this->config->phonegap) { @@ -1263,19 +1263,19 @@ class wsHTML5Compiler { $res[] = 'svg .fill-c-menu-text{fill:' . wsHTML5::colorToCSS($this->theme->parametres->subTextColor) . ';}'; // Search field -// $searchColor = wsHTML5::colorToCSS($this->theme->parametres->couleurS); -// $searchBackColor = wsHTML5::colorToCSS($this->theme->parametres->searchFieldColor); -// $search = '#q{'; -// $search .= 'color:' . $searchColor . ';'; -// $search .= 'background-color:' . $searchBackColor . ';'; -// if ($this->theme->parametres->searchShadeAlpha > 0) { -// $search .= wsHTML5::writeCSSUA('box-shadow', '1px 1px 4px rgba(0,0,0,' . ($this->theme->parametres->searchShadeAlpha / 100) . ')') . ' inset;'; -// } -// $search .= '}'; -// $search .= '#searchHints,.hint{color:' . $searchColor . ';background-color:' . $searchBackColor . ';}'; -// $search .= '.hint:hover{color:' . $searchBackColor . ';background-color:' . $searchColor . ';}'; -// -// $res[] = $search; + // $searchColor = wsHTML5::colorToCSS($this->theme->parametres->couleurS); + // $searchBackColor = wsHTML5::colorToCSS($this->theme->parametres->searchFieldColor); + // $search = '#q{'; + // $search .= 'color:' . $searchColor . ';'; + // $search .= 'background-color:' . $searchBackColor . ';'; + // if ($this->theme->parametres->searchShadeAlpha > 0) { + // $search .= wsHTML5::writeCSSUA('box-shadow', '1px 1px 4px rgba(0,0,0,' . ($this->theme->parametres->searchShadeAlpha / 100) . ')') . ' inset;'; + // } + // $search .= '}'; + // $search .= '#searchHints,.hint{color:' . $searchColor . ';background-color:' . $searchBackColor . ';}'; + // $search .= '.hint:hover{color:' . $searchBackColor . ';background-color:' . $searchColor . ';}'; + // + // $res[] = $search; // Background $res[] = $this->_cssBackground(); @@ -1509,7 +1509,7 @@ class wsHTML5Compiler { } public function copyLinkDir($source, $dest) { - $this->vdir->copyDirectory($source,$dest); + $this->vdir->copyDirectory($source, $dest); } public function simpleCopyLinkFile($source, $dest, $addVdir = true) {