From ec8fb88e7498ebf07d4375bd7b57b239d5eedacb Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Thu, 10 Apr 2014 08:51:13 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20possibilit=C3=A9=20d'inclure=20ou=20pas?=
 =?UTF-8?q?=20l'ic=C3=B4ne=20(inclu=20par=20d=C3=A9faut).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UnicaenApp/View/Helper/Messenger.php | 28 +++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/UnicaenApp/View/Helper/Messenger.php b/src/UnicaenApp/View/Helper/Messenger.php
index 89db5dbd..53974ee2 100644
--- a/src/UnicaenApp/View/Helper/Messenger.php
+++ b/src/UnicaenApp/View/Helper/Messenger.php
@@ -39,6 +39,12 @@ class Messenger extends AbstractHelper
      */
     protected $severity = null;
     
+    /**
+     * Activation ou non de l'affichage de l'icône
+     * @var bool
+     */
+    protected $withIcon = true;
+    
     /**
      * @var string
      */
@@ -72,7 +78,7 @@ class Messenger extends AbstractHelper
         catch (\Exception $exc) {
             var_dump($exc->getMessage(), $exc->getTraceAsString());die;
         }
-        }
+    }
 
     /**
      * Génère le code HTML.
@@ -241,6 +247,18 @@ class Messenger extends AbstractHelper
         }
         return $this;
     }
+    
+    /**
+     * Active ou non l'affichage de l'icône.
+     * 
+     * @param bool $withIcon <tt>true</tt> pour activer l'affichage de l'icône.
+     * @return Messenger
+     */
+    public function withIcon($withIcon = true)
+    {
+        $this->withIcon = (bool) $withIcon;
+        return $this;
+    }
 
     /**
      * Retourne le motif utilisé pour générer le conteneur de chaque message à afficher.
@@ -256,13 +274,13 @@ class Messenger extends AbstractHelper
         }
         
         $innerTemplate = $this->containerInnerTemplate ?: '%s';
-        
-        $containerId = $containerId ? sprintf('id="%s"', $containerId) : '';
+        $iconMarkup    = $this->withIcon ? "<span class=\"glyphicon glyphicon-{$this->uiClasses[$severity][1]}\"></span> " : null;
+        $containerId   = $containerId ? sprintf('id="%s"', $containerId) : '';
 
         $template = <<<EOT
 <div class="messenger alert alert-{$this->uiClasses[$severity][0]}" {$containerId}>
-    <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <!--<i class="icon-{$this->uiClasses[$severity][1]}"></i>-->
+    <button type="button" class="close" title="Fermer cette alerte" data-dismiss="alert">&times;</button>
+    $iconMarkup 
     $innerTemplate
 </div>
 EOT;
-- 
GitLab