(no commit message)

diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
index 8862a72b7a2552f1fce45355829a17ef6dc6d597..16d2fad91730e28988c13cf2105b4e315105e008 100644 (file)
--- a/framework/application/forms/CMS/Sub/Realisations/Realisations.php
+++ b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
@@ -2,77 +2,77 @@
 
 class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List {
 
-        public function init() {
-                parent::init();
-
-                $isCompactTrad = false;
-
-                $id = new CubeIT_Form_Element_Id();
-                $this->addElement($id);
-
-                $online = new Zend_Form_Element_Checkbox('online');
-                $online->setLabel('En ligne');
-                $this->addElement($online);
-
-                $annee = new Zend_Form_Element_Text('annee');
-                $annee->setLabel('Année');
-                $this->addElement($annee);
-
-                $titre = new Zend_Form_Element_Text('titre');
-                $titre->setLabel('Titre');
-                $this->addElementLocalized($titre, $isCompactTrad);
-
-                $legende = new Zend_Form_Element_Text('legende');
-                $legende->setLabel('Legende');
-                $this->addElementLocalized($legende, $isCompactTrad);
-
-                $agence = new Zend_Form_Element_Text('agence');
-                $agence->setLabel('Agence');
-                $this->addElementLocalized($agence, $isCompactTrad);
-
-                $description = new CubeIT_Form_Element_Markitup_Basic('description');
-                $description->setLabel('Description');
-                $this->addElementLocalized($description, $isCompactTrad);
-
-                $url = new CubeIT_Form_Element_Url('url');
-                $url->setLabel('URL du site');
-                $this->addElementLocalized($url, $isCompactTrad);
-
-                $visuel = new CubeIT_Form_Element_File_Image('visuel');
-                $visuel->setLabel('Visuel principal');
-                $visuel->setMaxItems(1);
-                $this->addElementLocalized($visuel, $isCompactTrad);
-
-                $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
-                $visuel_detail->setLabel('Visuels du détail');
-                $this->addElementLocalized($visuel_detail, $isCompactTrad);
-
-                $categories = new Cubedesigners_Form_Element_Categories('categories');
-                $categories->setLabel('Catégories');
-                $this->addElement($categories);
-
-                $tags = new Cubedesigners_Form_Element_Tags('tags_secondaires');
-                $tags->setLabel('Tags secondaires');
-                $this->addElement($tags);
-
-                $domaine = new Cubedesigners_Form_Element_Domaines('domaines');
-                $domaine->setLabel("Domaine d'activité");
-                $this->addElement($domaine);
-
-                $technologies = new Cubedesigners_Form_Element_Technologies('technologies');
-                $technologies->setLabel('Technologies');
-                $this->addElement($technologies);
-
-                $bootstrap = Bootstrap::getInstance();
-                $view = $bootstrap->getView();
-
-                $this->setListTitle('Réalisations')
-                        ->setNewTitle('Créer une réalisation')
-                        ->setEditTitle('Edition de la réalisation « $titre »')
-                        ->setBaseTable('realisations')
-                        ->setIdColumn('id')
-                        ->setTitleColumn('titre');
-        }
+       public function init() {
+               parent::init();
+
+               $isCompactTrad = false;
+
+               $id = new CubeIT_Form_Element_Id();
+               $this->addElement($id);
+
+               $online = new Zend_Form_Element_Checkbox('online');
+               $online->setLabel('En ligne');
+               $this->addElement($online);
+
+               $annee = new CubeIT_Form_Element_Date('date');
+               $annee->setPrecision(CubeIT_Date::MONTH);
+               $annee->setMinYear(1998);
+               $annee->setMaxYear('+1');
+               $annee->setLabel('Date');
+               $this->addElement($annee);
+
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Client');
+               $this->addElement($titre);
+
+               $legende = new Zend_Form_Element_Text('legende');
+               $legende->setLabel('Legende');
+               $this->addElementLocalized($legende, $isCompactTrad);
+
+               $agence = new Zend_Form_Element_Text('agence');
+               $agence->setLabel('Agence');
+               $this->addElement($agence);
+
+               $description = new CubeIT_Form_Element_Markitup_Basic('description');
+               $description->setLabel('Description');
+               $this->addElementLocalized($description, $isCompactTrad);
+
+               $url = new CubeIT_Form_Element_Url('url');
+               $url->setLabel('URL du site');
+               $this->addElementLocalized($url, $isCompactTrad);
+
+               $visuel = new CubeIT_Form_Element_File_Image('visuel');
+               $visuel->setLabel('Vignette');
+               $visuel->setMaxItems(1);
+               $this->addElement($visuel);
+
+               $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
+               $visuel_detail->setLabel('Images');
+               $this->addElement($visuel_detail);
+
+               $categories = new Cubedesigners_Form_Element_Categories('categories');
+               $categories->setLabel('Catégories');
+               $this->addElement($categories);
+
+               $tags = new Cubedesigners_Form_Element_Tags('tags_secondaires');
+               $tags->setLabel('Type de projet');
+               $this->addElement($tags);
+
+               $domaine = new Cubedesigners_Form_Element_Domaines('domaines');
+               $domaine->setLabel("Domaine d'activité");
+               $this->addElement($domaine);
+
+               $technologies = new Cubedesigners_Form_Element_Technologies('technologies');
+               $technologies->setLabel('Technologies');
+               $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('titre');
+       }
 
 }
 

diff --git a/framework/application/forms/Categories.php b/framework/application/forms/Categories.php
index e05c3882af93938bd84fa8b088eb68ef78578ee8..44950a3f1bd1488d11e32c4c28170f111f874056 100644 (file)
--- a/framework/application/forms/Categories.php
+++ b/framework/application/forms/Categories.php
@@ -1,6 +1,6 @@
 <?php
 
-class Cubedesigners_Form_Categories extends CubeIT_Form_List {
+class Cubedesigners_Form_Categories extends CubeIT_Form_List_Model {
 
        public function init() {
                parent::init();
@@ -16,9 +16,8 @@ class Cubedesigners_Form_Categories extends CubeIT_Form_List {
                $this->setListTitle(__('Categories'))
                                ->setNewTitle(__('Créer une catégorie'))
                                ->setEditTitle(sprintf(__("Edition de la catégorie « %s »"), '$name'))
-                               ->setBaseTable('categories')
-                               ->setIdColumn('id')
-                               ->setTitleColumn('name');
+                               ->setTitleColumn('name')
+                               ->setModel("Cubedesigners_Model_Categorie");
        }
 
 }

diff --git a/framework/application/forms/Domaines.php b/framework/application/forms/Domaines.php
index 24ccfdb01ee22469719a7a91a2d9f15b4449e9d6..28383069fddcbaffbed2e27bf60904100763a91d 100644 (file)
--- a/framework/application/forms/Domaines.php
+++ b/framework/application/forms/Domaines.php
@@ -1,26 +1,25 @@
-<?php\r
-\r
-class Cubedesigners_Form_Domaines extends CubeIT_Form_List {\r
-\r
-        public function init() {\r
-                parent::init();\r
-\r
-                $id = new Zend_Form_Element_Hidden('id');\r
-                $id->setLabel('#');\r
-                $this->addElement($id);\r
-\r
-                $name = new Zend_Form_Element_Text('name');\r
-                $name->setLabel(__('Nom'));\r
-                $this->addElement($name);\r
-\r
-                $this->setListTitle(__("Domaines d'activité"))\r
-                        ->setNewTitle(__('Créer un domaine'))\r
-                        ->setEditTitle(sprintf(__("Edition du domaine « %s »"), '$name'))\r
-                        ->setBaseTable('domaines')\r
-                        ->setIdColumn('id')\r
-                        ->setTitleColumn('name');\r
-        }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_Form_Domaines extends CubeIT_Form_List_Model {
+
+       public function init() {
+               parent::init();
+
+               $id = new Zend_Form_Element_Hidden('id');
+               $id->setLabel('#');
+               $this->addElement($id);
+
+               $name = new Zend_Form_Element_Text('name');
+               $name->setLabel(__('Nom'));
+               $this->addElement($name);
+
+               $this->setListTitle(__("Domaines d'activité"))
+                               ->setNewTitle(__('Créer un domaine'))
+                               ->setEditTitle(sprintf(__("Edition du domaine « %s »"), '$name'))
+                               ->setTitleColumn('name')
+                               ->setModel('Cubedesigners_Model_Domaine');
+       }
+
+}
+
+?>

diff --git a/framework/application/forms/Element/Tags.php b/framework/application/forms/Element/Tags.php
index 69d506e2f2a48a2b4d7d9078d621c7dc4e92143a..52b66273c507cac04e10c0e623ede832d85ac42b 100644 (file)
--- a/framework/application/forms/Element/Tags.php
+++ b/framework/application/forms/Element/Tags.php
@@ -1,11 +1,10 @@
-<?php\r
-\r
-class Cubedesigners_Form_Element_Tags extends CubeIT_Form_Element_MultiCheckbox {\r
-\r
-        public function init() {\r
-                $this->setBaseForm('Cubedesigners_Form_Tags');\r
-        }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_Form_Element_Tags extends CubeIT_Form_Element_MultiCheckboxList {
+
+       public function init() {
+               $this->setBaseForm('Cubedesigners_Form_Tags')
+                               ->setDisplayListManagement();
+       }
+
+}

diff --git a/framework/application/forms/Element/Technologies.php b/framework/application/forms/Element/Technologies.php
index 139080da85341a7cd547c70e58f076c6bbfd749c..00aed64e4d295b0ff418bc887ab31953b85a12e6 100644 (file)
--- a/framework/application/forms/Element/Technologies.php
+++ b/framework/application/forms/Element/Technologies.php
@@ -1,11 +1,10 @@
-<?php\r
-\r
-class Cubedesigners_Form_Element_Technologies extends CubeIT_Form_Element_MultiCheckbox {\r
-\r
-        public function init() {\r
-                $this->setBaseForm('Cubedesigners_Form_Technologies');\r
-        }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_Form_Element_Technologies extends CubeIT_Form_Element_MultiCheckboxList {
+
+       public function init() {
+               $this->setBaseForm('Cubedesigners_Form_Technologies')
+                               ->setDisplayListManagement();
+       }
+
+}

diff --git a/framework/application/forms/Tags.php b/framework/application/forms/Tags.php
index 4909a277cfefc07ba0f9de5b961f4d0727562299..964728aac46b099f70002c534117deb79b3debfb 100644 (file)
--- a/framework/application/forms/Tags.php
+++ b/framework/application/forms/Tags.php
@@ -1,26 +1,25 @@
-<?php\r
-\r
-class Cubedesigners_Form_Tags extends CubeIT_Form_List {\r
-\r
-        public function init() {\r
-                parent::init();\r
-\r
-                $id = new Zend_Form_Element_Hidden('id');\r
-                $id->setLabel('#');\r
-                $this->addElement($id);\r
-\r
-                $name = new Zend_Form_Element_Text('name');\r
-                $name->setLabel(__('Nom'));\r
-                $this->addElement($name);\r
-\r
-                $this->setListTitle(__('Tags'))\r
-                        ->setNewTitle(__('Créer un tag'))\r
-                        ->setEditTitle(sprintf(__("Edition du tag « %s »"), '$name'))\r
-                        ->setBaseTable('tags')\r
-                        ->setIdColumn('id')\r
-                        ->setTitleColumn('name');\r
-        }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_Form_Tags extends CubeIT_Form_List_Model {
+
+       public function init() {
+               parent::init();
+
+               $id = new Zend_Form_Element_Hidden('id');
+               $id->setLabel('#');
+               $this->addElement($id);
+
+               $name = new Zend_Form_Element_Text('name');
+               $name->setLabel(__('Nom'));
+               $this->addElement($name);
+
+               $this->setListTitle(__('Tags'))
+                               ->setNewTitle(__('Créer un tag'))
+                               ->setEditTitle(sprintf(__("Edition du tag « %s »"), '$name'))
+                               ->setTitleColumn('name')
+                               ->setModel('Cubedesigners_Model_Tag');
+       }
+
+}
+
+?>

diff --git a/framework/application/forms/Technologies.php b/framework/application/forms/Technologies.php
index f163f35dd84ec950fd65a6b3f44f481be4ab5da3..3e79b646a5cad82053c7a69087661ed064f10a93 100644 (file)
--- a/framework/application/forms/Technologies.php
+++ b/framework/application/forms/Technologies.php
@@ -1,26 +1,23 @@
-<?php\r
-\r
-class Cubedesigners_Form_Technologies extends CubeIT_Form_List {\r
-\r
-        public function init() {\r
-                parent::init();\r
-\r
-                $id = new Zend_Form_Element_Hidden('id');\r
-                $id->setLabel('#');\r
-                $this->addElement($id);\r
-\r
-                $name = new Zend_Form_Element_Text('name');\r
-                $name->setLabel(__('Nom'));\r
-                $this->addElement($name);\r
-\r
-                $this->setListTitle(__('Technologies'))\r
-                        ->setNewTitle(__('Créer une technologie'))\r
-                        ->setEditTitle(sprintf(__("Edition de la technologie « %s »"), '$name'))\r
-                        ->setBaseTable('technologies')\r
-                        ->setIdColumn('id')\r
-                        ->setTitleColumn('name');\r
-        }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_Form_Technologies extends CubeIT_Form_List_Model {
+
+       public function init() {
+               parent::init();
+
+               $id = new Zend_Form_Element_Hidden('id');
+               $id->setLabel('#');
+               $this->addElement($id);
+
+               $name = new Zend_Form_Element_Text('name');
+               $name->setLabel(__('Nom'));
+               $this->addElement($name);
+
+               $this->setListTitle(__('Technologies'))
+                               ->setNewTitle(__('Créer une technologie'))
+                               ->setEditTitle(sprintf(__("Edition de la technologie « %s »"), '$name'))
+                               ->setTitleColumn('name')
+                               ->setModel('Cubedesigners_Model_Technologie');
+       }
+
+}

diff --git a/framework/application/models/Content.php b/framework/application/models/Content.php
index 38004bc25336378f8a72e207de1d3b8f619fa8e9..d4748caac56b5f6afd6641f30e85c69e75183073 100644 (file)
--- a/framework/application/models/Content.php
+++ b/framework/application/models/Content.php
@@ -2,9 +2,8 @@
 
 class Cubedesigners_Model_Content extends CubeIT_Model {
 
-    protected $id;
-    protected $name;
-    protected $value;
+       protected $name;
+       protected $value;
 
 }
 

diff --git a/framework/application/models/Realisation.php b/framework/application/models/Realisation.php
index 245a57e4dbbb30437f1daed55750d2ccb8fca118..3e45c9ff4ddaa823980f6c880960579f939a4296 100644 (file)
--- a/framework/application/models/Realisation.php
+++ b/framework/application/models/Realisation.php
@@ -31,7 +31,7 @@ class Cubedesigners_Model_Realisation extends CubeIT_Model_Table {
                $realisations->addColumn('technologies', 'text');
                $realisations->addColumn('tags_secondaires', 'text');
                $realisations->addColumn('online', 'boolean');
-               $realisations->addColumn('annee', 'text');
+               $realisations->addColumn('date', 'datetime');
        }
 
 }