(no commit message)

diff --git a/framework/application/controllers/AjaxController.php b/framework/application/controllers/AjaxController.php
index 7cef6709cf7a4393e0c9df20f2e5c8acc1f46b8c..54805d4fe8c851081c04c4feec16dbf0be3f583f 100644 (file)
--- a/framework/application/controllers/AjaxController.php
+++ b/framework/application/controllers/AjaxController.php
@@ -2,7 +2,11 @@
 
 class AjaxController extends CubeIT_Controller_AjaxController {
 
-
+    public function displayCaseStudies() {
+        $studies = $_GET['studies'];
+        //fb($studies, 'displayCaseStudies');
+        //$this->view->CasestudiesList($this->studies);
+    }
 
 }
 

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
new file mode 100644 (file)
index 0000000..4b0087d
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
@@ -0,0 +1,32 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Casestudies_Content_Bloc extends CubeIT_Form_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $select = new Cubedesigners_Form_Element_ContentType("selected-type");
+        $select->setAttrib('data-name', 'selected-type');
+        $this->addElement($select);
+
+        $titre = new Zend_Form_Element_Text('titre');
+        $titre->setLabel('Titre');
+        $this->addElement($titre);
+
+        $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
+        $texte->setLabel('Texte');
+        $this->addElement($texte);
+
+        $visuel = new CubeIT_Form_Element_File_Image('visuel');
+        $visuel->setLabel('Visuel');
+        $visuel->setMaxItems(1);
+        $this->addElement($visuel);
+
+        $video = new CubeIT_Form_Element_WebVideo('video');
+        $video->setLabel('URL de la vidéo');
+        $this->addElement($video);
+    }
+
+}
+
+?>

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Content/Blocs.php b/framework/application/forms/CMS/Sub/Casestudies/Content/Blocs.php
new file mode 100644 (file)
index 0000000..69c8243
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Casestudies/Content/Blocs.php
@@ -0,0 +1,17 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs extends CubeIT_Form_Multi_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $bloc = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Bloc();
+        $this->setBaseSubForm($bloc);
+        //$this->setBaseLegend('Edition du contenu « $titre »');
+        $this->setBaseLegend('Edition du contenu');
+        $this->setNewLegend('Nouveau contenu');
+    }
+
+}
+
+?>

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studie.php b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
index 7212a386ead72f3c547a4b446e263ab878436b40..d543739c2f5cd545e9a2a682f186f0de7d6e4bf2 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studie.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
@@ -18,6 +18,10 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studie extends CubeIT_Form_SubForm
         $visuel->setMaxItems(1);
         $this->addElement($visuel);
 
+        $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);

diff --git a/framework/application/forms/Element/ContentType.php b/framework/application/forms/Element/ContentType.php
new file mode 100644 (file)
index 0000000..5fc9c81
--- /dev/null
+++ b/framework/application/forms/Element/ContentType.php
@@ -0,0 +1,13 @@
+<?php\r
+\r
+class Cubedesigners_Form_Element_ContentType extends Zend_Form_Element_Select {\r
+\r
+    //public $helper = 'formContentType';\r
+\r
+    public function init() {\r
+        $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));\r
+    }\r
+\r
+}\r
+\r
+?>\r

diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php
index 35025e451b953aa8d8d3c2ff86ab06f0cd0e740c..4a719e0e38f47cd153f9c5e308794af5005d3500 100644 (file)
--- a/framework/application/views/helpers/CasestudiesList.php
+++ b/framework/application/views/helpers/CasestudiesList.php
@@ -23,7 +23,7 @@ class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstrac
 \r
             $image = $this->view->imageProcess($studie['visuel'], $studie['titre'], 300, 225);\r
 \r
-            $res .= '<div class="bloc' . $addClass . '">';\r
+            $res .= '<div class="bloc' . $addClass . '" data-tags="' . $studie["tags"] . '">';\r
             $res .= '<div class="project-photo">' . $image . '</div>';\r
             $res .= '<div class="project-title">' . $studie["titre"] . '</div>';\r
             $res .= '<div class="project-description">' . $studie["description"] . '</div>';\r

diff --git a/js/admin.js b/js/admin.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..54dacd0f61a0bb4753f0ee49191f0038fc4b834c 100644 (file)
--- a/js/admin.js
+++ b/js/admin.js
@@ -0,0 +1,44 @@
+TO_LOAD[TO_LOAD.length] = 'load_admin();';\r
+\r
+function load_admin() {\r
+        initSelectType();\r
+}\r
+\r
+function initSelectType() {\r
+    $( "select[data-name='selected-type']" ).each( function() {\r
+        var cible = $(this).parent().parent();\r
+        displayFormTypeElements( cible, 'text' );\r
+    });\r
+    \r
+    $(document).on("change", "select[data-name='selected-type']", function() {\r
+       var cible = $(this).parent().parent();\r
+       displayFormTypeElements( cible, this.value );\r
+    });\r
+}\r
+\r
+function displayFormTypeElements( cible, choice ) {\r
+    \r
+    switch ( choice ) {\r
+        case 'text' :\r
+            cible.children(".elementwrap-titre").css("display","block");\r
+            cible.children(".elementwrap-texte").css("display","block");\r
+            cible.children(".elementwrap-visuel").css("display","none");\r
+            cible.children(".elementwrap-video").css("display","none");\r
+        break;\r
+            \r
+        case 'visuel' :\r
+            cible.children(".elementwrap-titre").css("display","none");\r
+            cible.children(".elementwrap-texte").css("display","none");\r
+            cible.children(".elementwrap-visuel").css("display","block");\r
+            cible.children(".elementwrap-video").css("display","none");\r
+        break;\r
+        \r
+        case 'video' :\r
+            cible.children(".elementwrap-titre").css("display","none");\r
+            cible.children(".elementwrap-texte").css("display","none");\r
+            cible.children(".elementwrap-visuel").css("display","none");\r
+            cible.children(".elementwrap-video").css("display","block");\r
+        break;\r
+    }\r
+    \r
+}
\ No newline at end of file

diff --git a/js/casestudies.js b/js/casestudies.js
index 2bce166f264676412d5b3ad17e0ab0c4d253453d..1d47c9acdbba50acd6d3791354cb3cd380160d2d 100644 (file)
--- a/js/casestudies.js
+++ b/js/casestudies.js
@@ -27,7 +27,7 @@ function initTagsLink() {
         }\r
         \r
         displayStudies();\r
-        alert(showIds);\r
+        //alert(showIds);\r
     });\r
     \r
 }\r
@@ -38,11 +38,23 @@ function displayStudies() {
         //$(".tag:first").toggleClass('active');\r
     }\r
     \r
-    $.ajax({\r
-               url             : '/ajax/displaystudies',\r
-               dataType        : 'text',\r
-                //data            : JSON.stringify(showIds)\r
-       });\r
+    /*$.ajax({\r
+               url             : '/ajax/displaycasestudies',\r
+               type    : 'GET',\r
+                data: 'studies=' + showIds,\r
+                success: function(){\r
+                   \r
+                }\r
+       });*/\r
+    \r
+    $('#casestudies-list .bloc').each(function(){\r
+        //alert($(this).attr("data-tags"));\r
+        \r
+        var tags = $(this).attr("data-tags").split(',');\r
+       //fb(tags, "Tags a afficher");\r
+        \r
+        \r
+    });\r
     \r
 }\r
 \r

diff --git a/less/casestudies.less b/less/casestudies.less
index f9da4c9ffb65dfc9a2d3a6a50bb61420e25585ef..689846ee9a6bfe5acb6c8459b03919a770360445 100644 (file)
--- a/less/casestudies.less
+++ b/less/casestudies.less
@@ -12,7 +12,7 @@
 #casestudies-tagslist li {
     font-size: 14px;
     color: #6f6f6f;
-    padding: 3px;
+    padding: 3px 6px;
     border-radius: 2px;
     background-color: #ededed;
     margin:0 6px 6px 0;