(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 095d58cf1eee3477448e27550eb687f10282f02d..739f33f570456323963ccd0c0b9f54638d6e3e5a 100644 (file)
--- 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');\r
                }\r
                $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
+               // Icons assets\r
+               $iconsRoot = ROOT . '/icones/' . $theme->parametres->iconSet . '/';\r
+               foreach(wsIcone::$files as $file) {\r
+                       $flex->addBitmap($iconsRoot . 'nav-' . $file . '.png', 'nav_' . $file);\r
+               }\r
                // Fonts\r
                $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'Atlantis', 'ASCII');\r
                $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'DinMedium', 'Latin');\r

diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index 86e0f5fd3fe1d3015c429ea3abe3b862f0e6e6b1..36d95606cfe938e8fcbb44a12f893b45386c9316 100644 (file)
--- 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;\r
        public $date;\r
 \r
-       public static $files = array('index', 'normal', 'sommaire', 'print', 'send', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help');\r
+       public static $files = array('index', 'normal', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help');\r
 \r
        public function makeImage()\r
        {\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 2a3adb58d59e3a4dec345b1ed475c627572e83ad..53a39478872d1624db77b43a7e35683962fe4f9b 100644 (file)
--- 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,\r
                        'label' => __('Couleur des flèches'), 'extra' => true, 'grade' => 4);\r
                /* Submenus */\r
-               $this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
+               $this->fields['couleurB'] = array('type' => 'couleurAlpha', 'default' => 'ff000000', 'editable' => true,\r
                        'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3);\r
-               $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
-               $this->fields['subSelectColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['subSelectColor'] = array('type' => 'couleurAlpha', 'default' => 'ffffffff', 'editable' => true,\r
                        'label' => __("Couleur des zones de sélection"), 'extra' => false, 'grade' => 3);\r
                $this->fields['subTextSelectColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
                        'label' => __("Couleur des textes des zones de sélection"), 'extra' => false, 'grade' => 3);\r
@@ -62,12 +62,12 @@ class wsThemeParametres extends wsParametres {
                $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
                        'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r
-                       'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1);\r
+                       'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1,'min'=>0,'max'=>200);\r
                $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r
-                       'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1);\r
+                       'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1,'min'=>0,'max'=>200);\r
                $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true,\r
                        'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4);\r
-               /* Credpage = DisplayObject(item.content);its */\r
+               /* Credits */\r
                $this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
                /* Background */\r
@@ -126,7 +126,7 @@ class wsThemeParametres extends wsParametres {
                $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);\r
                $this->fields['pageBarThumbBack'] = array('type' => 'couleurAlpha', 'default' => '80000000', 'editable' => true,\r
-                       'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);\r
+                       'label' => __("Couleur de fond de la boîte"), 'extra' => true, 'grade' => 4);\r
 \r
                /* Regroupement des champs par formulaire */\r
 \r

diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index 1ea89abaa77be68798a4609ad980a0b969e81668..c7be750eec13a488c323eb56d13bc56671bcb412 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -43,10 +43,10 @@
   <!-- SWC Include Libraries -->\r
   <includeLibraries>\r
     <element path="wsComposerComponents.swc" />\r
+    <element path="composerLibrary.swc" />\r
   </includeLibraries>\r
   <!-- SWC Libraries -->\r
   <libraryPaths>\r
-    <element path="composerLibrary.swc" />\r
     <element path="flash.swc" />\r
   </libraryPaths>\r
   <!-- External Libraries -->\r

diff --git a/swf/_src/assets/nav-magnifier.png b/swf/_src/assets/nav-magnifier.png
new file mode 100644 (file)
index 0000000..2d4dbfd
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 f4e466464e31ceec4f852ff1ea5bb648f04720cc..07ac5936ee6d3ed2bf0b30fe495ecd97d9fb56eb 100644 (file)
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 ef3a854618d0947ea02419d0da706258924b99b4..26f4a9cf9a78a0903fb5936d65a760a9194f3540 100644 (file)
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ