(no commit message)

diff --git a/fluidbook/icones/1/mobile/nav-archives.svg b/fluidbook/icones/1/mobile/nav-archives.svg
new file mode 100644 (file)
index 0000000..e27a855
--- /dev/null
+++ b/fluidbook/icones/1/mobile/nav-archives.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="28px" height="20px" viewBox="0 0 28 20" enable-background="new 0 0 28 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M25.048,3.052h-9.856c-0.812,0-1.469,0.658-1.469,1.47v12.588c0,0.811,0.657,1.469,1.469,1.469h9.856\r
+               c0.813,0,1.471-0.658,1.471-1.469V4.521C26.519,3.71,25.86,3.052,25.048,3.052z M24.516,16.578h-8.792V5.017h8.792V16.578z"/>\r
+       <path fill="$colorize" d="M12.023,3.052H2.97c-0.812,0-1.47,0.658-1.47,1.47v12.588c0,0.811,0.658,1.469,1.47,1.469h9.054\r
+               c0.812,0,1.47-0.658,1.47-1.469V4.521C13.493,3.71,12.835,3.052,12.023,3.052z M11.491,16.578H3.502V5.017h7.988V16.578z"/>\r
+       <path fill="$colorize" fill-rule="evenodd" clip-rule="evenodd" d="M4.354,2.5c0,0,3.003-1,5.082-1c1.299,0,2.355,1,2.355,1v13.076H4.354V2.5z"/>\r
+       <path fill="$colorize" fill-rule="evenodd" clip-rule="evenodd" d="M15.698,2.5c0,0,0.975-1,2.205-1c2.096,0,5.533,1,5.533,1v13.076h-7.738V2.5z"/>\r
+</g>\r
+</svg>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 95bca2d50a9ccbb6c7c7356333f847aa36c76eeb..e86eee388c24f115f4e6600700e284ba2dafd1dc 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -206,9 +206,11 @@ class wsBookParametres extends wsParametres {
                //.\r
                $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $swfFilter);\r
+               $this->fields['archivesLink'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Lien'), 'grade' => 5);\r
+               $this->fields['archivesLabel'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Label'), 'grade' => 5);\r
 \r
                $this->forms['archives'] = array('label' => __('Archives'),\r
-                       'fieldsnames' => array('externalArchives'));\r
+                       'fieldsnames' => array('externalArchives', '|', 'archivesLink', 'archivesLabel'));\r
                // .\r
                $this->fields['basket'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Panier activé'), 'grade' => 5);\r
                $this->fields['basketManager'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Manager de panier"),\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 9ee739f749f6ce0f26636ce2cbb934797c138e24..3a52bbc9cb8348067f9847439dc43e14af1472a5 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -456,6 +456,7 @@ class wsHTML5Compiler {
 
                $i = 0;
                $pages = array();
+               $cpages = array();
                $css = array();
                foreach ($links as $linkData) {
                        $link = wsHTML5Link::getInstance($this->base62($i), $linkData, $this);
@@ -467,8 +468,13 @@ class wsHTML5Compiler {
                        $css[] = $link->getCSSContainer();
                        if (!isset($pages[$link->page])) {
                                $pages[$link->page] = '';
+                               $cpages[$link->page] = '';
+                       }
+                       if ($link instanceof contentLink) {
+                               $cpages[$link->page].=$c;
+                       } else {
+                               $pages[$link->page].=$c;
                        }
-                       $pages[$link->page].=$c;
                        $i++;
                }
 
@@ -479,10 +485,15 @@ class wsHTML5Compiler {
 
                foreach ($allpages as $i) {
                        $c = '';
+                       $cc = '';
                        if (isset($pages[$i])) {
                                $c = $pages[$i];
                        }
+                       if (isset($cpages[$i])) {
+                               $cc = $cpages[$i];
+                       }
                        $this->config->links[$i] = $c;
+                       $this->config->clinks[$i] = $cc;
                }
                return $css;
        }
@@ -572,7 +583,7 @@ class wsHTML5Compiler {
                // Set the icon list with the color
                $icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI,
                        'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI, 'nav-facebook' => $couleurI, 'nav-twitter' => $couleurI,
-                       'help-fingers' => $couleurI, 'help-mouse' => $couleurI, 'nav-home' => $couleurI);
+                       'help-fingers' => $couleurI, 'help-mouse' => $couleurI, 'nav-home' => $couleurI,'nav-archives'=>$couleurI);
 
                foreach ($icons as $icon => $color) {
                        wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h);

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 44a551749bdab4042d45f92508ff742c800921ac..7a270c03fe1f27bbf483df339e7a9925f3a03c4a 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -103,7 +103,8 @@ class wsHTML5Link {
 
        public function getCSSContainer() {
 
-               if ($this->page % 2 == 1) {
+               
+               if (!($this instanceof contentLink) && $this->page % 2 == 1) {
                        $this->page--;
                        $this->left+=$this->compiler->width;
                }