From f455f9a21cfb9cf3bbd48022a757573af7e7c21e Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20CHAZALLET?= <s.chazallet@gmail.com>
Date: Sun, 18 Nov 2012 19:37:05 +0100
Subject: [PATCH] Rajout des aides de vue et d'action

---
 data/jeu_essai.db                                  |  Bin 41984 -> 41984 bytes
 module/Application/view/layout/layout.phtml        |   23 +++++++++++++++++++-
 module/Galerie/Module.php                          |   22 +++++++++++++++++--
 module/Galerie/config/module.config.php            |    8 ++++++-
 .../src/Galerie/Controller/IndexController.php     |   12 +++++-----
 module/Galerie/view/galerie/index/index.phtml      |    4 ----
 6 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/data/jeu_essai.db b/data/jeu_essai.db
index 0e2a0dcd640d7b3ff7d9cfed7fad7c03a0a54ad0..6954bf80c8dc7064786a7733840a8b67af4f98ff 100644
GIT binary patch
delta 68
zcmZoT!PIbqX@WGP%S0JxMwg8Vi>%l!tc)zIj4dW}T7Lks&4KJqHot}7;!OVEVB(wq
I`!j|B0Md#Sw*UYD

delta 68
zcmZoT!PIbqX@WGP*+dy<Mzf6xi>%m<tPG5;ObjP;T7Q7B4a_##{1$?XGx>jmiEsYz
H&lmy##F`XS

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index 6922bbe..9ef159f 100644
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -43,8 +43,29 @@
             </div>
         </div>
         <div class="container">
+<?php
+    $views = $this->viewModel()->getCurrent()->getChildren();
+    $main_view = $views[0];
+    $variables = $main_view->getVariables();
+?>
+<?php if (isset($variables['infos'])) : ?>
+<?php foreach($main_view->infos as $info): ?>
+    <?php echo $this->format($info, 'info'); ?>
+<?php endforeach; ?>
+<?php endif; ?>
+<?php if (isset($main_view->warnings)) : ?>
+<?php foreach($warnings as $warning): ?>
+    <?php echo $this->format($warning, 'warning'); ?>
+<?php endforeach; ?>
+<?php endif; ?>
+<?php if (isset($main_view->errors)) : ?>
+<?php foreach($errors as $error): ?>
+    <?php echo $this->format($error, 'error'); ?>
+<?php endforeach; ?>
+<?php endif; ?>
+            <hr />
             <?php echo $this->content; ?>
-            <hr>
+            <hr />
             <footer>
                 <p>&copy; 2005 - 2012 by Zend Technologies Ltd. <?php echo $this->translate('All rights reserved.') ?></p>
             </footer>
diff --git a/module/Galerie/Module.php b/module/Galerie/Module.php
index 32cd7ae..ab7faad 100644
--- a/module/Galerie/Module.php
+++ b/module/Galerie/Module.php
@@ -6,7 +6,7 @@ use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
 use Zend\ModuleManager\Feature\BootstrapListenerInterface;
 use Zend\ModuleManager\Feature\ServiceProviderInterface;
-
+use Zend\ModuleManager\Feature\ViewHelperProviderInterface;
 
 use Zend\EventManager\EventInterface;
 use Zend\Mvc\ModuleRouteListener;
@@ -16,12 +16,15 @@ use Galerie\Model\GalerieTable;
 use Galerie\Model\GalerieInfoTable;
 use Galerie\Form\GalerieForm;
 
+use Custom\View\Helper\Format;
+
 
 class Module implements
     AutoloaderProviderInterface,
     ConfigProviderInterface,
     BootstrapListenerInterface,
-    ServiceProviderInterface
+    ServiceProviderInterface,
+    ViewHelperProviderInterface
 {
 
     public function getAutoloaderConfig() 
@@ -72,4 +75,19 @@ class Module implements
             ),
         );
     }
+
+    public function getViewHelperConfig() 
+    { 
+        return array( 
+            'factories' => array( 
+                'format' => function($sm) { 
+                    return new Format;
+                }, 
+            ), 
+        ); 
+    } 
+    
+    
+    
+    
 }
diff --git a/module/Galerie/config/module.config.php b/module/Galerie/config/module.config.php
index 569165c..5c06d9c 100644
--- a/module/Galerie/config/module.config.php
+++ b/module/Galerie/config/module.config.php
@@ -4,7 +4,13 @@ return array(
     'controllers' => array(
         'invokables' => array(
             'Galerie\Controller\Index' =>
-                'Galerie\Controller\IndexController'
+                'Galerie\Controller\IndexController',
+        ),
+    ),
+    'controller_plugins' => array(
+        'invokables' => array(
+            'MessageGetter' =>
+                'Custom\Mvc\Controller\Plugin\MessageGetter',
         ),
     ),
     'view_manager' => array(
diff --git a/module/Galerie/src/Galerie/Controller/IndexController.php b/module/Galerie/src/Galerie/Controller/IndexController.php
index bacff03..fefa823 100644
--- a/module/Galerie/src/Galerie/Controller/IndexController.php
+++ b/module/Galerie/src/Galerie/Controller/IndexController.php
@@ -57,10 +57,8 @@ class IndexController extends AbstractActionController
 
 
     public function indexAction() 
-    { 
-        return new ViewModel(array(
-            'messages' => $this->flashMessenger()->getMessages(),
-        )); 
+    {
+        return new ViewModel($this->MessageGetter());
     } 
 
     public function listAction() 
@@ -164,10 +162,12 @@ class IndexController extends AbstractActionController
                 $this->_getGalerieTable()->save($galerie);
 
                 $translator = $this->_getTranslator();
+                $messenger = $this->flashMessenger();
+                $messenger->setNamespace('infos');
                 if ($is_new) {
-                    $this->flashMessenger()->addMessage($translator->translate('Galerie_added', 'galerie'));
+                    $messenger->addMessage($translator->translate('Galerie_added', 'galerie'));
                 } else {
-                    $this->flashMessenger()->addMessage($translator->translate('Galerie_updated', 'galerie'));
+                    $messenger->addMessage($translator->translate('Galerie_updated', 'galerie'));
                 }
                 // Redirection à l'ancienne mode
                 //return $this->redirect()->toRoute('galerie');
diff --git a/module/Galerie/view/galerie/index/index.phtml b/module/Galerie/view/galerie/index/index.phtml
index 546eb7e..10301d8 100644
--- a/module/Galerie/view/galerie/index/index.phtml
+++ b/module/Galerie/view/galerie/index/index.phtml
@@ -1,9 +1,5 @@
 <h1><?php echo $this->translate('Galerie_index_title', 'galerie'); ?></h1>
 
-<?php foreach($messages as $message): ?>
-    <div class='alert-info'><?php echo $message; ?></div>
-<?php endforeach; ?>
-
 <table id="galeries" class="sorted">
 	<thead>
 		<tr>
-- 
1.7.10.4