From: vincent@cubedesigners.com Date: Mon, 30 Aug 2010 16:55:57 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ef50f132402292e6c207151c11fa823ba1f8b279;p=cubeextranet.git --- diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index 095d58cf1..739f33f57 100644 --- a/inc/ws/DAO/class.ws.dao.book.php +++ b/inc/ws/DAO/class.ws.dao.book.php @@ -488,6 +488,11 @@ class wsDAOBook extends extranetDAO { $flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu'); } $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo'); + // Icons assets + $iconsRoot = ROOT . '/icones/' . $theme->parametres->iconSet . '/'; + foreach(wsIcone::$files as $file) { + $flex->addBitmap($iconsRoot . 'nav-' . $file . '.png', 'nav_' . $file); + } // Fonts $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'Atlantis', 'ASCII'); $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'DinMedium', 'Latin'); diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php index 86e0f5fd3..36d95606c 100644 --- a/inc/ws/Metier/class.ws.icone.php +++ b/inc/ws/Metier/class.ws.icone.php @@ -4,7 +4,7 @@ class wsIcone extends cubeMetier { public $nom; public $date; - public static $files = array('index', 'normal', 'sommaire', 'print', 'send', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help'); + public static $files = array('index', 'normal', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help'); public function makeImage() { diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index 2a3adb58d..53a394788 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -17,11 +17,11 @@ class wsThemeParametres extends wsParametres { $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __('Couleur des flèches'), 'extra' => true, 'grade' => 4); /* Submenus */ - $this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true, + $this->fields['couleurB'] = array('type' => 'couleurAlpha', 'default' => 'ff000000', 'editable' => true, 'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3); - $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffffff', 'editable' => true, 'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3); - $this->fields['subSelectColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + $this->fields['subSelectColor'] = array('type' => 'couleurAlpha', 'default' => 'ffffffff', 'editable' => true, 'label' => __("Couleur des zones de sélection"), 'extra' => false, 'grade' => 3); $this->fields['subTextSelectColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, 'label' => __("Couleur des textes des zones de sélection"), 'extra' => false, 'grade' => 3); @@ -62,12 +62,12 @@ class wsThemeParametres extends wsParametres { $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, 'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4); $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, - 'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1); + 'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1,'min'=>0,'max'=>200); $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, - 'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1); + 'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1,'min'=>0,'max'=>200); $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true, 'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4); - /* Credpage = DisplayObject(item.content);its */ + /* Credits */ $this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3); /* Background */ @@ -126,7 +126,7 @@ class wsThemeParametres extends wsParametres { $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4); $this->fields['pageBarThumbBack'] = array('type' => 'couleurAlpha', 'default' => '80000000', 'editable' => true, - 'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4); + 'label' => __("Couleur de fond de la boîte"), 'extra' => true, 'grade' => 4); /* Regroupement des champs par formulaire */ diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj index 1ea89abaa..c7be750ee 100644 --- a/swf/_src/WSComposer.as3proj +++ b/swf/_src/WSComposer.as3proj @@ -43,10 +43,10 @@ + - diff --git a/swf/_src/assets/nav-magnifier.png b/swf/_src/assets/nav-magnifier.png new file mode 100644 index 000000000..2d4dbfd49 Binary files /dev/null and b/swf/_src/assets/nav-magnifier.png differ diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc index f4e466464..07ac5936e 100644 Binary files a/swf/_src/composerLibrary.swc and b/swf/_src/composerLibrary.swc differ diff --git a/swf/_src/wsComposerLibrary.fla b/swf/_src/wsComposerLibrary.fla index ef3a85461..26f4a9cf9 100644 Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ