From: vincent@cubedesigners.com Date: Mon, 26 Apr 2010 07:46:40 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f4a2ee202ecf2590880affad38103616fd99f17a;p=cubeextranet.git --- diff --git a/importWs.php b/importWs.php index edf1a8e1c..db233aa9b 100644 --- a/importWs.php +++ b/importWs.php @@ -166,7 +166,6 @@ while ($r->fetch()) { $r = $core->con->select('SELECT * FROM ws.theme'); $theme=new wsTheme(); while ($r->fetch()) { - //$r->iconSet = $r->iid; $c = $core->con->openCursor('themes'); $c->theme_id = $r->tid; $c->icones = $r->iid; @@ -176,6 +175,7 @@ while ($r->fetch()) { $c->signature = $r->sigid; $parametres = new wsThemeParametres($theme); $parametres->fromRecord($r); + $parametres->iconSet=$r->iid; $c->parametres = serialize($parametres); $c->insert(); } diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 2e8216eb1..49621096b 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -178,6 +178,7 @@ class wsFlash extends cubeFlashGateway { $i = $this->xml->addChild('icone'); $i->addAttribute('id', $icone->icone_id); $i->addAttribute('nom', $icone->nom); + $i->addAttribute('newSet', $icone->isNew()); $i->addAttribute('path', ICONS . $icone->icone_id . '.png'); } } diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php index 1991984d0..c2f9532f9 100644 --- a/inc/ws/Metier/class.ws.icone.php +++ b/inc/ws/Metier/class.ws.icone.php @@ -4,24 +4,38 @@ class wsIcone extends cubeMetier { public $nom; public $date; + protected $_is_new = null; + public static $files = array('index', 'normal', 'sommaire', 'zoomin', 'zoomout', 'print', 'send', 'bookmark', 'pdf', 'help'); + public static $files_new = array('index', 'normal', 'sommaire', 'print', 'sendfriend', 'bookmark', 'fullscreen', 'normalscreen', 'pdf', 'help'); + + public function isNew() + { + if (is_null($this->_is_new)) { + $this->_is_new = !file_exists(ROOT . '/icones/' . $this->icone_id . '/nav-index-off.png'); + } + return $this->_is_new; + } public function makeImage() { $root = ROOT . '/icones/' . $this->icone_id . '/'; $final = ROOT . '/icones/' . $this->icone_id . '.png'; - if ($this->date <= filemtime($final)) { + if (file_exists($final) && $this->date <= filemtime($final)) { return; } $h = 0; $w = 0; $mod = 0; - foreach(wsIcone::$files as $file) { - $image = $root . 'nav-' . $file . '-off.png'; + + $liste = ($this->isNew())?wsIcone::$files_new:wsIcones::$files; + + foreach($liste as $file) { + $image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png'; $dim = getimagesize($image); - $mod = max(filemtime($file), $mod); + $mod = max(filemtime($image), $mod); $h = max($h, $dim[1]); $w += $dim[0]; } @@ -33,8 +47,8 @@ class wsIcone extends cubeMetier { imagesavealpha($im, true); imagealphablending($im, true); $x = 0; - foreach(self::$files as $file) { - $image = $root . 'nav-' . $file . '-off.png'; + foreach($liste as $file) { + $image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png'; $s = imagecreatefrompng($image); $w = imagesx($s); $h = imagesy($s); diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php index aaa43df28..30efeb20c 100644 --- a/inc/ws/Metier/class.ws.parametres.php +++ b/inc/ws/Metier/class.ws.parametres.php @@ -128,7 +128,11 @@ class wsParametres extends cubeMetier implements Iterator { throw new Exception('You are getting an attribute (' . get_class($this) . '::' . $varname . ') which not exists'); } if (!isset($this->datas[$varname]) || is_null($this->datas[$varname])) { - return $this->fields[$varname]['default']; + if (substr($this->fields[$varname]['default'], 0, 1) == '$') { + return $this->get(substr($this->fields[$varname]['default'],1)); + } else { + return $this->fields[$varname]['default']; + } } return $this->datas[$varname]; } diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index 26567a6c8..06984986d 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -12,7 +12,7 @@ class wsThemeParametres extends wsParametres { } parent::initFields(); $this->fields['couleurA'] = array('type' => 'couleur', 'default' => '', 'editable' => true, - 'label' => __("Couleur principale (boutons, liens)"), 'extra' => false, 'grade' => 3); + 'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3); $this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3); $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, @@ -40,8 +40,10 @@ class wsThemeParametres extends wsParametres { 'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3); $this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4); - $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', 'editable' => true, + $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3); + $this->fields['iconShadColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, + 'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3); $this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3); $this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, @@ -86,9 +88,13 @@ class wsThemeParametres extends wsParametres { $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4); $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, - 'label' => __('Couleur des flèches des boutons de navigation (page suivante, page précédente)'), 'extra' => true, 'grade' => 4); + 'label' => __('Couleur des flèches'), 'extra' => true, 'grade' => 4); $this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1); + $this->fields['colorPageNumber'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + 'label' => __('Couleur des numéros de page'), 'extra' => true, 'grade' => 4); + $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, + 'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4); $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1); @@ -99,11 +105,15 @@ class wsThemeParametres extends wsParametres { $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'), 'fieldsnames' => array('couleurA', 'arrowsColor')); $this->forms['icones'] = array('label' => __('Personnalisation des icônes'), - 'fieldsnames' => array('iconSet', 'colorizeIcons', 'couleurI')); + 'fieldsnames' => array('iconSet','iconShadColor','|', 'colorizeIcons', 'couleurI')); $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'), 'fieldsnames' => array('pagesBar')); $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'), - 'fieldsnames' => array('pageReflection', 'shadeAlpha', '|', 'usePageEdges', '|', 'bookShadeColor', 'bookShadeAlpha', '|', 'displayPageNumber')); + 'fieldsnames' => array('pageReflection', 'shadeAlpha', + '|', 'usePageEdges', + '|', 'bookShadeColor', 'bookShadeAlpha', + '|', 'displayPageNumber', 'colorPageNumber', + '|', 'linksColor')); $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'), 'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition')); $this->forms['menu'] = array('label' => __('Personnalisation des menus'), diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index dc2757b7f..9843fff86 100644 Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ