(no commit message)

diff --git a/framework/application/forms/CMS/Listing.php b/framework/application/forms/CMS/Listing.php
index df6ddc1ae1ad421a691c525366c799bd81e61064..a057e6542cb0c17979bc5061d0ef91336f22779f 100644 (file)
--- a/framework/application/forms/CMS/Listing.php
+++ b/framework/application/forms/CMS/Listing.php
@@ -1,9 +1,13 @@
 <?php\r
 \r
-class CCGM_Form_CMS_Listing extends CCGM_Form_CMS_Default {\r
+class CCGM_Form_CMS_Listing extends CCGM_Form_CMS_Text {\r
 \r
        public function init() {\r
                parent::init();\r
+               \r
+               $this->removeSubForm('sidebar');\r
+               \r
+               $this->getElement('text')->setAttrib('rows', 6);\r
 \r
                $essais = new CCGM_Form_CMS_Sub_Listing_Listes();\r
                $essais->setLegend('Essais');\r

diff --git a/framework/application/forms/CMS/Sub/Listing/Essai.php b/framework/application/forms/CMS/Sub/Listing/Essai.php
index 04c5fa678ed221791d06ea01a17e1d639e8a4108..8cdfe255c4bd204f7966e4a1a7dce3122a961b16 100644 (file)
--- 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');\r
                $this->addElement($localisation);\r
 \r
-               $phase = new Zend_Form_Element_Text('phase');\r
+               $phase = new Zend_Form_Element_Select('phase');\r
+               $phase->setMultiOptions(array('I'=>'I','II'=>'II','III'=>'III','IV'=>'IV'));\r
                $phase->setLabel('Phase');\r
                $this->addElement($phase);\r
 \r

diff --git a/framework/application/forms/CMS/Sub/Listing/Essais.php b/framework/application/forms/CMS/Sub/Listing/Essais.php
index d3e0e70604b3148cba60bc90c019258fcef9b96d..11028a5304bfae796a715635f5dfedd262ed6fac 100644 (file)
--- 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 {
 \r
                $essai = new CCGM_Form_CMS_Sub_Listing_Essai();\r
                $this->setBaseSubForm($essai);\r
-               $this->setBaseLegend('Edition de l\'essai $code');\r
+               $this->setBaseLegend('Edition de l\'essai « $code »');\r
                $this->setNewLegend('Nouvel essai');\r
        }\r
 \r

diff --git a/framework/application/forms/CMS/Sub/Listing/Listes.php b/framework/application/forms/CMS/Sub/Listing/Listes.php
index 4b10f8bec4546806dba9c7d4637f14c711e2223c..6a5e4f91ef2c9e0a3f68a9eba64a8a387b84d480 100644 (file)
--- 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();\r
                $this->setBaseSubForm($liste);\r
                $this->setNewLegend('Nouveau groupe d\'essais');\r
-               $this->setBaseLegend('Edition du group $titre');\r
+               $this->setBaseLegend('Edition du groupe « $titre »');\r
        }\r
 \r
 }\r

diff --git a/framework/application/views/scripts/templates/listing.phtml b/framework/application/views/scripts/templates/listing.phtml
index fb9e0c3df3f9df03a4d95c24d7787e3ecad6f4e5..33716e78f04a8feb7081f789277b89cad29ea8d6 100644 (file)
--- a/framework/application/views/scripts/templates/listing.phtml
+++ b/framework/application/views/scripts/templates/listing.phtml
@@ -1,8 +1,8 @@
-<?php\r
-\r
-/* \r
- * To change this license header, choose License Headers in Project Properties.\r
- * To change this template file, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-\r
+<section id="content">\r
+       <div id="c">\r
+               <?php\r
+               echo $this->markupDotclear($this->text);\r
+               ?>\r
+       </div>\r
+       <?php echo $this->rightbar() ?>\r
+</section>
\ No newline at end of file