From a5349391445aa022f2c48b1313d633b50f208f05 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 4 Dec 2013 14:35:30 +0000
Subject: [PATCH]

---
 framework/application/forms/CMS/Listing.php      |  6 +++++-
 .../application/forms/CMS/Sub/Listing/Essai.php  |  3 ++-
 .../application/forms/CMS/Sub/Listing/Essais.php |  2 +-
 .../application/forms/CMS/Sub/Listing/Listes.php |  2 +-
 .../views/scripts/templates/listing.phtml        | 16 ++++++++--------
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/framework/application/forms/CMS/Listing.php b/framework/application/forms/CMS/Listing.php
index df6ddc1..a057e65 100644
--- a/framework/application/forms/CMS/Listing.php
+++ b/framework/application/forms/CMS/Listing.php
@@ -1,9 +1,13 @@
 <?php
 
-class CCGM_Form_CMS_Listing extends CCGM_Form_CMS_Default {
+class CCGM_Form_CMS_Listing extends CCGM_Form_CMS_Text {
 
 	public function init() {
 		parent::init();
+		
+		$this->removeSubForm('sidebar');
+		
+		$this->getElement('text')->setAttrib('rows', 6);
 
 		$essais = new CCGM_Form_CMS_Sub_Listing_Listes();
 		$essais->setLegend('Essais');
diff --git a/framework/application/forms/CMS/Sub/Listing/Essai.php b/framework/application/forms/CMS/Sub/Listing/Essai.php
index 04c5fa6..8cdfe25 100644
--- a/framework/application/forms/CMS/Sub/Listing/Essai.php
+++ b/framework/application/forms/CMS/Sub/Listing/Essai.php
@@ -19,7 +19,8 @@ class CCGM_Form_CMS_Sub_Listing_Essai extends CubeIT_Form_SubForm {
 		$localisation->setLabel('Localisation');
 		$this->addElement($localisation);
 
-		$phase = new Zend_Form_Element_Text('phase');
+		$phase = new Zend_Form_Element_Select('phase');
+		$phase->setMultiOptions(array('I'=>'I','II'=>'II','III'=>'III','IV'=>'IV'));
 		$phase->setLabel('Phase');
 		$this->addElement($phase);
 
diff --git a/framework/application/forms/CMS/Sub/Listing/Essais.php b/framework/application/forms/CMS/Sub/Listing/Essais.php
index d3e0e70..11028a5 100644
--- a/framework/application/forms/CMS/Sub/Listing/Essais.php
+++ b/framework/application/forms/CMS/Sub/Listing/Essais.php
@@ -7,7 +7,7 @@ class CCGM_Form_CMS_Sub_Listing_Essais extends CubeIT_Form_Multi_SubForm {
 
 		$essai = new CCGM_Form_CMS_Sub_Listing_Essai();
 		$this->setBaseSubForm($essai);
-		$this->setBaseLegend('Edition de l\'essai $code');
+		$this->setBaseLegend('Edition de l\'essai « $code »');
 		$this->setNewLegend('Nouvel essai');
 	}
 
diff --git a/framework/application/forms/CMS/Sub/Listing/Listes.php b/framework/application/forms/CMS/Sub/Listing/Listes.php
index 4b10f8b..6a5e4f9 100644
--- a/framework/application/forms/CMS/Sub/Listing/Listes.php
+++ b/framework/application/forms/CMS/Sub/Listing/Listes.php
@@ -8,7 +8,7 @@ class CCGM_Form_CMS_Sub_Listing_Listes extends CubeIT_Form_Multi_SubForm {
 		$liste = new CCGM_Form_CMS_Sub_Listing_Liste();
 		$this->setBaseSubForm($liste);
 		$this->setNewLegend('Nouveau groupe d\'essais');
-		$this->setBaseLegend('Edition du group $titre');
+		$this->setBaseLegend('Edition du groupe « $titre »');
 	}
 
 }
diff --git a/framework/application/views/scripts/templates/listing.phtml b/framework/application/views/scripts/templates/listing.phtml
index fb9e0c3..33716e7 100644
--- a/framework/application/views/scripts/templates/listing.phtml
+++ b/framework/application/views/scripts/templates/listing.phtml
@@ -1,8 +1,8 @@
-<?php
-
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
+<section id="content">
+	<div id="c">
+		<?php
+		echo $this->markupDotclear($this->text);
+		?>
+	</div>
+	<?php echo $this->rightbar() ?>
+</section>
\ No newline at end of file
-- 
2.39.5