(no commit message)

diff --git a/framework/application/forms/CMS/Sub/CaseStudiesList.php b/framework/application/forms/CMS/Sub/CaseStudiesList.php
new file mode 100644 (file)
index 0000000..268dae4
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/CaseStudiesList.php
@@ -0,0 +1,26 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_CaseStudiesList extends CubeIT_Form_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Titre');
+               $this->addElementLocalized($titre);
+
+               $soustitre = new Zend_Form_Element_Text('soustitre');
+               $soustitre->setLabel('Sous-titre');
+               $this->addElementLocalized($soustitre);
+
+               $lines = new Zend_Form_Element_Text('lines');
+               $lines->setLabel('Nombre de lignes à afficher');
+               $lines->setValue(2);
+               $this->addElement($lines);
+
+               $propulse = new Cubedesigners_Form_CMS_Sub_Casestudies_MultiCheckboxList('propulse');
+               $propulse->setLabel('Propulser les case studies');
+               $this->addElement($propulse);
+       }
+
+}

diff --git a/framework/application/forms/CMS/Sub/Casestudies/MultiCheckboxList.php b/framework/application/forms/CMS/Sub/Casestudies/MultiCheckboxList.php
new file mode 100644 (file)
index 0000000..d57c1a6
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Casestudies/MultiCheckboxList.php
@@ -0,0 +1,17 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Casestudies_MultiCheckboxList extends CubeIT_Form_Element_MultiCheckboxList {
+
+       public function init() {
+               parent::init();
+               $studies = Cubedesigners_Model_Casestudy::factory()->find();
+
+               $options = array();
+               foreach ($studies as $s) {
+                       $t = $s->getTitre();
+                       $options[$s->getId()] = $t['fr'];
+               }
+               $this->setMultiOptions($options);
+       }
+
+}

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studie.php b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
index 4b4ee0c6b32a047804cd30c90cf0d99e1d0e35c7..18bc767e3328ef0fedbfc174b196f186571dca39 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studie.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
@@ -2,35 +2,33 @@
 
 class Cubedesigners_Form_CMS_Sub_Casestudies_Studie extends CubeIT_Form_SubForm {
 
-    public function init() {
-       parent::init();
+       public function init() {
+               parent::init();
 
-       $online = new Zend_Form_Element_Checkbox('online');
-       $online->setLabel('En ligne');
-       $this->addElement($online);
+               $online = new Zend_Form_Element_Checkbox('online');
+               $online->setLabel('En ligne');
+               $this->addElement($online);
 
-       $titre = new Zend_Form_Element_Text('titre');
-       $titre->setLabel('Titre');
-       $this->addElement($titre);
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Titre');
+               $this->addElement($titre);
 
-       $description = new Zend_Form_Element_Text('description');
-       $description->setLabel('Description');
-       $this->addElement($description);
+               $description = new Zend_Form_Element_Text('description');
+               $description->setLabel('Description');
+               $this->addElement($description);
 
-       $visuel = new CubeIT_Form_Element_File_Image('visuel');
-       $visuel->setLabel('Visuel de la page Case Studies');
-       $visuel->setMaxItems(1);
-       $this->addElement($visuel);
+               $visuel = new CubeIT_Form_Element_File_Image('visuel');
+               $visuel->setLabel('Visuel de la page Case Studies');
+               $visuel->setMaxItems(1);
+               $this->addElement($visuel);
 
-       $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
-       $blocs->setLegend('Contenu');
-       $this->addSubForm($blocs, 'blocs');
+               $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
+               $blocs->setLegend('Contenu');
+               $this->addSubForm($blocs, 'blocs');
 
-       $tags = new Cubedesigners_Form_Element_Tags('tags');
-       $tags->setLabel('Tags');
-       $this->addElement($tags);
-    }
+               $tags = new Cubedesigners_Form_Element_Tags('tags');
+               $tags->setLabel('Tags');
+               $this->addElement($tags);
+       }
 
 }
-
-?>

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studies.php b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
index fa7acaa65b7562b129a804170ffb4a89631d3ae9..044a5f02191fa6d5a68e2f0870ab8ad69dd7fb3d 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studies.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
@@ -2,87 +2,90 @@
 
 class Cubedesigners_Form_CMS_Sub_Casestudies_Studies 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);
-
-                $propulse = new Zend_Form_Element_Checkbox('propulse');
-                $propulse->setLabel('Propulsée');
-                $this->addElement($propulse);
-
-                $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);
-
-                $description = new Zend_Form_Element_Text('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 de la page Case Studies');
-                $visuel->setMaxItems(1);
-                $this->addElementLocalized($visuel, $isCompactTrad);
-
-                $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
-                $visuel_detail->setLabel('Visuel de la page de détail');
-                $visuel_detail->setMaxItems(1);
-                $this->addElementLocalized($visuel_detail, $isCompactTrad);
-
-                $legende = new Zend_Form_Element_Text('legende');
-                $legende->setLabel('Legende du visuel');
-                $this->addElementLocalized($legende, $isCompactTrad);
-
-                $color = new Zend_Form_Element_Text('couleur');
-                $color->setLabel('Code couleur de la zone de contenu');
-                $this->addElement($color);
-
-                $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
-                $blocs->setLegend('Contenu');
-                $this->addSubForm($blocs, 'blocs');
-
-                $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('Etudes de cas')
-                        ->setNewTitle('Créer une étude de cas')
-                        ->setEditTitle('Edition de l\'étude de cas « $titre »')
-                        ->setBaseTable('casestudies')
-                        ->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);
+
+               $propulse = new Zend_Form_Element_Checkbox('propulse');
+               $propulse->setLabel('Propulsée');
+               $this->addElement($propulse);
+
+               $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);
+
+               $description = new Zend_Form_Element_Text('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 de la page Case Studies');
+               $visuel->setMaxItems(1);
+               $this->addElementLocalized($visuel, $isCompactTrad);
+
+               $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
+               $visuel_detail->setLabel('Visuel de la page de détail');
+               $visuel_detail->setMaxItems(1);
+               $this->addElementLocalized($visuel_detail, $isCompactTrad);
+
+               $legende = new Zend_Form_Element_Text('legende');
+               $legende->setLabel('Legende du visuel');
+               $this->addElementLocalized($legende, $isCompactTrad);
+
+               $color = new Zend_Form_Element_Text('couleur');
+               $color->setLabel('Code couleur de la zone de contenu');
+               $this->addElement($color);
+
+               $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
+               $blocs->setLegend('Contenu');
+               $this->addSubForm($blocs, 'blocs');
+
+               $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);
+
+               $casesStudies = new Cubedesigners_Form_CMS_Sub_CaseStudiesList();
+               $casesStudies->setLegend('Liens vers case studies connexes');
+               $this->addSubForm($casesStudies, 'connexe');
+
+               $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');
+       }
 
 }
 

diff --git a/framework/application/models/Casestudy.php b/framework/application/models/Casestudy.php
index 98f5a471f0909575de856d846110ab3da17b0884..1ecdded377d7e7834a647fb8872bf4910888c4cd 100644 (file)
--- a/framework/application/models/Casestudy.php
+++ b/framework/application/models/Casestudy.php
@@ -18,6 +18,7 @@ class Cubedesigners_Model_Casestudy extends CubeIT_Model_Data_Table {
        protected $online;
        protected $propulse;
        protected $annee;
+       protected $_types = array('titre' => 'json', 'description' => 'json', 'url' => 'json', 'visuel' => 'json', 'visuel_detail' => 'json', 'legende' => 'json');
 
        public static function getSchema($schema) {
                $casestudies = parent::getSchema($schema);

diff --git a/images/favicon/favicon-ios-114.png b/images/favicon/favicon-ios-114.png
index ae250c3d2b6d22ea91e1ccd8d03b41ec41f577d3..0cfaadcab47ca7f1bff64c85e48222a070e80ccd 100644 (file)
Binary files a/images/favicon/favicon-ios-114.png and b/images/favicon/favicon-ios-114.png differ

diff --git a/images/favicon/favicon-ios-120.png b/images/favicon/favicon-ios-120.png
index d8995a3b47ff61d6ec5dd06039bcad7ff31028da..01de78eb517e4dbc20f8f6260bd02c019201067e 100644 (file)
Binary files a/images/favicon/favicon-ios-120.png and b/images/favicon/favicon-ios-120.png differ

diff --git a/images/favicon/favicon-ios-144.png b/images/favicon/favicon-ios-144.png
index eb4a8b93abd0ecbff26d59413d18b3d3568ac7db..19df7219d6980a44fb0adbc1da84a38b0a433596 100644 (file)
Binary files a/images/favicon/favicon-ios-144.png and b/images/favicon/favicon-ios-144.png differ

diff --git a/images/favicon/favicon-ios-152.png b/images/favicon/favicon-ios-152.png
index 5a293e8e9707b42b75f1dc73aa48cafb745d764b..db6171c883c3a214e59a9d2c31eaeb4400fa0cd4 100644 (file)
Binary files a/images/favicon/favicon-ios-152.png and b/images/favicon/favicon-ios-152.png differ

diff --git a/images/favicon/favicon-ios-57.png b/images/favicon/favicon-ios-57.png
index 167d31036473387889e143523760fdb277543cb7..4e146d26064a4cb1fdd8d7fd529f2fb8b595837e 100644 (file)
Binary files a/images/favicon/favicon-ios-57.png and b/images/favicon/favicon-ios-57.png differ

diff --git a/images/favicon/favicon-ios-72.png b/images/favicon/favicon-ios-72.png
index c1e2d4fb18084d0438c962dd70e85a2c85651d36..5344f01d6cea0bf78c5f209625e2a2a37be27575 100644 (file)
Binary files a/images/favicon/favicon-ios-72.png and b/images/favicon/favicon-ios-72.png differ

diff --git a/images/favicon/favicon-ios-76.png b/images/favicon/favicon-ios-76.png
index 6bfe66ec9e480a63acbd405dc8cbe4e481f4cb3e..8735f6ee7a5411c799e1988fd385881812d8bbc7 100644 (file)
Binary files a/images/favicon/favicon-ios-76.png and b/images/favicon/favicon-ios-76.png differ

diff --git a/images/favicon/favicon.ico b/images/favicon/favicon.ico
index c9b99505eccc812b25464dfd6faff5e8d1569b7d..c254e3ea6ee673cdd8e15a7c5474f50c48a0db55 100644 (file)
Binary files a/images/favicon/favicon.ico and b/images/favicon/favicon.ico differ

diff --git a/images/favicon/favicon.png b/images/favicon/favicon.png
index 74e0ad357fe2f33ab4661055c47183088a336e44..12a97f217de0ee7daf3610abc33c6a5025c40bd8 100644 (file)
Binary files a/images/favicon/favicon.png and b/images/favicon/favicon.png differ