(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 662bf63b79015f442cf179bda0f6f2723699461e..9e9ad6437a17c8af74ad402a7d4e9d07d915e780 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -87,7 +87,7 @@ class wsServices extends cubeFlashGateway {
                $total = count($groups);\r
                foreach ($groups as $i => $g) {\r
                        $s = '';\r
-                       if ($total > 0) {\r
+                       if ($total > 1) {\r
                                $s = ' (' . ($i + 1) . '/' . $total . ')';\r
                        }\r
 \r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 7bcdc95fb79cce45f9eb58e803d398323a79271a..22d57d9e42130bd3cba9163ed0c59b53cc9e4e70 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -115,9 +115,9 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur de fond des infobulles"));\r
                $this->fields['tooltipTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte des infobulles"));\r
-               $this->fields['bookmarkBackgroundColor'] = array('type' => 'couleurAlpha', 'default' => 'ffdddddd', 'editable' => true,\r
+               $this->fields['bookmarkBackgroundColor'] = array('type' => 'couleurAlpha', 'default' => 'ffadadad', 'editable' => true,\r
                        'label' => __("Couleur de fond des marques-pages"));\r
-               $this->fields['bookmarkStarDisabledColor'] = array('type' => 'couleur', 'default' => 'c7c7c7', 'editable' => true,\r
+               $this->fields['bookmarkStarDisabledColor'] = array('type' => 'couleurAlpha', 'default' => '00ffffff', 'editable' => true,\r
                        'label' => __("Couleur de l'étoile désactivée"));\r
                $this->fields['bookmarkStarEnabledColor'] = array('type' => 'couleur', 'default' => 'ff7700', 'editable' => true,\r
                        'label' => __("Couleur de l'étoile activée"));\r