(no commit message)

diff --git a/framework/application/forms/CMS.php b/framework/application/forms/CMS.php
index 824177f496606c26c54d1d77bab1e5b9043c7e0e..4590ef3da2440dbbdfb0029e84e2ff02bba9d0d4 100644 (file)
--- a/framework/application/forms/CMS.php
+++ b/framework/application/forms/CMS.php
@@ -2,10 +2,8 @@
 
 class Cubedesigners_Form_CMS extends CubeIT_Form_CMS {
 
-    public function init() {
-        parent::init();
-    }
+       public function init() {
+               parent::init();
+       }
 
-}
-
-?>
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studies.php b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
index a23c4f06ab49c776b17e5521ec0356d0ba64e27d..cf5c552cdd58a45be720d53f5a652db2ef9464fb 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studies.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
@@ -1,6 +1,6 @@
 <?php
 
-class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
+class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List_Model {
 
        public function init() {
                parent::init();
@@ -19,7 +19,7 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
                $this->addElement($propulse);
 
                $annee = new CubeIT_Form_Element_Date('annee');
-        $annee->setPrecision(Zend_Date::DAY);
+               $annee->setPrecision(Zend_Date::DAY);
                $annee->setLabel('Année');
                $this->addElement($annee);
 
@@ -80,14 +80,7 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
                $bootstrap = Bootstrap::getInstance();
                $view = $bootstrap->getView();
 
-               $this->setListTitle('Etudes de cas')
-                               ->setNewTitle('Créer une étude de cas')
-                               ->setEditTitle('Edition de l\'étude de cas « $titre »')
-                               ->setBaseTable('casestudies')
-                               ->setIdColumn('id')
-                               ->setTitleColumn('titre');
+               $this->setListTitle('Etudes de cas')->setNewTitle('Créer une étude de cas')->setEditTitle('Edition de l\'étude de cas « $titre »')->setModel('Cubedesigners_Model_Casestudy')->setTitleColumn('titre');
        }
 
-}
-
-?>
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/RSS.php b/framework/application/forms/CMS/Sub/RSS.php
index 9e8080449dac9e1f4879c790e28fa4aa688838ef..efb00fd79f32d81430faea76ae8c720beb053fef 100644 (file)
--- a/framework/application/forms/CMS/Sub/RSS.php
+++ b/framework/application/forms/CMS/Sub/RSS.php
@@ -22,7 +22,7 @@ class Cubedesigners_Form_CMS_Sub_RSS extends CubeIT_Form_SubForm {
                        $this->addElement($description);\r
 \r
                        /* FEED URL */\r
-                       $url = new Zend_Form_Element_Text("rss_{$feedID}_url");\r
+                       $url = new CubeIT_Form_Element_Url("rss_{$feedID}_url");\r
                        $url->setLabel("$feedTitle URL (used for header RSS links)");\r
                        $this->addElement($url);\r
 \r

diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
index e0eb8bac19b6db025ef6a59bdf8956f905663cc5..cce7b043589938f6f86de3911464ba81cf1b04ac 100644 (file)
--- a/framework/application/forms/CMS/Sub/Realisations/Realisations.php
+++ b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
@@ -1,6 +1,6 @@
 <?php
 
-class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List {
+class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List_Model {
 
        public function init() {
                parent::init();
@@ -67,13 +67,12 @@ class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_L
                $this->addElement($technologies);
 
                $this->setListTitle('Réalisations')
-                               ->setNewTitle('Créer une réalisation')
-                               ->setEditTitle('Edition de la réalisation « $titre »')
-                               ->setBaseTable('realisations')
-                               ->setIdColumn('id')
-                               ->setTitleColumn('legende')
-                               ->setAdditionnalColumns(array('titre', 'agence', 'date', 'categories', 'online'))
-                               ->setSearchColumns(array('titre', 'agence', 'date'));
+                       ->setNewTitle('Créer une réalisation')
+                       ->setEditTitle('Edition de la réalisation « $titre »')
+                       ->setModel('Cubedesigners_Model_Realisation')
+                       ->setTitleColumn("titre")
+                       ->setAdditionnalColumns(array('titre', 'agence', 'date', 'categories', 'online'))
+                       ->setSearchColumns(array('titre', 'agence', 'date'));
        }
 
 }

diff --git a/framework/application/forms/Categories.php b/framework/application/forms/Categories.php
index 104c86cc04b3adf304dad8e2ec8314ffc66e02b0..7ce372b75dbb5a8af473201c81134c9b9d790d8d 100644 (file)
--- a/framework/application/forms/Categories.php
+++ b/framework/application/forms/Categories.php
@@ -14,12 +14,10 @@ class Cubedesigners_Form_Categories extends CubeIT_Form_List_Model {
                $this->addElementLocalized($name, false);
 
                $this->setListTitle(__('Categories'))
-                               ->setNewTitle(__('Créer une catégorie'))
-                               ->setEditTitle(sprintf(__("Edition de la catégorie « %s »"), '$name'))
-                               ->setTitleColumn('name')
-                               ->setModel("Cubedesigners_Model_Categorie");
+                       ->setNewTitle(__('Créer une catégorie'))
+                       ->setEditTitle(sprintf(__("Edition de la catégorie « %s »"), '$name'))
+                       ->setTitleColumn('name')
+                       ->setModel("Cubedesigners_Model_Categorie");
        }
 
 }
-
-?>

diff --git a/framework/application/forms/Domaines.php b/framework/application/forms/Domaines.php
index 020bf3237368fad185aa04346abcb93264fe34d0..d8ac5562bb8b4f6f47ffd5ebcda3692c248dc1db 100644 (file)
--- a/framework/application/forms/Domaines.php
+++ b/framework/application/forms/Domaines.php
@@ -13,13 +13,7 @@ class Cubedesigners_Form_Domaines extends CubeIT_Form_List_Model {
                $name->setLabel(__('Nom'));
                $this->addElementLocalized($name, false);
 
-               $this->setListTitle(__("Domaines d'activité"))
-                               ->setNewTitle(__('Créer un domaine'))
-                               ->setEditTitle(sprintf(__("Edition du domaine « %s »"), '$name'))
-                               ->setTitleColumn('name')
-                               ->setModel('Cubedesigners_Model_Domaine');
+               $this->setListTitle(__("Domaines d'activité"))->setNewTitle(__('Créer un domaine'))->setEditTitle(sprintf(__("Edition du domaine « %s »"), '$name'))->setTitleColumn('name')->setModel('Cubedesigners_Model_Domaine');
        }
 
-}
-
-?>
+}
\ No newline at end of file

diff --git a/framework/application/forms/Element/Categories.php b/framework/application/forms/Element/Categories.php
index cb640a8acea63e6835140514430fbb3254a1aa35..0e11719a72e3513f8cbcbc53e1badb39dfd6446f 100644 (file)
--- a/framework/application/forms/Element/Categories.php
+++ b/framework/application/forms/Element/Categories.php
@@ -2,9 +2,8 @@
 \r
 class Cubedesigners_Form_Element_Categories extends CubeIT_Form_Element_SelectList {\r
 \r
-        public function init() {\r
-                $this->setBaseForm('Cubedesigners_Form_Categories');\r
-        }\r
+       public function init() {\r
+               $this->setBaseForm('Cubedesigners_Form_Categories');\r
+       }\r
 \r
-}\r
-?>\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/Element/ContentType.php b/framework/application/forms/Element/ContentType.php
index 1fe097deeac918af327e7343fe3cc2c63e66e8f7..f7ce5d57f2c9c46b0030d815d10c8149bcccb5c0 100644 (file)
--- a/framework/application/forms/Element/ContentType.php
+++ b/framework/application/forms/Element/ContentType.php
@@ -1,14 +1,11 @@
 <?php\r
 \r
 class Cubedesigners_Form_Element_ContentType extends Zend_Form_Element_Select {\r
+       //public $helper = 'formContentType';\r
 \r
-        //public $helper = 'formContentType';\r
+       public function init() {\r
+               parent::init();\r
+               $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));\r
+       }\r
 \r
-        public function init() {\r
-                parent::init();\r
-                $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));\r
-        }\r
-\r
-}\r
-\r
-?>\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/Element/Domaines.php b/framework/application/forms/Element/Domaines.php
index acecc7347fcf80fbbbe472cfb8412296bd809f10..d6da107cab685434e404683d1b4b9e0700b203f5 100644 (file)
--- a/framework/application/forms/Element/Domaines.php
+++ b/framework/application/forms/Element/Domaines.php
@@ -2,10 +2,8 @@
 \r
 class Cubedesigners_Form_Element_Domaines extends CubeIT_Form_Element_SelectList {\r
 \r
-        public function init() {\r
-                $this->setBaseForm('Cubedesigners_Form_Domaines');\r
-        }\r
+       public function init() {\r
+               $this->setBaseForm('Cubedesigners_Form_Domaines');\r
+       }\r
 \r
 }\r
-\r
-?>\r

diff --git a/framework/application/forms/Element/Technologies.php b/framework/application/forms/Element/Technologies.php
index 00aed64e4d295b0ff418bc887ab31953b85a12e6..4f15ee22c537c89a476f3b45a509a869a17e6071 100644 (file)
--- a/framework/application/forms/Element/Technologies.php
+++ b/framework/application/forms/Element/Technologies.php
@@ -3,8 +3,7 @@
 class Cubedesigners_Form_Element_Technologies extends CubeIT_Form_Element_MultiCheckboxList {
 
        public function init() {
-               $this->setBaseForm('Cubedesigners_Form_Technologies')
-                               ->setDisplayListManagement();
+               $this->setBaseForm('Cubedesigners_Form_Technologies')->setDisplayListManagement();
        }
 
 }

diff --git a/framework/application/forms/Tags.php b/framework/application/forms/Tags.php
index 6673a56b28a9bd9dc5dce8e0833daad978a97f75..483daa9a9682f7b03120f79f3cec2349aa4b1e82 100644 (file)
--- a/framework/application/forms/Tags.php
+++ b/framework/application/forms/Tags.php
@@ -13,13 +13,7 @@ class Cubedesigners_Form_Tags extends CubeIT_Form_List_Model {
                $name->setLabel(__('Nom'));
                $this->addElementLocalized($name, false);
 
-               $this->setListTitle(__('Tags'))
-                               ->setNewTitle(__('Créer un tag'))
-                               ->setEditTitle(sprintf(__("Edition du tag « %s »"), '$name'))
-                               ->setTitleColumn('name')
-                               ->setModel('Cubedesigners_Model_Tag');
+               $this->setListTitle(__('Tags'))->setNewTitle(__('Créer un tag'))->setEditTitle(sprintf(__("Edition du tag « %s »"), '$name'))->setTitleColumn('name')->setModel('Cubedesigners_Model_Tag');
        }
 
-}
-
-?>
+}
\ No newline at end of file

diff --git a/framework/application/forms/User.php b/framework/application/forms/User.php
index 7b60b99f88387edbd42567bf9a0d11d7a65cb4c0..e6ee98d20c0b687138f0b882cd7585886860a6dc 100644 (file)
--- a/framework/application/forms/User.php
+++ b/framework/application/forms/User.php
@@ -2,10 +2,8 @@
 
 class Cubedesigners_Form_User extends CubeIT_Form_User {
 
-    public function init() {
-        parent::init();
-    }
+       public function init() {
+               parent::init();
+       }
 
 }
-
-?>
\ No newline at end of file

diff --git a/framework/application/models/Casestudy.php b/framework/application/models/Casestudy.php
index 8e58b9b235e5e87f7e58e1d88fb38b4dd40bad5a..c0174b359f2c9fb53d364d07b4c89eab99e9987c 100644 (file)
--- a/framework/application/models/Casestudy.php
+++ b/framework/application/models/Casestudy.php
@@ -36,7 +36,7 @@ class Cubedesigners_Model_Casestudy extends CubeIT_Model_Data_Table {
                $casestudies->addColumn('tags_secondaires', 'text');
                $casestudies->addColumn('online', 'boolean');
                $casestudies->addColumn('propulse', 'boolean');
-               $casestudies->addColumn('annee', 'text');
+               $casestudies->addColumn('annee', 'datetime');
        }
 
 }

diff --git a/framework/application/models/Content.php b/framework/application/models/Content.php
index d4748caac56b5f6afd6641f30e85c69e75183073..923eb54b648ed20f013a525b915dc21318727c41 100644 (file)
--- a/framework/application/models/Content.php
+++ b/framework/application/models/Content.php
@@ -5,6 +5,9 @@ class Cubedesigners_Model_Content extends CubeIT_Model {
        protected $name;
        protected $value;
 
-}
+       /**
+        * @var boolean
+        */
+       protected $_translate = true;
 
-?>
+}