(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 34a1c66c13799addd968662df5d26d243a74605b..e95db6d8dec94ca21967808d132dfbc29b8a2113 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -147,7 +147,6 @@ class wsBookParametres extends wsParametres {
                $this->forms['stats'] = array('label' => __('Statistiques'),\r
                        'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics', 'googleAnalyticsCustom'));\r
 \r
-\r
                $this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1);\r
                $this->fields['displayChaptersLine'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche une ligne entre le label et le numéro de page"), 'grade' => 5);\r
                $this->fields['chaptersPage'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Faire pointer le sommaire sur la page'), 'grade' => 3, 'hint' => __('Laisser vide pour utiliser le sommaire classique'), 'size' => 5);\r
@@ -186,10 +185,6 @@ class wsBookParametres extends wsParametres {
                $this->fields['linkMultimediaPerformanceMode'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Mode perfomance pour les liens multimédia'), 'grade' => 5);\r
                $this->forms['multimedia'] = array('label' => __('Liens et multimédia'),\r
                        'fieldsnames' => array('permanentLinks', 'linkBlinkTime', 'customLinkClass', 'linkTooltipManager', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkMultimediaPerformanceMode'));\r
-               // .\r
-               $this->fields['multilang'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Langues');\r
-               $this->forms['multilang'] = array('label' => __('Interface multilangue'),\r
-                       'fieldsnames' => array('multilang'));\r
                //.\r
                $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $swfFilter);\r
@@ -222,8 +217,8 @@ class wsBookParametres extends wsParametres {
                                __('Version HTML5') => 'html5',\r
                                __("Version HTML5 en images") => 'html5-images')\r
                );\r
-               \r
-               $this->fields['mobileLVersion']= array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' => 5,\r
+\r
+               $this->fields['mobileLVersion'] = array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' => 5,\r
                        'datas' => array(__('Stable') => 'stable',\r
                                __('En cours de développement') => 'dev')\r
                );\r
@@ -235,7 +230,7 @@ class wsBookParametres extends wsParametres {
                );\r
 \r
                $this->forms['mobile'] = array('label' => __('Version mobile'),\r
-                       'fieldsnames' => array('mobileLVersion','|','mobileVersion', 'mobileTransitions'));\r
+                       'fieldsnames' => array('mobileLVersion', '|', 'mobileVersion', 'mobileTransitions'));\r
 \r
                $this->fields['secureURL'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __('URL de sécurisation'), 'grade' => 5, 'hint' => __('URL intérrogé pour vérifier si le visiteur à les droits pour consulter la publication'));\r
                $this->fields['secureURLRedirect'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __('Redirection'), 'grade' => 5, 'hint' => __("Si l'authentification échoue, redirection vers cette adresse"));\r
@@ -249,6 +244,12 @@ class wsBookParametres extends wsParametres {
                $this->forms['seo'] = array('label' => __('Optimisation pour les moteurs de recherche'),\r
                        'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription'));\r
 \r
+\r
+               $this->fields['home'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Accueil de l'interface multibrochure"), 'grade' => 5);\r
+               $this->fields['multilang'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Langues');\r
+               $this->forms['multibrochure'] = array('label' => __('Multibrochure'),\r
+                       'fieldsnames' => array('home', 'multilang'));\r
+\r
                $this->fields['plv'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le mode PLV'), 'grade' => 3);\r
                $this->fields['plvTimer'] = array('type' => 'integer', 'min' => 1, 'max' => 60, 'default' => 5, 'editable' => true, 'label' => __('Temps'), 'grade' => 3);\r
                $this->fields['plvMode'] = array('type' => 'combo', 'default' => 'first', 'editable' => true, 'label' => __('Arrivé à la dernière page'), 'grade' => 3,\r
@@ -264,7 +265,9 @@ class wsBookParametres extends wsParametres {
                $this->fields['widgetStart'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('Page de début'), 'grade' => 3);\r
                $this->fields['widgetEnd'] = array('type' => 'integer', 'default' => 8, 'editable' => true, 'label' => __('Page de fin'), 'grade' => 3);\r
                $this->forms['widget'] = array('label' => __('Widget') . ' (' . __('Mini Fluidbook') . ')',\r
-                       'fieldsnames' => array('widget',  'widgetCover', 'widgetSize', 'widgetQuality', 'widgetStart', 'widgetEnd'));\r
+                       'fieldsnames' => array('widget', 'widgetCover', 'widgetSize', 'widgetQuality', 'widgetStart', 'widgetEnd'));\r
+\r
+\r
 \r
                $this->fields['extras'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Extras'), 'grade' => 3);\r
                $this->fields['v1SWF'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r

diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index 306fb4a06fbfaea9506843ae9ea50336746f1d6a..eb341c3a059cafa6d5f60915f1b0638efc863ff6 100644 (file)
--- a/inc/ws/Metier/class.ws.icone.php
+++ b/inc/ws/Metier/class.ws.icone.php
@@ -1,14 +1,14 @@
 <?php\r
+\r
 class wsIcone extends cubeMetier {\r
+\r
        public $icone_id;\r
        public $nom;\r
        public $date;\r
-\r
-       public static $files = array('index', 'normal', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help', '2d', '3d', 'soundon', 'soundoff', 'basket','previous');\r
+       public static $files = array('index', 'normal', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help', '2d', '3d', 'soundon', 'soundoff', 'basket', 'previous', 'home');\r
        public static $display = array('index', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'save', '3d', 'soundon', 'help');\r
 \r
-       public function makeImage()\r
-       {\r
+       public function makeImage() {\r
                $root = WS_ICONS . '/' . $this->icone_id . '/';\r
                $final = WS_ICONS . '/' . $this->icone_id . '.png';\r
 \r
@@ -22,7 +22,7 @@ class wsIcone extends cubeMetier {
 \r
                $liste = self::$display;\r
 \r
-               foreach($liste as $file) {\r
+               foreach ($liste as $file) {\r
                        $image = $root . 'nav-' . $file . '.png';\r
                        if (!file_exists($image)) {\r
                                continue;\r
@@ -39,11 +39,11 @@ class wsIcone extends cubeMetier {
                $im = imagecreatetruecolor($w, $h);\r
                imagelayereffect($im, IMG_EFFECT_REPLACE);\r
                $color = imagecolorallocatealpha($im, 255, 255, 255, 127);\r
-               imagefill($im, 0 , 0 , $color);\r
+               imagefill($im, 0, 0, $color);\r
                imagesavealpha($im, true);\r
                imagealphablending($im, true);\r
                $x = 5;\r
-               foreach($liste as $file) {\r
+               foreach ($liste as $file) {\r
                        $image = $root . 'nav-' . $file . '.png';\r
                        if (!file_exists($image)) {\r
                                continue;\r
@@ -51,7 +51,7 @@ class wsIcone extends cubeMetier {
                        $s = imagecreatefrompng($image);\r
                        $w = imagesx($s);\r
                        $h = imagesy($s);\r
-                       imagecopy($im, $s , $x , round(($height - $h) / 2) , 0 , 0 , $w , $h);\r
+                       imagecopy($im, $s, $x, round(($height - $h) / 2), 0, 0, $w, $h);\r
 \r
                        $x += $w;\r
                        $x += 10;\r
@@ -59,6 +59,7 @@ class wsIcone extends cubeMetier {
 \r
                imagepng($im, $final);\r
        }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 5276feed10509d4de44ef0243e673db1b0cb2253..5e003aa46d3897662381672d2760f865058eff1c 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -570,7 +570,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);
+                       'help-fingers' => $couleurI, 'help-mouse' => $couleurI,'nav-home'=>$couleurI);
 
                foreach ($icons as $icon => $color) {
                        wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h);