From 050dae76eea74fb1e8807f88d6b30c8b5fef670f Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 16 Jan 2015 20:44:17 +0000
Subject: [PATCH]

---
 framework/application/forms/CMS.php               | 10 ++++------
 .../forms/CMS/Sub/Casestudies/Studies.php         | 15 ++++-----------
 framework/application/forms/CMS/Sub/RSS.php       |  2 +-
 .../forms/CMS/Sub/Realisations/Realisations.php   | 15 +++++++--------
 framework/application/forms/Categories.php        | 10 ++++------
 framework/application/forms/Domaines.php          | 10 ++--------
 .../application/forms/Element/Categories.php      |  9 ++++-----
 .../application/forms/Element/ContentType.php     | 15 ++++++---------
 framework/application/forms/Element/Domaines.php  |  8 +++-----
 .../application/forms/Element/Technologies.php    |  3 +--
 framework/application/forms/Tags.php              | 10 ++--------
 framework/application/forms/User.php              |  8 +++-----
 framework/application/models/Casestudy.php        |  2 +-
 framework/application/models/Content.php          |  7 +++++--
 14 files changed, 47 insertions(+), 77 deletions(-)

diff --git a/framework/application/forms/CMS.php b/framework/application/forms/CMS.php
index 824177f..4590ef3 100644
--- 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 a23c4f0..cf5c552 100644
--- 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 9e80804..efb00fd 100644
--- 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);
 
 			/* FEED URL */
-			$url = new Zend_Form_Element_Text("rss_{$feedID}_url");
+			$url = new CubeIT_Form_Element_Url("rss_{$feedID}_url");
 			$url->setLabel("$feedTitle URL (used for header RSS links)");
 			$this->addElement($url);
 
diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
index e0eb8ba..cce7b04 100644
--- 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 104c86c..7ce372b 100644
--- 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 020bf32..d8ac556 100644
--- 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 cb640a8..0e11719 100644
--- a/framework/application/forms/Element/Categories.php
+++ b/framework/application/forms/Element/Categories.php
@@ -2,9 +2,8 @@
 
 class Cubedesigners_Form_Element_Categories extends CubeIT_Form_Element_SelectList {
 
-        public function init() {
-                $this->setBaseForm('Cubedesigners_Form_Categories');
-        }
+	public function init() {
+		$this->setBaseForm('Cubedesigners_Form_Categories');
+	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/framework/application/forms/Element/ContentType.php b/framework/application/forms/Element/ContentType.php
index 1fe097d..f7ce5d5 100644
--- a/framework/application/forms/Element/ContentType.php
+++ b/framework/application/forms/Element/ContentType.php
@@ -1,14 +1,11 @@
 <?php
 
 class Cubedesigners_Form_Element_ContentType extends Zend_Form_Element_Select {
+	//public $helper = 'formContentType';
 
-        //public $helper = 'formContentType';
+	public function init() {
+		parent::init();
+		$this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));
+	}
 
-        public function init() {
-                parent::init();
-                $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));
-        }
-
-}
-
-?>
+}
\ No newline at end of file
diff --git a/framework/application/forms/Element/Domaines.php b/framework/application/forms/Element/Domaines.php
index acecc73..d6da107 100644
--- a/framework/application/forms/Element/Domaines.php
+++ b/framework/application/forms/Element/Domaines.php
@@ -2,10 +2,8 @@
 
 class Cubedesigners_Form_Element_Domaines extends CubeIT_Form_Element_SelectList {
 
-        public function init() {
-                $this->setBaseForm('Cubedesigners_Form_Domaines');
-        }
+	public function init() {
+		$this->setBaseForm('Cubedesigners_Form_Domaines');
+	}
 
 }
-
-?>
diff --git a/framework/application/forms/Element/Technologies.php b/framework/application/forms/Element/Technologies.php
index 00aed64..4f15ee2 100644
--- 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 6673a56..483daa9 100644
--- 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 7b60b99..e6ee98d 100644
--- 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 8e58b9b..c0174b3 100644
--- 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 d4748ca..923eb54 100644
--- 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;
 
-?>
+}
-- 
2.39.5