done #1719 @1

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 5012de48ddde50d4394d21372b24850acdb6bb82..70f0d1672dcb7f7cac2a575a5c90268263b6f5d4 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -105,9 +105,9 @@ class wsFlash extends cubeFlashGateway {
                unset($_SESSION['conversionSessionReload']);
                $session->serialize();
 
-               $executable='php';
-               if(AMARCORD){
-                       $executable='/usr/bin/php5.6';
+               $executable = 'php';
+               if (AMARCORD) {
+                       $executable = '/usr/bin/php5.6';
                }
                $php = new cubeCommandLine($executable);
                $php->setPath(CONVERTER_PATH);
@@ -413,12 +413,13 @@ class wsFlash extends cubeFlashGateway {
        public function getAllIcones() {
                global $core;
                $dao = new wsDAOIcone($core->con);
-               $icones = $dao->selectAll('ORDER BY icone_id DESC');
+               $icones = $dao->selectAll('ORDER BY FIELD(icone_id,13,15) DESC, icone_id DESC');
                foreach ($icones as $icone) {
                        $i = $this->xml->addChild('icone');
                        $i->addAttribute('id', $icone->icone_id);
                        $i->addAttribute('nom', $icone->nom);
                        $i->addAttribute('path', ICONS . $icone->icone_id . '.png');
+                       $i->addAttribute('main', in_array($icone->icone_id,array(13, 15)));
                }
        }
 

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 2bee8c15f78d8e8650bddc1015319fcc575aa3da..9ca6671ffde78b17de18819cea323065191eb059 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1498,11 +1498,16 @@ class wsMaintenance {
                                $res .= "\n\t" . '</symbol>';
 
                        }
-                       $res .= "\n" . '    <symbol id="nav-locales" viewBox="0 0 512 512">
-        <path d="m428 117l-174 0-4-29c-2-25-23-41-47-41l-119 0c-27 0-47 21-47 47l0 254c0 27 20 47 47 47l86 0 4 29c2 16 12 29 27 37 8 4 14 6 20 6l209 0c27 0 47-21 47-47l0-256c0-27-22-47-49-47z m-344 252c-12 0-21-11-21-21l0-254c0-12 11-20 21-20l119 0c10 0 20 8 20 18l35 277z m152 26c-15 17-21 23-25 27-2 2-4 4-6 8-2-4-4-6-4-10l-2-25z m215 23c0 12-11 20-21 20l-197 0c7-6 15-14 41-45l5-4c4-4 10-10 8-22l-31-224 172 0c12 0 21 11 21 21l0 254z m-310-268l-55 147 25 0 14-41 55 0 15 41 24 0-51-147z m-8 86l12-39c5-11 7-19 9-27 0 2 2 6 4 12 2 6 4 11 4 13l14 38-43 0z m281-9l-37 0 0-41-27 0 0 41-47 0 0 21 98 0c-2 16-8 49-26 69-29 33-64 41-64 41l6 27c2 0 43-10 78-49 35-39 35-96 35-98l-12 0 0-11z"/>
+                       $res .= "\n" . '    <symbol id="nav-locales" viewBox="0 0 25 20">
+                       <path d="M10.5,0H1.9C1.3,0,0.6,0.6,0.6,1.3v16.3c0,0.8,0.5,1.3,1.3,1.3h10V1.3C11.8,0.6,11.1,0,10.5,0z M8.1,13.8l-1.3-2.5H5.6
+                       l-1.3,2.5H1.9l3.8-10h1.3l3.6,10H8.1z M6.5,6.8C6.4,6.4,6.4,6.1,6.3,6c0,0.5-0.3,1-0.4,1.6L5,10h2.6L6.8,7.5
+                       C6.8,7.4,6.6,7.1,6.5,6.8z M23.1,2.5h-10V20h10c0.8,0,1.3-0.6,1.3-1.3v-15C24.4,3,23.9,2.5,23.1,2.5z M23.1,8.8
+                       c0,0.1-0.1,2.6-2.3,5s-4.6,3-4.8,3l-0.4-1.6c0,0,2.1-0.5,3.9-2.5c1.3-1.4,2.1-2.9,2.3-3.9h-6.3V7.5h2.5V5h1.3v2.5h3.8V8.8z"/>
     </symbol>
-    <symbol id="nav-search" viewBox="0 0 512 512">
-        <path d="m451 430l-129-129c22-27 34-59 34-94 0-39-16-78-43-105-59-59-153-59-211 0-57 58-57 152 0 211 29 29 66 43 105 43 35 0 67-12 94-34l129 129c2 2 6 4 10 4 4 0 9-2 11-4 4-7 4-17 0-21z m-330-139c-47-47-47-123 0-170 22-23 53-35 84-35 31 0 61 12 84 35 22 22 35 53 35 84 0 33-13 61-35 84-23 22-53 35-84 35-31 2-60-11-84-33z"/>
+    <symbol id="nav-search" viewBox="0 0 21 20">
+        <path d="M20.1,16l-5.8-5.8c0.9-1.9,0.9-4.4-0.5-6.9c-0.5-1-1.3-1.8-2.3-2.3C4.7-2.6-2.2,4.2,1.4,11c0.5,1,1.3,1.8,2.3,2.3
+       c2.5,1.4,4.9,1.3,6.9,0.4l0.4,0.3l5.6,5.6c0.6,0.6,1.6,0.6,2.1,0l1.6-1.6C20.7,17.6,20.7,16.5,20.1,16z M10.2,11.6
+       c-4.8,2.6-9.7-2.3-7.1-7.1c0.4-0.8,1-1.3,1.7-1.7c4.8-2.6,9.7,2.3,7.1,7.1C11.7,10.7,11,11.2,10.2,11.6z"/>
     </symbol>';
 
                        $res .= "\n" . '</svg>';

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 13436960fa22b2b06fa5076cd43de66f83b2a089..57b21ebbf23bc3efa785edec8aa146135614ffb6 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -245,6 +245,4 @@ class wsParametres extends cubeMetier implements Iterator {
                return $v;\r
        }\r
 \r
-}\r
-\r
-?>
\ No newline at end of file
+}
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 547fc00364d2450b8b5e45ac5a574cdc3d2e04fb..8ea2fc2313ccaeaf3e5b1ce5a76753b9d4918f7d 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -72,7 +72,7 @@ class wsThemeParametres extends wsParametres {
                $this->forms['search'] = array('label' => __('Personnalisation de la recherche'),\r
                                               'fieldsnames' => array('couleurS', 'searchFieldColor', 'searchShadeAlpha', 'searchFieldWidth', '|', 'highlightColor', '|', 'searchIndexNoResultColor'));\r
                /* Icones */\r
-               $this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true,\r
+               $this->fields['iconSet'] = array('type' => 'icones', 'default' => 15, 'editable' => true,\r
                                                 'label' => __("Jeu d'icônes"));\r
                $this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                                                       'label' => __('Colorier les icônes'));\r