From 28baec092199755462f650502ecffaad5afd5235 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Fri, 25 May 2012 13:24:30 +0000
Subject: [PATCH] Retour configuration

---
 application/controllers/AideController.php    | 11 ++++++---
 .../controllers/DashboardController.php       |  6 +++++
 .../views/default/scripts/aide/index.phtml    |  8 ++++++-
 .../default/scripts/comptage/savedialog.phtml |  1 +
 .../default/scripts/dashboard/ciblage.phtml   |  2 +-
 .../default/scripts/dashboard/ciblages.phtml  |  4 +---
 .../scripts/dashboard/configuration.phtml     | 24 ++++++++++++-------
 .../default/scripts/dashboard/index.phtml     |  4 +---
 public/themes/default/styles/aide.css         |  4 ++++
 9 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 public/themes/default/styles/aide.css

diff --git a/application/controllers/AideController.php b/application/controllers/AideController.php
index 724965e9..f496e985 100644
--- a/application/controllers/AideController.php
+++ b/application/controllers/AideController.php
@@ -1,9 +1,14 @@
 <?php
 class AideController extends Zend_Controller_Action
 {
-	
+	public function init()
+	{
+		$this->view->headLink()->appendStylesheet('/themes/default/styles/aide.css');
+	}
+
+
 	public function indexAction(){}
-	
+
 	public function aproposdeAction(){}
-	
+
 }
\ No newline at end of file
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 302875fd..45627484 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -280,6 +280,12 @@ class DashboardController extends Zend_Controller_Action
 	{
 
 	}
+
+	public function configurationAction()
+	{
+
+	}
+
 }
 
 
diff --git a/application/views/default/scripts/aide/index.phtml b/application/views/default/scripts/aide/index.phtml
index 1568c6a2..80ca9d55 100644
--- a/application/views/default/scripts/aide/index.phtml
+++ b/application/views/default/scripts/aide/index.phtml
@@ -1,4 +1,10 @@
-<div>
+<div id="help">
+
+<h2>Description de l'interface</h2>
+<br/>
+
+
+<h2>Fonctionnement des champs</h2>
 
 <ul>
 <li>Champs de sélection simple
diff --git a/application/views/default/scripts/comptage/savedialog.phtml b/application/views/default/scripts/comptage/savedialog.phtml
index d8e1d7a5..f164e681 100644
--- a/application/views/default/scripts/comptage/savedialog.phtml
+++ b/application/views/default/scripts/comptage/savedialog.phtml
@@ -21,6 +21,7 @@ buttons: [ {
 				success: function(data){
 					if (data.error == 0) {
 						$('#result').html(data.msg);
+						//@todo : Voir
 						$(location).attr('href',data.href);
 					} else {
 						$('#result span.message').html(data.msg);
diff --git a/application/views/default/scripts/dashboard/ciblage.phtml b/application/views/default/scripts/dashboard/ciblage.phtml
index f90208b7..6cf731e5 100644
--- a/application/views/default/scripts/dashboard/ciblage.phtml
+++ b/application/views/default/scripts/dashboard/ciblage.phtml
@@ -6,7 +6,7 @@
 
 <div id="dashboard" style="padding:10px">
 
-<a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$this->comptageId))?>">Recharger les critères de ciblage dans l'interface</a> |
+<a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$this->comptageId))?>">Charger les critères de ciblage dans l'interface</a> |
 <a class="update" href="<?=$this->url(array('controller'=> 'comptage','action'=>'update', 'id'=>$this->comptageId))?>">Actualiser le comptage</a> |
 <a class="enrichissementref" href="<?=$this->url(array('controller'=> 'enrichissement','action'=>'reference', 'id'=>$this->comptageId))?>">Commander un enrichissement</a>
 
diff --git a/application/views/default/scripts/dashboard/ciblages.phtml b/application/views/default/scripts/dashboard/ciblages.phtml
index 5a2c0048..6990624c 100644
--- a/application/views/default/scripts/dashboard/ciblages.phtml
+++ b/application/views/default/scripts/dashboard/ciblages.phtml
@@ -34,10 +34,8 @@
 	<td class="update resultat"><?=number_format($item['resultat'], 0, ',', ' ')?></td>
 	<td class="update insee"><?=number_format($item['uniteInsee'], 0, ',', ' ')?></td>
 	<td class="update date"><?=$item['dateComptage']?></td>
-	<td><a class="update" href="<?=$this->url(array('controller'=> 'comptage','action'=>'update', 'id'=>$item['id']))?>">Actualiser</a></td>
-	<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>">Recharger les critères de ciblage</a></td>
 	<td><a href="<?=$this->url(array('controller'=> 'dashboard','action'=>'ciblage', 'id'=>$item['id']))?>">Detail</a></td>
-	<td><a class="enrichissementref" href="<?=$this->url(array('controller'=> 'enrichissement','action'=>'reference', 'id'=>$item['id']))?>">Enrichissement</a></td>
+	<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>">Charger les critères de ciblage dans l'interface</a></td>
 </tr>
 <?php endforeach;?>
 </tbody>
diff --git a/application/views/default/scripts/dashboard/configuration.phtml b/application/views/default/scripts/dashboard/configuration.phtml
index fe2e0cf6..6cd02338 100644
--- a/application/views/default/scripts/dashboard/configuration.phtml
+++ b/application/views/default/scripts/dashboard/configuration.phtml
@@ -1,14 +1,22 @@
+<ul class="chemin clearfix rounded_t">
+<li class="e0"><a class="lir" href="/">Accueil</a></li>
+<li>
+	<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'index'))?>">
+		<span>Tableau de bord</span>
+	</a>
+</li>
+<li class="last">
+	<span>Préférences</span>
+</li>
+</ul>
+
 <div id="dashboard">
 
-<div class="chemin">
-<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>''))?>">Tableau de bord</a> >
-Préférences
-</div>
 
 <h2>Gestion des profils d'enrichissement</h2>
 <p>
-Afin de vous permettre un enrichissement de données à partir d'une liste de SIREN/SIRET, 
-Suivant la configuration de votre compte, vous avez la possibilité de sélectionner les données 
+Afin de vous permettre un enrichissement de données à partir d'une liste de SIREN/SIRET,
+Suivant la configuration de votre compte, vous avez la possibilité de sélectionner les données
 disponible.
 </p>
 <br/>
@@ -27,7 +35,7 @@ disponible.
 
 <h2>Gestion des préférences d'affichage</h2>
 <p>
-L'application permet la modification de l'affichage des critères de ciblage afin de permettre une 
+L'application permet la modification de l'affichage des critères de ciblage afin de permettre une
 utilisation correspondant à vos besoins.
 </p>
 <br/>
@@ -38,7 +46,7 @@ utilisation correspondant à vos besoins.
 <p>Des préférences d'affichage ont été définies pour votre profil utilisateur.</p>
 <br/>
 <p>
-<a href="<?=$this->url(array('controller'=>'preferences', 'action'=>'active'))?>" 
+<a href="<?=$this->url(array('controller'=>'preferences', 'action'=>'active'))?>"
 title="Activer le mode personnalisation afin de créer/modifier les préférences d'affichage">
 Activer le mode personnalisation
 </a>
diff --git a/application/views/default/scripts/dashboard/index.phtml b/application/views/default/scripts/dashboard/index.phtml
index 97c8ff94..3c26bc94 100644
--- a/application/views/default/scripts/dashboard/index.phtml
+++ b/application/views/default/scripts/dashboard/index.phtml
@@ -45,10 +45,8 @@
 				<td class="update resultat"><?=number_format($item['resultat'], 0, ',', ' ')?></td>
 				<td class="update insee"><?=number_format($item['uniteInsee'], 0, ',', ' ')?></td>
 				<td class="update date"><?=$item['dateComptage']?></td>
-				<td><a class="update" href="<?=$this->url(array('controller'=> 'comptage','action'=>'update', 'id'=>$item['id']))?>">Actualiser</a></td>
-				<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>">Recharger les critères de ciblage</a></td>
 				<td><a href="<?=$this->url(array('controller'=> 'dashboard','action'=>'ciblage', 'id'=>$item['id']))?>">Detail</a></td>
-				<td><a class="enrichissementref" href="<?=$this->url(array('controller'=> 'enrichissement','action'=>'reference', 'id'=>$item['id']))?>">Enrichissement</a></td>
+				<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>">Charger les critères de ciblage dans l'interface</a></td>
 			</tr>
 			<?php endforeach;?>
 		</tbody>
diff --git a/public/themes/default/styles/aide.css b/public/themes/default/styles/aide.css
new file mode 100644
index 00000000..7b5a8353
--- /dev/null
+++ b/public/themes/default/styles/aide.css
@@ -0,0 +1,4 @@
+div#help {
+	background-color:#ffffff;
+	
+}
\ No newline at end of file