]> _ Git - cubedesigners-v7.git/commitdiff
(no commit message)
authorbruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 4 Mar 2014 10:42:26 +0000 (10:42 +0000)
committerbruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 4 Mar 2014 10:42:26 +0000 (10:42 +0000)
23 files changed:
framework/application/Bootstrap.php
framework/application/controllers/AjaxController.php
framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
framework/application/forms/CMS/Sub/Casestudies/Studies.php
framework/application/forms/CMS/Sub/Realisations/Realisations.php
framework/application/forms/Categories.php [new file with mode: 0644]
framework/application/forms/Domaines.php [new file with mode: 0644]
framework/application/forms/Element/Categories.php [new file with mode: 0644]
framework/application/forms/Element/ContentType.php
framework/application/forms/Element/Domaines.php [new file with mode: 0644]
framework/application/forms/Element/Tags.php
framework/application/forms/Element/Technologies.php [new file with mode: 0644]
framework/application/forms/Tags.php
framework/application/forms/Technologies.php [new file with mode: 0644]
framework/application/views/helpers/CasestudiesList.php
framework/application/views/helpers/CategoriesList.php [new file with mode: 0644]
framework/application/views/helpers/RealisationsList.php
framework/application/views/scripts/templates/casestudies.phtml
framework/application/views/scripts/templates/realisations.phtml
js/casestudies.js
js/realisations.js
less/admin.less
less/realisations.less

index 3d5cd787e60bac1e65c3f0f7ecb115c9181fd4d9..9ad468d0b3a59e1e7eb4330f8247e4cf36e7d6d6 100644 (file)
 
 class Bootstrap extends CubeIT_Bootstrap {
 
-    protected function _initMinimum() {
-       parent::_initMinimum();
-       // If a project with html display (don't activate by default for web services apps
-       $this->bootstrap('doctype');
-       $this->bootstrap('scripts');
-    }
-
-    protected function _initScripts() {
-       parent::_initScripts();
-       $this->getView()->headLink()->appendStylesheet('/css/fonts/fonts.css');
-       $this->getView()->headScript()->addTagHandler();
-    }
-
-    protected function _initRouter($initCms = true) {
-       $router = parent::_initRouter($initCms);
-       return $router;
-    }
-
-    /**
-     *
-     * @param \Doctrine\DBAL\Schema\Schema  $schema
-     * @param array $options
-     */
-    protected function _defineSchema(&$schema, $options) {
-       parent::_defineSchema($schema, $options);
-
-       $user = $schema->createTable('user');
-       $user->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
-       $user->setPrimaryKey(array('id'));
-       $user->addColumn('username', 'string', array('length' => 64));
-       $user->addUniqueIndex(array('username'));
-       $user->addColumn('password', 'string', array('length' => 255));
-       $user->addColumn('role', 'string', array('length' => 32));
-
-       $tags = $schema->createTable('tags');
-       $tags->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
-       $tags->setPrimaryKey(array('id'));
-       $tags->addColumn('name', 'string', array('length' => 64));
-
-       $casestudies = $schema->createTable('casestudies');
-       $casestudies->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
-       $casestudies->setPrimaryKey(array('id'));
-       $casestudies->addColumn('online', 'boolean');
-       $casestudies->addColumn('titre', 'text');
-       $casestudies->addColumn('description', 'text');
-       $casestudies->addColumn('url', 'text');
-       $casestudies->addColumn('visuel', 'string', array('length' => 128));
-       $casestudies->addColumn('visuel_detail', 'string', array('length' => 128));
-       $casestudies->addColumn('legende', 'text');
-       $casestudies->addColumn('couleur', 'text');
-       $casestudies->addColumn('blocs', 'text');
-       $casestudies->addColumn('tags', 'text');
-
-
-       $realisations = $schema->createTable('realisations');
-       $realisations->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
-       $realisations->setPrimaryKey(array('id'));
-       $realisations->addColumn('online', 'boolean');
-       $realisations->addColumn('titre', 'text');
-       $realisations->addColumn('legende', 'text');
-       $realisations->addColumn('agence', 'text');
-       $realisations->addColumn('description', 'text');
-       $realisations->addColumn('url', 'text');
-       $realisations->addColumn('visuel', 'string', array('length' => 128));
-       $realisations->addColumn('visuel_detail', 'text');
-       $realisations->addColumn('tags', 'text');
-    }
-
-    protected function _initAcl() {
-       $acl = parent::_initAcl();
-       return $acl;
-    }
-
-    protected function _makeNavigationOnePage(&$navigation, $r, $t, $isAdmin, $locale = false) {
-       $page = parent::_makeNavigationOnePage($navigation, $r, $t, $isAdmin, $locale);
-
-       if (!$page) {
-           return;
-       }
-
-       if ($page->getTemplate() == 'casestudies') {
-           $this->addStudiesPages($page, $locale);
-       }
-
-       if ($page->getTemplate() == 'realisations') {
-           $this->addRealisationsPages($page, $locale);
-       }
-    }
-
-    /**
-     *
-     * @param CubeIT_Navigation_Page_Locale $page
-     */
-    protected function addRealisationsPages($page, $locale) {
-
-       $datas = $this->getCMSDatasOfNavigationPage($page);
-       $db = Zend_Db_Table::getDefaultAdapter();
-       $s = $db->select()->from('realisations')
-               ->order('id ASC');
-       $q = $s->query();
-
-       while ($r = $q->fetch()) {
-           $r = CubeIT_Util_Cms::unserialize($r, $locale);
-           if ($r->titre == '') {
-               continue;
-           }
-           $p = new CubeIT_Navigation_Page_Locale();
-           $p->setController('Realisations');
-           $p->setId($page->getId() . '/' . $r->id);
-           $p->setAutoUri($r, $datas['seourl_rea'], $page->getLocale());
-           $p->setSitemap(true);
-           $p->setEditable(false);
-
-           if ($r->online != 1)
-               $p->setOnline(false);
-
-           $p->setDomain($page->getDomain());
-           $p->setLabel($r->titre);
-           $p->setParams(array('realisation_id' => $r->id));
-           $page->addPage($p);
-       }
-    }
-
-    /**
-     *
-     * @param CubeIT_Navigation_Page_Locale $page
-     */
-    protected function addStudiesPages($page, $locale) {
-       $datas = $this->getCMSDatasOfNavigationPage($page);
-       $db = Zend_Db_Table::getDefaultAdapter();
-       $s = $db->select()->from('casestudies')
-               ->order('id ASC');
-       $q = $s->query();
-
-       while ($r = $q->fetch()) {
-           $r = CubeIT_Util_Cms::unserialize($r, $locale);
-           if ($r->titre == '') {
-               continue;
-           }
-           $p = new CubeIT_Navigation_Page_Locale();
-           $p->setController('Studies');
-           $p->setId($page->getId() . '/' . $r->id);
-           $p->setAutoUri($r, $datas['seourl_stu'], $page->getLocale());
-           $p->setSitemap(true);
-           $p->setEditable(false);
-           $p->setParams(array('casestudy_id' => $r->id));
-
-           if ($r->online != 1)
-               $p->setOnline(false);
-
-           $p->setDomain($page->getDomain());
-           $p->setLabel($r->titre);
-           $page->addPage($p);
-       }
-    }
-
-    /**
-     *
-     * @return array
-     */
-    public function getCMSTemplates() {
-
-       $templates = parent::getCMSTemplates();
-
-       $templates['Agence'] = array("agence" => "L'agence");
-       $templates['Realisations'] = array('realisations' => 'Réalisations');
-       $templates['Casestudies'] = array('casestudies' => 'Case-Studies');
-       $templates['CasestudiesDetail'] = array('casestudies_detail' => 'Case-Studies (détail)');
-       $templates['Expertises'] = array('expertises' => 'Expertises');
-       $templates['Contact'] = array('contact' => 'Contact');
-       $templates['Mentions'] = array('mentions' => 'Mentions légales');
-
-       return $templates;
-    }
-
-    public function run() {
-       // run have to be the last call of bootstrap
-       parent::run();
-    }
-
-    function __destroy() {
-       endProfile();
-    }
+        protected function _initMinimum() {
+                parent::_initMinimum();
+                // If a project with html display (don't activate by default for web services apps
+                $this->bootstrap('doctype');
+                $this->bootstrap('scripts');
+        }
+
+        protected function _initScripts() {
+                parent::_initScripts();
+                $this->getView()->headLink()->appendStylesheet('/css/fonts/fonts.css');
+                $this->getView()->headScript()->addTagHandler();
+        }
+
+        protected function _initRouter($initCms = true) {
+                $router = parent::_initRouter($initCms);
+                return $router;
+        }
+
+        /**
+         *
+         * @param \Doctrine\DBAL\Schema\Schema  $schema
+         * @param array $options
+         */
+        protected function _defineSchema(&$schema, $options) {
+                parent::_defineSchema($schema, $options);
+
+                // Users
+                $user = $schema->createTable('user');
+                $user->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $user->setPrimaryKey(array('id'));
+                $user->addColumn('username', 'string', array('length' => 64));
+                $user->addUniqueIndex(array('username'));
+                $user->addColumn('password', 'string', array('length' => 255));
+                $user->addColumn('role', 'string', array('length' => 32));
+
+                // Categories
+                $categories = $schema->createTable('categories');
+                $categories->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $categories->setPrimaryKey(array('id'));
+                $categories->addColumn('name', 'string', array('length' => 64));
+
+                // Domaines
+                $tags = $schema->createTable('domaines');
+                $tags->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $tags->setPrimaryKey(array('id'));
+                $tags->addColumn('name', 'string', array('length' => 64));
+
+                // Technologies
+                $tags = $schema->createTable('technologies');
+                $tags->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $tags->setPrimaryKey(array('id'));
+                $tags->addColumn('name', 'string', array('length' => 64));
+
+                // Tags
+                $tags = $schema->createTable('tags');
+                $tags->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $tags->setPrimaryKey(array('id'));
+                $tags->addColumn('name', 'string', array('length' => 64));
+
+                // Casestudies
+                $casestudies = $schema->createTable('casestudies');
+                $casestudies->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $casestudies->setPrimaryKey(array('id'));
+                $casestudies->addColumn('titre', 'text');
+                $casestudies->addColumn('description', 'text');
+                $casestudies->addColumn('url', 'text');
+                $casestudies->addColumn('visuel', 'string', array('length' => 128));
+                $casestudies->addColumn('visuel_detail', 'string', array('length' => 128));
+                $casestudies->addColumn('legende', 'text');
+                $casestudies->addColumn('couleur', 'text');
+                $casestudies->addColumn('blocs', 'text');
+                $casestudies->addColumn('categories', 'text');
+                $casestudies->addColumn('domaines', 'text');
+                $casestudies->addColumn('technologies', 'text');
+                $casestudies->addColumn('tags_secondaires', 'text');
+                $casestudies->addColumn('online', 'boolean');
+                $casestudies->addColumn('annee', 'text');
+
+                // Réalisations
+                $realisations = $schema->createTable('realisations');
+                $realisations->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+                $realisations->setPrimaryKey(array('id'));
+                $realisations->addColumn('titre', 'text');
+                $realisations->addColumn('legende', 'text');
+                $realisations->addColumn('agence', 'text');
+                $realisations->addColumn('description', 'text');
+                $realisations->addColumn('url', 'text');
+                $realisations->addColumn('visuel', 'string', array('length' => 128));
+                $realisations->addColumn('visuel_detail', 'text');
+                $realisations->addColumn('categories', 'text');
+                $realisations->addColumn('domaines', 'text');
+                $realisations->addColumn('technologies', 'text');
+                $realisations->addColumn('tags_secondaires', 'text');
+                $realisations->addColumn('online', 'boolean');
+                $realisations->addColumn('annee', 'text');
+        }
+
+        protected function _initAcl() {
+                $acl = parent::_initAcl();
+                return $acl;
+        }
+
+        protected function _makeNavigationOnePage(&$navigation, $r, $t, $isAdmin, $locale = false) {
+                $page = parent::_makeNavigationOnePage($navigation, $r, $t, $isAdmin, $locale);
+
+                if (!$page) {
+                        return;
+                }
+
+                if ($page->getTemplate() == 'casestudies') {
+                        $this->addStudiesPages($page, $locale);
+                }
+
+                if ($page->getTemplate() == 'realisations') {
+                        $this->addRealisationsPages($page, $locale);
+                }
+        }
+
+        /**
+         *
+         * @param CubeIT_Navigation_Page_Locale $page
+         */
+        protected function addRealisationsPages($page, $locale) {
+
+                $datas = $this->getCMSDatasOfNavigationPage($page);
+                $db = Zend_Db_Table::getDefaultAdapter();
+                $s = $db->select()->from('realisations')
+                        ->order('id ASC');
+                $q = $s->query();
+
+                while ($r = $q->fetch()) {
+                        $r = CubeIT_Util_Cms::unserialize($r, $locale);
+                        if ($r->titre == '') {
+                                continue;
+                        }
+                        $p = new CubeIT_Navigation_Page_Locale();
+                        $p->setController('Realisations');
+                        $p->setId($page->getId() . '/' . $r->id);
+                        $p->setAutoUri($r, $datas['seourl_rea'], $page->getLocale());
+                        $p->setSitemap(true);
+                        $p->setEditable(false);
+
+                        if ($r->online != 1)
+                                $p->setOnline(false);
+
+                        $p->setDomain($page->getDomain());
+                        $p->setLabel($r->titre);
+                        $p->setParams(array('realisation_id' => $r->id));
+                        $page->addPage($p);
+                }
+        }
+
+        /**
+         *
+         * @param CubeIT_Navigation_Page_Locale $page
+         */
+        protected function addStudiesPages($page, $locale) {
+                $datas = $this->getCMSDatasOfNavigationPage($page);
+                $db = Zend_Db_Table::getDefaultAdapter();
+                $s = $db->select()->from('casestudies')
+                        ->order('id ASC');
+                $q = $s->query();
+
+                while ($r = $q->fetch()) {
+                        $r = CubeIT_Util_Cms::unserialize($r, $locale);
+                        if ($r->titre == '') {
+                                continue;
+                        }
+                        $p = new CubeIT_Navigation_Page_Locale();
+                        $p->setController('Studies');
+                        $p->setId($page->getId() . '/' . $r->id);
+                        $p->setAutoUri($r, $datas['seourl_stu'], $page->getLocale());
+                        $p->setSitemap(true);
+                        $p->setEditable(false);
+                        $p->setParams(array('casestudy_id' => $r->id));
+
+                        if ($r->online != 1)
+                                $p->setOnline(false);
+
+                        $p->setDomain($page->getDomain());
+                        $p->setLabel($r->titre);
+                        $page->addPage($p);
+                }
+        }
+
+        /**
+         *
+         * @return array
+         */
+        public function getCMSTemplates() {
+
+                $templates = parent::getCMSTemplates();
+
+                $templates['Agence'] = array("agence" => "L'agence");
+                $templates['Realisations'] = array('realisations' => 'Réalisations');
+                $templates['Casestudies'] = array('casestudies' => 'Case-Studies');
+                $templates['CasestudiesDetail'] = array('casestudies_detail' => 'Case-Studies (détail)');
+                $templates['Expertises'] = array('expertises' => 'Expertises');
+                $templates['Contact'] = array('contact' => 'Contact');
+                $templates['Mentions'] = array('mentions' => 'Mentions légales');
+
+                return $templates;
+        }
+
+        public function run() {
+                // run have to be the last call of bootstrap
+                parent::run();
+        }
+
+        function __destroy() {
+                endProfile();
+        }
 
 }
index e6f525481666796c2ae7b1fc23b5ac4bf5ff64f8..cbd563601941b9f89a01746df7e76e36181797f6 100644 (file)
@@ -2,35 +2,45 @@
 
 class AjaxController extends CubeIT_Controller_AjaxController {
 
-    public function displayCaseStudies() {
-       $studies = $_GET['studies'];
-       //fb($studies, 'displayCaseStudies');
-       //$this->view->CasestudiesList($this->studies);
-    }
+        public function displayCaseStudies() {
+                $studies = $_GET['studies'];
+        }
 
-    public function displayRealisation() {
-       $rea_id = $_GET['realisation_id'];
-       //fb($rea_id, 'Realisation id ');
+        public function displayRealisation() {
+                $rea_id = $_GET['realisation_id'];
 
-       $db = $this->getDb();
-       $s = $db->select()->from('realisations')
-               ->order('id ASC');
-       $s->where('id = ?', $rea_id);
+                $db = $this->getDb();
+                $s = $db->select()->from('realisations')
+                        ->order('id ASC');
+                $s->where('id = ?', $rea_id);
 
-       $q = $s->query();
-       $r = $q->fetch();
+                $q = $s->query();
+                $r = $q->fetch();
 
-       $r = CubeIT_Util_Cms::unserialize($r);
+                $r = CubeIT_Util_Cms::unserialize($r);
 
-       for ($i = 0; $i < count($r->visuel_detail); $i++) {
-           $image_url = $this->view->imageProcess()->imageProcessGetUrl($r->visuel_detail[$i], '', null, 440);
-           $r->visuel_detail[$i] = $image_url;
-       }
+                for ($i = 0; $i < count($r->visuel_detail); $i++) {
+                        $image_url = $this->view->imageProcess()->imageProcessGetUrl($r->visuel_detail[$i], '', null, 440);
+                        $r->visuel_detail[$i] = $image_url;
+                }
 
-       $r->description = $this->view->markupDotclear($r->description);
+                $db = Zend_Db_Table::getDefaultAdapter();
+                $s_tags = $db->select()->from('tags')
+                        ->order('name ASC');
+                $q_tags = $s_tags->query();
 
-       $this->_datas->addVariable("rea", $r);
-    }
+                $litteralTags = array();
+                while ($r_tags = $q_tags->fetch()) {
+                        if (in_array($r_tags->id, $r->tags_secondaires)) {
+                                array_push($litteralTags, $r_tags->name);
+                        }
+                }
+                $r->tags_secondaires = $litteralTags;
+
+                $r->description = $this->view->markupDotclear($r->description);
+
+                $this->_datas->addVariable("rea", $r);
+        }
 
 }
 
index dfa2fab1140e4c1cd2df4f7b92ffa883537332b2..a73f07743c1a2112cd90f86af162676af7dd054a 100644 (file)
@@ -2,55 +2,59 @@
 
 class Cubedesigners_Form_CMS_Sub_Casestudies_Content_Bloc extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
-
-        $isCompactTrad = false;
-
-        $select = new Cubedesigners_Form_Element_ContentType("selected-type");
-        $select->setAttrib('data-name', 'selected-type');
-        $this->addElement($select);
-
-        $margin = new Zend_Form_Element_Text('margin');
-        $margin->setLabel("Décalage vertical du bloc (en pixels)");
-        $this->addElement($margin);
-
-        $zindex = new Zend_Form_Element_Select('zindex');
-        $options = array('default' => 'Par défaut');
-        for ($i = 1; $i <= 10; $i++) {
-            $options[$i] = $i;
+        public function init() {
+                parent::init();
+
+                $isCompactTrad = false;
+
+                $select = new Cubedesigners_Form_Element_ContentType("selected-type");
+                $select->setAttrib('data-name', 'selected-type');
+                $this->addElement($select);
+
+                $margin = new Zend_Form_Element_Text('margin');
+                $margin->setLabel("Décalage vertical du bloc (en pixels)");
+                $this->addElement($margin);
+
+                $zindex = new Zend_Form_Element_Select('zindex');
+                $options = array('default' => 'Par défaut');
+                for ($i = 1; $i <= 10; $i++) {
+                        $options[$i] = $i;
+                }
+                $zindex->setMultiOptions($options);
+                $zindex->setLabel('z-index du bloc');
+                $this->addElement($zindex);
+
+                $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);
+
+                $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
+                $texte->setLabel('Texte');
+                $this->addElementLocalized($texte, $isCompactTrad);
+
+                $visuel = new CubeIT_Form_Element_File_Image('visuel');
+                $visuel->setLabel('Visuel');
+                $visuel->setMaxItems(1);
+                $this->addElementLocalized($visuel, $isCompactTrad);
+
+                $video = new CubeIT_Form_Element_WebVideo('video');
+                $video->setLabel('URL de la vidéo');
+                $this->addElementLocalized($video, $isCompactTrad);
+
+                $video_background = new CubeIT_Form_Element_File_Image('video_background');
+                $video_background->setLabel('Fond de la vidéo');
+                $video_background->setMaxItems(1);
+                $this->addElement($video_background);
+
+                $type = new Zend_Form_Element_Hidden('form-type');
+                $type->setAttrib('data-name', 'form-type');
+                $type->setValue('test');
+                $this->addElement($type);
         }
-        $zindex->setMultiOptions($options);
-        $zindex->setLabel('z-index du bloc');
-        $this->addElement($zindex);
-
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre');
-        $this->addElementLocalized($titre, $isCompactTrad);
-
-        $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
-        $texte->setLabel('Texte');
-        $this->addElementLocalized($texte, $isCompactTrad);
-
-        $visuel = new CubeIT_Form_Element_File_Image('visuel');
-        $visuel->setLabel('Visuel');
-        $visuel->setMaxItems(1);
-        $this->addElementLocalized($visuel, $isCompactTrad);
-
-        $video = new CubeIT_Form_Element_WebVideo('video');
-        $video->setLabel('URL de la vidéo');
-        $this->addElementLocalized($video, $isCompactTrad);
-
-        $video_background = new CubeIT_Form_Element_File_Image('video_background');
-        $video_background->setLabel('Fond de la vidéo');
-        $video_background->setMaxItems(1);
-        $this->addElement($video_background);
-
-        $type = new Zend_Form_Element_Hidden('form-type');
-        $type->setAttrib('data-name', 'form-type');
-        $type->setValue('test');
-        $this->addElement($type);
-    }
 
 }
 
index cd869078e9b65b2ca3b716fcabe194b63c37f9cb..028e2a716becad7e7d385e606b09f056abfcfa27 100644 (file)
@@ -2,67 +2,83 @@
 
 class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
 
-    public function init() {
-        parent::init();
+        public function init() {
+                parent::init();
 
-        $isCompactTrad = false;
+                $isCompactTrad = false;
 
-        $id = new CubeIT_Form_Element_Id();
-        $this->addElement($id);
+                $id = new CubeIT_Form_Element_Id();
+                $this->addElement($id);
 
-        $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->addElementLocalized($titre, $isCompactTrad);
+                $annee = new Zend_Form_Element_Text('annee');
+                $annee->setLabel('Année');
+                $this->addElement($annee);
 
-        $description = new Zend_Form_Element_Text('description');
-        $description->setLabel('Description');
-        $this->addElementLocalized($description, $isCompactTrad);
+                $titre = new Zend_Form_Element_Text('titre');
+                $titre->setLabel('Titre');
+                $this->addElementLocalized($titre, $isCompactTrad);
 
-        $url = new CubeIT_Form_Element_Url('url');
-        $url->setLabel('URL du site');
-        $this->addElementLocalized($url, $isCompactTrad);
+                $description = new Zend_Form_Element_Text('description');
+                $description->setLabel('Description');
+                $this->addElementLocalized($description, $isCompactTrad);
 
-        $visuel = new CubeIT_Form_Element_File_Image('visuel');
-        $visuel->setLabel('Visuel de la page Case Studies');
-        $visuel->setMaxItems(1);
-        $this->addElementLocalized($visuel, $isCompactTrad);
+                $url = new CubeIT_Form_Element_Url('url');
+                $url->setLabel('URL du site');
+                $this->addElementLocalized($url, $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);
+                $visuel = new CubeIT_Form_Element_File_Image('visuel');
+                $visuel->setLabel('Visuel de la page Case Studies');
+                $visuel->setMaxItems(1);
+                $this->addElementLocalized($visuel, $isCompactTrad);
 
-        $legende = new Zend_Form_Element_Text('legende');
-        $legende->setLabel('Legende du visuel');
-        $this->addElementLocalized($legende, $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);
 
-        $color = new Zend_Form_Element_Text('couleur');
-        $color->setLabel('Code couleur de la zone de contenu');
-        $this->addElement($color);
+                $legende = new Zend_Form_Element_Text('legende');
+                $legende->setLabel('Legende du visuel');
+                $this->addElementLocalized($legende, $isCompactTrad);
 
-        $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
-        $blocs->setLegend('Contenu');
-        $this->addSubForm($blocs, 'blocs');
+                $color = new Zend_Form_Element_Text('couleur');
+                $color->setLabel('Code couleur de la zone de contenu');
+                $this->addElement($color);
 
-        $tags = new Cubedesigners_Form_Element_Tags('tags');
-        $tags->setLabel('Tags');
-        $this->addElement($tags);
+                $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);
 
-        $bootstrap = Bootstrap::getInstance();
-        $view = $bootstrap->getView();
+                $tags = new Cubedesigners_Form_Element_Tags('tags_secondaires');
+                $tags->setLabel('Tags secondaires');
+                $this->addElement($tags);
 
-        $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');
-    }
+                $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');
+        }
 
 }
 
index 134b6e8664486d20fe967e15361baefd78c8642d..8862a72b7a2552f1fce45355829a17ef6dc6d597 100644 (file)
@@ -2,61 +2,77 @@
 
 class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List {
 
-    public function init() {
-       parent::init();
+        public function init() {
+                parent::init();
 
-       $isCompactTrad = false;
+                $isCompactTrad = false;
 
-       $id = new CubeIT_Form_Element_Id();
-       $this->addElement($id);
+                $id = new CubeIT_Form_Element_Id();
+                $this->addElement($id);
 
-       $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->addElementLocalized($titre, $isCompactTrad);
+                $annee = new Zend_Form_Element_Text('annee');
+                $annee->setLabel('Année');
+                $this->addElement($annee);
 
-       $legende = new Zend_Form_Element_Text('legende');
-       $legende->setLabel('Legende');
-       $this->addElementLocalized($legende, $isCompactTrad);
+                $titre = new Zend_Form_Element_Text('titre');
+                $titre->setLabel('Titre');
+                $this->addElementLocalized($titre, $isCompactTrad);
 
-       $agence = new Zend_Form_Element_Text('agence');
-       $agence->setLabel('Agence');
-       $this->addElementLocalized($agence, $isCompactTrad);
+                $legende = new Zend_Form_Element_Text('legende');
+                $legende->setLabel('Legende');
+                $this->addElementLocalized($legende, $isCompactTrad);
 
-       $description = new CubeIT_Form_Element_Markitup_Basic('description');
-       $description->setLabel('Description');
-       $this->addElementLocalized($description, $isCompactTrad);
+                $agence = new Zend_Form_Element_Text('agence');
+                $agence->setLabel('Agence');
+                $this->addElementLocalized($agence, $isCompactTrad);
 
-       $url = new CubeIT_Form_Element_Url('url');
-       $url->setLabel('URL du site');
-       $this->addElementLocalized($url, $isCompactTrad);
+                $description = new CubeIT_Form_Element_Markitup_Basic('description');
+                $description->setLabel('Description');
+                $this->addElementLocalized($description, $isCompactTrad);
 
-       $visuel = new CubeIT_Form_Element_File_Image('visuel');
-       $visuel->setLabel('Visuel principal');
-       $visuel->setMaxItems(1);
-       $this->addElementLocalized($visuel, $isCompactTrad);
+                $url = new CubeIT_Form_Element_Url('url');
+                $url->setLabel('URL du site');
+                $this->addElementLocalized($url, $isCompactTrad);
 
-       $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
-       $visuel_detail->setLabel('Visuels du détail');
-       $this->addElementLocalized($visuel_detail, $isCompactTrad);
+                $visuel = new CubeIT_Form_Element_File_Image('visuel');
+                $visuel->setLabel('Visuel principal');
+                $visuel->setMaxItems(1);
+                $this->addElementLocalized($visuel, $isCompactTrad);
 
-       $tags = new Cubedesigners_Form_Element_Tags('tags');
-       $tags->setLabel('Tags');
-       $this->addElement($tags);
+                $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
+                $visuel_detail->setLabel('Visuels du détail');
+                $this->addElementLocalized($visuel_detail, $isCompactTrad);
 
-       $bootstrap = Bootstrap::getInstance();
-       $view = $bootstrap->getView();
+                $categories = new Cubedesigners_Form_Element_Categories('categories');
+                $categories->setLabel('Catégories');
+                $this->addElement($categories);
 
-       $this->setListTitle('Réalisations')
-               ->setNewTitle('Créer une réalisation')
-               ->setEditTitle('Edition de la réalisation « $titre »')
-               ->setBaseTable('realisations')
-               ->setIdColumn('id')
-               ->setTitleColumn('titre');
-    }
+                $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');
+        }
 
 }
 
diff --git a/framework/application/forms/Categories.php b/framework/application/forms/Categories.php
new file mode 100644 (file)
index 0000000..6c95605
--- /dev/null
@@ -0,0 +1,26 @@
+<?php\r
+\r
+class Cubedesigners_Form_Categories 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(__('Categories'))\r
+                        ->setNewTitle(__('Créer une catégorie'))\r
+                        ->setEditTitle(sprintf(__("Edition de la catégorie « %s »"), '$name'))\r
+                        ->setBaseTable('categories')\r
+                        ->setIdColumn('id')\r
+                        ->setTitleColumn('name');\r
+        }\r
+\r
+}\r
+\r
+?>\r
diff --git a/framework/application/forms/Domaines.php b/framework/application/forms/Domaines.php
new file mode 100644 (file)
index 0000000..24ccfdb
--- /dev/null
@@ -0,0 +1,26 @@
+<?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
diff --git a/framework/application/forms/Element/Categories.php b/framework/application/forms/Element/Categories.php
new file mode 100644 (file)
index 0000000..cb640a8
--- /dev/null
@@ -0,0 +1,10 @@
+<?php\r
+\r
+class Cubedesigners_Form_Element_Categories extends CubeIT_Form_Element_SelectList {\r
+\r
+        public function init() {\r
+                $this->setBaseForm('Cubedesigners_Form_Categories');\r
+        }\r
+\r
+}\r
+?>\r
index 9925b3c01d58f970b3d909a5e306b281dab308f1..1fe097deeac918af327e7343fe3cc2c63e66e8f7 100644 (file)
@@ -2,12 +2,12 @@
 \r
 class Cubedesigners_Form_Element_ContentType extends Zend_Form_Element_Select {\r
 \r
-    //public $helper = 'formContentType';\r
+        //public $helper = 'formContentType';\r
 \r
-    public function init() {\r
-        parent::init();\r
-        $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));\r
-    }\r
+        public function init() {\r
+                parent::init();\r
+                $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));\r
+        }\r
 \r
 }\r
 \r
diff --git a/framework/application/forms/Element/Domaines.php b/framework/application/forms/Element/Domaines.php
new file mode 100644 (file)
index 0000000..acecc73
--- /dev/null
@@ -0,0 +1,11 @@
+<?php\r
+\r
+class Cubedesigners_Form_Element_Domaines extends CubeIT_Form_Element_SelectList {\r
+\r
+        public function init() {\r
+                $this->setBaseForm('Cubedesigners_Form_Domaines');\r
+        }\r
+\r
+}\r
+\r
+?>\r
index db7310451c1b6a0a85b8cd15223313680a08f294..69d506e2f2a48a2b4d7d9078d621c7dc4e92143a 100644 (file)
@@ -1,10 +1,10 @@
 <?php\r
 \r
-class Cubedesigners_Form_Element_Tags extends CubeIT_Form_Element_TagList {\r
+class Cubedesigners_Form_Element_Tags extends CubeIT_Form_Element_MultiCheckbox {\r
 \r
-    public function init() {\r
-        $this->setBaseForm('Cubedesigners_Form_Tags');\r
-    }\r
+        public function init() {\r
+                $this->setBaseForm('Cubedesigners_Form_Tags');\r
+        }\r
 \r
 }\r
 \r
diff --git a/framework/application/forms/Element/Technologies.php b/framework/application/forms/Element/Technologies.php
new file mode 100644 (file)
index 0000000..139080d
--- /dev/null
@@ -0,0 +1,11 @@
+<?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
index b4c0087629c383e21b8e18c76e987f8a90c8b6af..4909a277cfefc07ba0f9de5b961f4d0727562299 100644 (file)
@@ -2,58 +2,24 @@
 \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
-    public function saveInDatabase() {\r
-        $id = parent::saveInDatabase();\r
-        /*\r
-          $db = Bootstrap::getInstance()->getDb();\r
-          $us = $this->getElement('users');\r
-          if (!is_null($us)) {\r
-          $e = explode(',', $us->getValue());\r
-          // Delete all settings of this user\r
-          $db->delete('cubeit_group_content', $db->quoteInto('group_id = ?', $id));\r
-          $binds = array();\r
-          foreach ($e as $user) {\r
-          $binds[] = array('group_id' => $id, 'user_id' => $user);\r
-          }\r
-\r
-          $db->insertMultiple('cubeit_group_content', $binds);\r
-          } */\r
-        return $id;\r
-    }\r
-\r
-    public function setValuesWithId($id) {\r
-        parent::setValuesWithId($id);\r
-        /* $db = Bootstrap::getInstance()->getDb();\r
-          $all = $db->select()\r
-          ->from('cubeit_group_content')\r
-          ->where('group_id = ?', $id)\r
-          ->query()\r
-          ->fetchAll(Zend_Db::FETCH_ASSOC);\r
-          $users = array();\r
-          foreach ($all as $r) {\r
-          $users[] = $r['user_id'];\r
-          }\r
-          $this->setDefault('users', implode(',', $users)); */\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
diff --git a/framework/application/forms/Technologies.php b/framework/application/forms/Technologies.php
new file mode 100644 (file)
index 0000000..f163f35
--- /dev/null
@@ -0,0 +1,26 @@
+<?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
index 2c80a85b1b334c93a9134e1cdae937a2b93b7772..f62b603df86b45d81ac931faa6292f9a8251e292 100644 (file)
@@ -2,65 +2,58 @@
 \r
 class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstract {\r
 \r
-    public function CasestudiesList($datas) {\r
+        public function CasestudiesList($datas) {\r
 \r
-       $acl = Bootstrap::getInstance()->isAllowed("edition");\r
+                $acl = Bootstrap::getInstance()->isAllowed("edition");\r
 \r
 \r
+                $db = Zend_Db_Table::getDefaultAdapter();\r
+                $s = $db->select()->from('casestudies')\r
+                        ->order('id ASC');\r
 \r
-       $db = Zend_Db_Table::getDefaultAdapter();\r
-       $s = $db->select()->from('casestudies')\r
-               ->order('id ASC');\r
 \r
+                if (!$acl) {\r
+                        $s->where('online = ?', 1);\r
+                }\r
 \r
-       if (!$acl) {\r
-           $s->where('online = ?', 1);\r
-       }\r
+                $q = $s->query();\r
 \r
-       $q = $s->query();\r
+                $count = 1;\r
 \r
-       $count = 1;\r
+                $res = '';\r
 \r
+                while ($r = $q->fetch()) {\r
 \r
-       $res = '';\r
+                        $r = CubeIT_Util_Cms::unserialize($r);\r
 \r
-       while ($r = $q->fetch()) {\r
+                        $addSpacer = false;\r
 \r
-           $r = CubeIT_Util_Cms::unserialize($r);\r
+                        if ($count == 3) {\r
+                                $count = 1;\r
+                                $addClass = '';\r
+                        } else {\r
+                                $addClass = ' blocmargin';\r
+                                $count++;\r
+                        }\r
 \r
-           $addSpacer = false;\r
+                        $addOffline = '';\r
+                        if ($acl && $r->online == 0) {\r
+                                $addOffline = 'data-offline="1"';\r
+                        }\r
 \r
-           if ($count == 3) {\r
-               $count = 1;\r
-               $addClass = '';\r
-               //   $addSpacer = true;\r
-           } else {\r
-               $addClass = ' blocmargin';\r
-               $count++;\r
-           }\r
+                        $image = $this->view->imageProcess($r->visuel, $r->titre, 300, 225);\r
+                        $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_stu']);\r
+                        $res .= '<a href="' . $url . '">';\r
+                        $res .= '<div class="bloc' . $addClass . '" data-categories="' . $r->categories . '">';\r
+                        $res .= '<div class="project-photo">' . $image . '</div>';\r
+                        $res .= '<div ' . $addOffline . ' class="project-title">' . $r->titre . '</div>';\r
+                        $res .= '<div ' . $addOffline . ' class="project-description">' . $r->description . '</div>';\r
+                        $res .= '</div>';\r
+                        $res .= '</a>';\r
+                }\r
 \r
-           $addOffline = '';\r
-           if ($acl && $r->online == 0) {\r
-               $addOffline = 'data-offline="1"';\r
-           }\r
-\r
-           $image = $this->view->imageProcess($r->visuel, $r->titre, 300, 225);\r
-           $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_stu']);\r
-           $res .= '<a href="' . $url . '">';\r
-           $res .= '<div class="bloc' . $addClass . '" data-tags="' . $r->tags . '">';\r
-           $res .= '<div class="project-photo">' . $image . '</div>';\r
-           $res .= '<div ' . $addOffline . ' class="project-title">' . $r->titre . '</div>';\r
-           $res .= '<div ' . $addOffline . ' class="project-description">' . $r->description . '</div>';\r
-           $res .= '</div>';\r
-           $res .= '</a>';\r
-\r
-           // if ($addSpacer) {\r
-           //    $res .= '<div class="spacer"></div>';\r
-           // }\r
-       }\r
-\r
-       return $res;\r
-    }\r
+                return $res;\r
+        }\r
 \r
 }\r
 \r
diff --git a/framework/application/views/helpers/CategoriesList.php b/framework/application/views/helpers/CategoriesList.php
new file mode 100644 (file)
index 0000000..7b2bd09
--- /dev/null
@@ -0,0 +1,49 @@
+<?php\r
+\r
+class Cubedesigners_View_Helper_CategoriesList extends Zend_View_Helper_Abstract {\r
+\r
+        public function CategoriesList($rubrique) {\r
+\r
+                $acl = Bootstrap::getInstance()->isAllowed("edition");\r
+\r
+                $categorieslist = Array();\r
+\r
+                $db0 = Zend_Db_Table::getDefaultAdapter();\r
+                $s0 = $db0->select()->from($rubrique)\r
+                        ->order('id ASC');\r
+\r
+                if (!$acl) {\r
+                        $s0->where('online = ?', 1);\r
+                }\r
+\r
+                $q0 = $s0->query();\r
+\r
+                while ($r0 = $q0->fetch()) {\r
+\r
+                        if (!in_array($r0->categories, $categorieslist)) {\r
+                                array_push($categorieslist, $r0->categories);\r
+                        }\r
+                }\r
+\r
+                $db = Zend_Db_Table::getDefaultAdapter();\r
+                $s = $db->select()->from('categories')\r
+                        ->order('name ASC');\r
+                $q = $s->query();\r
+\r
+                $res = '<ul class="taglist">';\r
+                $res .= '<li class="tag active" data-id="0">' . __('TOUT VOIR') . '</li>';\r
+\r
+                while ($r = $q->fetch()) {\r
+                        if (in_array($r->id, $categorieslist)) {\r
+\r
+                                $res .= '<li class="tag" ' . $addOffline . ' data-id="' . $r->id . '">' . $r->name . '</li>';\r
+                        }\r
+                }\r
+\r
+                $res.='</ul>';\r
+                return $res;\r
+        }\r
+\r
+}\r
+\r
+?>\r
index d8fe433e3d86d7cd8206e849835a82fbcd32cff5..42e9fad5c5869ca41980dade9f8700feb04564a8 100644 (file)
@@ -26,15 +26,6 @@ class Cubedesigners_View_Helper_RealisationsList extends Zend_View_Helper_Abstra
 \r
                         $addSpacer = false;\r
 \r
-                        /* if ($count == 4) {\r
-                          $count = 1;\r
-                          $addClass = '';\r
-                          //$addSpacer = true;\r
-                          } else {\r
-                          $addClass = ' blocmargin';\r
-                          $count++;\r
-                          } */\r
-\r
                         $addClass = ' blocmargin';\r
 \r
 \r
@@ -43,36 +34,18 @@ class Cubedesigners_View_Helper_RealisationsList extends Zend_View_Helper_Abstra
                                 $addOffline = 'data-offline="1"';\r
                         }\r
 \r
-                        //$res .= '<a href="' . $url . '">';\r
 \r
                         $visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);\r
 \r
 \r
-                        fb($r);\r
-\r
                         $image = $this->view->imageProcess($r->visuel, $r->titre, 230, 230);\r
                         $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']);\r
 \r
                         $res .= '<a href="#" onclick="return false;" data-url="' . $url . '" data-id="' . $r->id . '">';\r
-                        /* $res .= '<div class="detail">';\r
-                          $res .= '<div class="detailLeft">';\r
-                          $res .= '<div class="titre">' . $r->titre . '</div>';\r
-                          $res .= '<div class="legende">' . $r->legende . '</div>';\r
-                          $res .= '<div class="agence">' . $r->agence . '</div>';\r
-                          $res .= '<div class="description">' . $this->view->markupDotclear($r->description) . '</div>';\r
-                          $res .= '<a class="link" href="' . $r->url . '">' . __("Voir le site") . '</a>';\r
-                          $res .= '</div>';\r
-\r
-                          $res .= '<div class="detailRight"><div class="slides">' . $visuel . '</div><div class="close"></div></div>';\r
-                          $res .= '</div>'; */\r
-                        $res .= '<div class=" bloc' . $addClass . '" data-tags="' . $r->tags . '" data-pos="' . $count . '">';\r
+                        $res .= '<div class=" bloc' . $addClass . '" data-categories="' . $r->categories . '" data-pos="' . $count . '">';\r
                         $res .= '<div class="project-photo">' . $image . '</div>';\r
-                        //$res .= '<div class="project-title" ' . $addOffline . '>' . $r->titre . '</div>';\r
                         $res .= '</div>';\r
                         $res .= '</a>';\r
-                        // if ($addSpacer) {\r
-                        //    $res .= '<div class="spacer"></div>';\r
-                        // }\r
                         $test++;\r
 \r
                         $count++;\r
index b978e027422fbc72eeb26c2bdbbfe37c92e1d4f9..772601078fd32feec0699dc85d9136510febc3ec 100644 (file)
@@ -5,14 +5,14 @@ $this->headScript()->addScriptAndStyle('casestudies');
 <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
 \r
 <div id="casestudies-tagslist">\r
-    <?php\r
-    echo $this->CasestudiesTagsList($this->studies);\r
-    ?>\r
+        <?php\r
+        echo $this->CategoriesList('casestudies');\r
+        ?>\r
 </div>\r
 \r
 <div id="casestudies-list">\r
-    <?php\r
-    $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
-    echo $this->CasestudiesList($datas);\r
-    ?>\r
+        <?php\r
+        $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
+        echo $this->CasestudiesList($datas);\r
+        ?>\r
 </div>
\ No newline at end of file
index 50778aa13c70185d44aa3d0a203bf0a6efb604b6..da5ca4f8ee1b5d928119dd17d05c25a463acdeea 100644 (file)
@@ -7,13 +7,15 @@ $this->headScript()->addScriptAndStyle('realisations');
 <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
 \r
 <div id="realisations-tagslist">\r
-    <?php echo $this->CasestudiesTagsList($this->studies); ?>\r
+        <?php\r
+        echo $this->CategoriesList("realisations");\r
+        ?>\r
 </div>\r
 \r
 <div id="realisations-list">\r
-    <?php\r
-    $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
-    echo $this->RealisationsList($datas);\r
-    ?>\r
+        <?php\r
+        $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
+        echo $this->RealisationsList($datas);\r
+        ?>\r
 </div>\r
 \r
index 600ac49f51e2446ef63ab549b3f18555f56c707c..e269a2ade208506ba3e100645acfb0e3db816d95 100644 (file)
@@ -11,10 +11,16 @@ function initTagsLink() {
     \r
     $(".tag").click(function() {\r
        \r
+       \r
         $(this).toggleClass('active');\r
         \r
         if( $(this).hasClass('active') ) {\r
-            showIds.push( $(this).attr("data-id") );\r
+            if(  $(this).attr("data-id") != 0) {\r
+                showIds.push( $(this).attr("data-id") );\r
+            }else{\r
+                showIds = new Array();  \r
+                $(".tag").removeClass('active');\r
+            }\r
         } else {\r
             var index = $.inArray( $(this).attr("data-id"), showIds );\r
             showIds.splice(index, 1);\r
@@ -27,35 +33,24 @@ function initTagsLink() {
         }\r
         \r
         displayStudies();\r
-        \r
-        //alert(showIds);\r
     });\r
     \r
 }\r
 \r
 function displayStudies() {\r
     \r
-    if( showIds.length == 0 ) {\r
-        //$(".tag:first").toggleClass('active');\r
+    if( showIds.length ) {\r
+        $('#casestudies-list .bloc').each(function(){\r
+            var categories = $(this).attr("data-categories");\r
+            if( $.inArray( categories, showIds ) == -1 ) {\r
+               $(this).fadeOut( 500, function() {}); \r
+            }else{\r
+               $(this).fadeIn( 500, function() {});  \r
+            }\r
+        });\r
+    }else{\r
+       $( '#casestudies-list .bloc' ).fadeIn( 500, function() {});\r
     }\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
index b0fcb78eaac8ce41e72f20c44a690d17b23a1a3e..e88ea9b662ce07aae43fd42837568900edcc002f 100644 (file)
@@ -9,9 +9,10 @@ var currentSlide = 1;
 var autoSlide = false;\r
 var totalWidth;\r
 var lastWidth;\r
+var showIds = new Array();\r
 \r
 function load_realisations() {\r
-    //initTagsLink();\r
+    initTagsLink();\r
     \r
      $(".bloc").click( function () {\r
         \r
@@ -67,6 +68,17 @@ function load_realisations() {
                          detail += '<div class="agence">Agence : '+rea.agence+'</div>';\r
                     }\r
                     \r
+                    \r
+                    detail += '<ul class="taglist">';\r
+                    detail += '<li>' + rea.annee +'</li>';\r
+                    \r
+                     for( var i=0; i<rea.tags_secondaires.length; i++) {\r
+                         detail += '<li>' + rea.tags_secondaires[i] +'</li>';\r
+                     }\r
+                    \r
+                    detail += '</ul>';\r
+                    \r
+                    \r
                    detail += '<div class="description">'+rea.description+'</div>';\r
                    detail += '<a class="link" href="'+rea.url+'">Voir le site</a>';\r
                    detail += '</div>';\r
@@ -174,25 +186,50 @@ function initTagsLink() {
     \r
     $(".tag").click(function() {\r
        \r
+       $(".close").click();\r
+       \r
         $(this).toggleClass('active');\r
         \r
         if( $(this).hasClass('active') ) {\r
-            showIds.push( $(this).attr("data-id") );\r
+            if(  $(this).attr("data-id") != 0) {\r
+                showIds.push( $(this).attr("data-id") );\r
+            }else{\r
+                showIds = new Array();  \r
+                $(".tag").removeClass('active');\r
+            }\r
         } else {\r
             var index = $.inArray( $(this).attr("data-id"), showIds );\r
             showIds.splice(index, 1);\r
         }\r
-       \r
+        \r
         if( showIds.length > 0 ) {\r
             $(".tag:first").removeClass('active');\r
         }else{\r
             $(".tag:first").addClass('active');\r
         }\r
         \r
+        displayRealisations();\r
     });\r
     \r
 }\r
 \r
+function displayRealisations() {\r
+    \r
+    if( showIds.length ) {\r
+        $('#realisations-list .bloc').each(function(){\r
+            var categories = $(this).attr("data-categories");\r
+            if( $.inArray( categories, showIds ) == -1 ) {\r
+               $(this).parent().fadeOut( 500, function() {}); \r
+            }else{\r
+               $(this).parent().fadeIn( 500, function() {});  \r
+            }\r
+        });\r
+    }else{\r
+       $( '#realisations-list .bloc' ).parent().fadeIn( 500, function() {});\r
+    }\r
+    \r
+}\r
+\r
 function initSlideShow() {\r
     \r
     var mouse_move=false;\r
@@ -230,6 +267,7 @@ function initSlideShow() {
                                $(le_div + " ul").animate({marginLeft:"+=2px"},0);\r
                        }\r
                }\r
+                \r
            },5);\r
 \r
            $(le_div).mouseout(function(){\r
index 56dd0213a24418dbd32adc77a3cf0c7e3418cf44..1f930d19b74dc3c883601d8f7eb6a19c187f504a 100644 (file)
@@ -38,3 +38,8 @@
 #adminBar a.right{
        float:right;
 }
+
+#tags_secondaires-element select,
+#technologies-element select {
+        height: 200px;
+}
index c1a8648ccf04ea065c27b905ed608850f5b028b2..1ba97a2ffa333740a628e75bcda2ff18ac05497e 100644 (file)
            color: #545454;
        }
        
+        ul {
+                margin-top:20px;
+                list-style: none;
+             }
+
+        li {
+                 font-size: 14px;
+                 color: #6f6f6f;
+                 padding: 3px 6px;
+                 border-radius: 2px;
+                 background-color: #ededed;
+                 margin:0 6px 6px 0;
+                 display: inline-block;
+             }
+             
+        li:hover, li:active {
+                cursor:default;
+                color: #fff;
+                background-color: #84ae1e;
+            }
+        
        .description {
            font-size: 14px;
            color: #545454;