From: vincent@cubedesigners.com Date: Tue, 24 Jul 2012 11:25:10 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=70f35e599736147f8cbc7cc509a8714c2840bc25;p=cubeextranet.git --- diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 34a1c66c1..e95db6d8d 100644 --- 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'), 'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics', 'googleAnalyticsCustom')); - $this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1); $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); $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); @@ -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); $this->forms['multimedia'] = array('label' => __('Liens et multimédia'), 'fieldsnames' => array('permanentLinks', 'linkBlinkTime', 'customLinkClass', 'linkTooltipManager', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkMultimediaPerformanceMode')); - // . - $this->fields['multilang'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Langues'); - $this->forms['multilang'] = array('label' => __('Interface multilangue'), - 'fieldsnames' => array('multilang')); //. $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $swfFilter); @@ -222,8 +217,8 @@ class wsBookParametres extends wsParametres { __('Version HTML5') => 'html5', __("Version HTML5 en images") => 'html5-images') ); - - $this->fields['mobileLVersion']= array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' => 5, + + $this->fields['mobileLVersion'] = array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' => 5, 'datas' => array(__('Stable') => 'stable', __('En cours de développement') => 'dev') ); @@ -235,7 +230,7 @@ class wsBookParametres extends wsParametres { ); $this->forms['mobile'] = array('label' => __('Version mobile'), - 'fieldsnames' => array('mobileLVersion','|','mobileVersion', 'mobileTransitions')); + 'fieldsnames' => array('mobileLVersion', '|', 'mobileVersion', 'mobileTransitions')); $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')); $this->fields['secureURLRedirect'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __('Redirection'), 'grade' => 5, 'hint' => __("Si l'authentification échoue, redirection vers cette adresse")); @@ -249,6 +244,12 @@ class wsBookParametres extends wsParametres { $this->forms['seo'] = array('label' => __('Optimisation pour les moteurs de recherche'), 'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription')); + + $this->fields['home'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Accueil de l'interface multibrochure"), 'grade' => 5); + $this->fields['multilang'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Langues'); + $this->forms['multibrochure'] = array('label' => __('Multibrochure'), + 'fieldsnames' => array('home', 'multilang')); + $this->fields['plv'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le mode PLV'), 'grade' => 3); $this->fields['plvTimer'] = array('type' => 'integer', 'min' => 1, 'max' => 60, 'default' => 5, 'editable' => true, 'label' => __('Temps'), 'grade' => 3); $this->fields['plvMode'] = array('type' => 'combo', 'default' => 'first', 'editable' => true, 'label' => __('Arrivé à la dernière page'), 'grade' => 3, @@ -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); $this->fields['widgetEnd'] = array('type' => 'integer', 'default' => 8, 'editable' => true, 'label' => __('Page de fin'), 'grade' => 3); $this->forms['widget'] = array('label' => __('Widget') . ' (' . __('Mini Fluidbook') . ')', - 'fieldsnames' => array('widget', 'widgetCover', 'widgetSize', 'widgetQuality', 'widgetStart', 'widgetEnd')); + 'fieldsnames' => array('widget', 'widgetCover', 'widgetSize', 'widgetQuality', 'widgetStart', 'widgetEnd')); + + $this->fields['extras'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Extras'), 'grade' => 3); $this->fields['v1SWF'] = array('type' => 'freefile', 'default' => '', 'editable' => true, diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php index 306fb4a06..eb341c3a0 100644 --- a/inc/ws/Metier/class.ws.icone.php +++ b/inc/ws/Metier/class.ws.icone.php @@ -1,14 +1,14 @@ icone_id . '/'; $final = WS_ICONS . '/' . $this->icone_id . '.png'; @@ -22,7 +22,7 @@ class wsIcone extends cubeMetier { $liste = self::$display; - foreach($liste as $file) { + foreach ($liste as $file) { $image = $root . 'nav-' . $file . '.png'; if (!file_exists($image)) { continue; @@ -39,11 +39,11 @@ class wsIcone extends cubeMetier { $im = imagecreatetruecolor($w, $h); imagelayereffect($im, IMG_EFFECT_REPLACE); $color = imagecolorallocatealpha($im, 255, 255, 255, 127); - imagefill($im, 0 , 0 , $color); + imagefill($im, 0, 0, $color); imagesavealpha($im, true); imagealphablending($im, true); $x = 5; - foreach($liste as $file) { + foreach ($liste as $file) { $image = $root . 'nav-' . $file . '.png'; if (!file_exists($image)) { continue; @@ -51,7 +51,7 @@ class wsIcone extends cubeMetier { $s = imagecreatefrompng($image); $w = imagesx($s); $h = imagesy($s); - imagecopy($im, $s , $x , round(($height - $h) / 2) , 0 , 0 , $w , $h); + imagecopy($im, $s, $x, round(($height - $h) / 2), 0, 0, $w, $h); $x += $w; $x += 10; @@ -59,6 +59,7 @@ class wsIcone extends cubeMetier { imagepng($im, $final); } + } ?> \ 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 5276feed1..5e003aa46 100644 --- 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);