(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index fe6c5a0d4295e7a192a5e6926b03189e0f2e3728..3d5cd787e60bac1e65c3f0f7ecb115c9181fd4d9 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -2,184 +2,188 @@
 
 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 _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;
        }
 
-       protected function _initScripts() {
-               parent::_initScripts();
-               $this->getView()->headLink()->appendStylesheet('/css/fonts/fonts.css');
-               $this->getView()->headScript()->addTagHandler();
+       if ($page->getTemplate() == 'casestudies') {
+           $this->addStudiesPages($page, $locale);
        }
 
-       protected function _initRouter($initCms = true) {
-               $router = parent::_initRouter($initCms);
-               return $router;
+       if ($page->getTemplate() == 'realisations') {
+           $this->addRealisationsPages($page, $locale);
        }
-
-       /**
-        *
-        * @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('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);
-               //fb($datas);
-               $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);
-                       $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 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();
+    }
+
+    /**
+     *
+     * @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();
+    }
 
 }

diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
index ee31169b1a80f53b2e00f4752ffc34121da67887..134b6e8664486d20fe967e15361baefd78c8642d 100644 (file)
--- a/framework/application/forms/CMS/Sub/Realisations/Realisations.php
+++ b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
@@ -3,52 +3,59 @@
 class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List {
 
     public function init() {
-        parent::init();
-        $id = new CubeIT_Form_Element_Id();
-        $this->addElement($id);
-
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre');
-        $this->addElement($titre);
-
-        $legende = new Zend_Form_Element_Text('legende');
-        $legende->setLabel('Legende');
-        $this->addElement($legende);
-
-        $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->addElement($description);
-
-        $url = new CubeIT_Form_Element_Url('url');
-        $url->setLabel('URL du site');
-        $this->addElement($url);
-
-        $visuel = new CubeIT_Form_Element_File_Image('visuel');
-        $visuel->setLabel('Visuel principal');
-        $visuel->setMaxItems(1);
-        $this->addElement($visuel);
-
-        $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
-        $visuel_detail->setLabel('Visuels du détail');
-        $this->addElement($visuel_detail);
-
-        $tags = new Cubedesigners_Form_Element_Tags('tags');
-        $tags->setLabel('Tags');
-        $this->addElement($tags);
-
-        $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');
+       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);
+
+       $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);
+
+       $tags = new Cubedesigners_Form_Element_Tags('tags');
+       $tags->setLabel('Tags');
+       $this->addElement($tags);
+
+       $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/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php
index 75f4fb17a5aec4cfba36615deaad12d24bc4a718..9e9b1ebb65ab5c885e65ff4c27e97c268e8ff4ab 100644 (file)
--- a/framework/application/views/helpers/CasestudiesDetail.php
+++ b/framework/application/views/helpers/CasestudiesDetail.php
@@ -4,94 +4,97 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
 \r
     public function CasestudiesDetail($studie) {\r
 \r
-        $visuel_detail = $this->view->imageProcess($studie->visuel_detail, $studie->titre, 980, 400);\r
+       $visuel_detail = $this->view->imageProcess($studie->visuel_detail, $studie->titre, 980, 400);\r
 \r
-        $res = '<div id="casestudies-detail-visuel">';\r
-        $res .= '<div class="visuel-holder">';\r
-        $res .= '<div class="visuel">' . $visuel_detail . '</div>';\r
+       $res = '<div id="casestudies-detail-visuel">';\r
+       $res .= '<div class="visuel-holder">';\r
+       $res .= '<div class="visuel">' . $visuel_detail . '</div>';\r
 \r
 \r
-        $res .= '<div class="legende">' . $studie->legende . '</div>';\r
+       $res .= '<div class="legende">' . $studie->legende . '</div>';\r
 \r
-        if ($studie->url != '') {\r
-            $res .= '<a href="' . $studie->url . '" style="float:right">' . __("Voir le site") . '</a>';\r
-        }\r
+       if ($studie->url != '') {\r
+           $res .= '<a href="' . $studie->url . '" style="float:right">' . __("Voir le site") . '</a>';\r
+       }\r
 \r
-        $res .= '</div>';\r
-        $res .= '</div>';\r
+       $res .= '</div>';\r
+       $res .= '</div>';\r
 \r
-        $style = '';\r
-        if ($studie->couleur != '') {\r
-            $style = 'background-color:' . $studie->couleur;\r
-        }\r
+       $style = '';\r
+       if ($studie->couleur != '') {\r
+           $style = 'background-color:' . $studie->couleur;\r
+       }\r
 \r
-        $res .= '<div id="casestudies-detail-content" style="' . $style . ';">';\r
+       $res .= '<div id="casestudies-detail-content" style="' . $style . ';">';\r
 \r
-        $blocs = json_decode($studie->blocs, true);\r
 \r
-        foreach ($blocs as $bloc) {\r
 \r
-            // fb($bloc);\r
-            $margin = '';\r
-            if ($bloc["margin"] != '') {\r
-                $margin = 'margin-top:' . $bloc["margin"] . 'px;';\r
-            }\r
+       //$blocs = json_decode($studie->blocs[0], true);\r
+       $blocs = $studie->blocs;\r
+       fb($blocs);\r
+       foreach ($blocs as $bloc) {\r
 \r
-            $zindex = '';\r
-            if ($bloc["zindex"] != 'default') {\r
-                $zindex = 'z-index:' . $bloc["zindex"] . ';';\r
-            }\r
+           // fb($bloc);\r
+           $margin = '';\r
+           if ($bloc->margin != '') {\r
+               $margin = 'margin-top:' . $bloc->margin . 'px;';\r
+           }\r
 \r
-            if ($bloc["selectedtype"] == "text") {\r
+           $zindex = '';\r
+           if ($bloc->zindex != 'default') {\r
+               $zindex = 'z-index:' . $bloc->zindex . ';';\r
+           }\r
 \r
-                $res .= '<div class="detail-text" style="' . $margin . '' . $zindex . '" >';\r
-                $res .= '<div class="titre">' . $bloc["titre"] . '</div>';\r
-                $res .= '<div class="texte">' . $bloc["texte"] . '</div>';\r
-                $res .= '</div>';\r
-            }\r
+           if ($bloc->selectedtype == "text") {\r
 \r
-            if ($bloc["selectedtype"] == "visuel") {\r
-                $visuel = $this->view->imageProcess()->imageProcessGetUrl($bloc["visuel"], '', 1200, null);\r
-                $width = -1;\r
-                $height = -1;\r
-                CubeIT_Image::getDimensions($visuel, $width, $height);\r
+               $res .= '<div class="detail-text" style="' . $margin . '' . $zindex . '" >';\r
+               $res .= '<div class="titre">' . $bloc->titre . '</div>';\r
+               $res .= '<div class="texte">' . $bloc->texte . '</div>';\r
+               $res .= '</div>';\r
+           }\r
 \r
+           if ($bloc->selectedtype == "visuel") {\r
+               $visuel = $this->view->imageProcess()->imageProcessGetUrl($bloc->visuel, '', 1200, null);\r
+               $width = -1;\r
+               $height = -1;\r
+               CubeIT_Image::getDimensions($visuel, $width, $height);\r
 \r
 \r
-                $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '' . $zindex . '"></div>';\r
-            }\r
 \r
+               $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '' . $zindex . '"></div>';\r
+           }\r
 \r
-            $addVideoBackground = false;\r
-            if ($bloc["video_background"] != false) {\r
-                $addVideoBackground = true;\r
-            }\r
 \r
-            if ($bloc["selectedtype"] == "video") {\r
+           $addVideoBackground = false;\r
+           if ($bloc->video_background != false) {\r
+               $addVideoBackground = true;\r
+           }\r
 \r
-                $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';\r
-                $video = $this->view->videoWeb($bloc["video"], 980);\r
+           if ($bloc->selectedtype == "video") {\r
 \r
-                if ($addVideoBackground) {\r
-                    $background = $this->view->imageProcess()->imageProcessGetUrl($bloc["video_background"], '', 1200, null);\r
-                    $width = -1;\r
-                    $height = -1;\r
-                    CubeIT_Image::getDimensions($background, $width, $height);\r
-                    $top = ($height - 550) / 2;\r
-                    //fb($height);\r
-                    $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;top:' . $top . 'px;">';\r
-                }\r
-                if ($addVideoBackground) {\r
-                    $res.= "</div>";\r
-                }\r
+               $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';\r
+               $video = $this->view->videoWeb($bloc->video, 980);\r
 \r
-                $res .= '<div style="z-index:10;position:relative">' . $video . '</div>';\r
-                $res .= '</div>';\r
-            }\r
-        }\r
-        $res .= '</div>';\r
+               if ($addVideoBackground) {\r
+                   $background = $this->view->imageProcess()->imageProcessGetUrl($bloc->video_background, '', 1200, null);\r
+                   $width = -1;\r
+                   $height = -1;\r
+                   CubeIT_Image::getDimensions($background, $width, $height);\r
+                   $top = ($height - 550) / 2;\r
+                   //fb($height);\r
+                   $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;top:' . $top . 'px;">';\r
+               }\r
+               if ($addVideoBackground) {\r
+                   $res.= "</div>";\r
+               }\r
 \r
-        return $res;\r
+               $res .= '<div style="z-index:10;position:relative">' . $video . '</div>';\r
+               $res .= '</div>';\r
+           }\r
+       }\r
+       $res .= '</div>';\r
+\r
+       return $res;\r
     }\r
 \r
 }\r

diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php
index f5ec0ce37133d9625a10c19fde32d9f3ca64806d..2c80a85b1b334c93a9134e1cdae937a2b93b7772 100644 (file)
--- a/framework/application/views/helpers/CasestudiesList.php
+++ b/framework/application/views/helpers/CasestudiesList.php
@@ -4,63 +4,62 @@ class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstrac
 \r
     public function CasestudiesList($datas) {\r
 \r
-        // $acl = Bootstrap::getInstance()->getAcl();\r
-        $acl = Bootstrap::getInstance()->isAllowed("edition");\r
+       $acl = Bootstrap::getInstance()->isAllowed("edition");\r
 \r
 \r
 \r
-        $db = Zend_Db_Table::getDefaultAdapter();\r
-        $s = $db->select()->from('casestudies')\r
-                ->order('id ASC');\r
+       $db = Zend_Db_Table::getDefaultAdapter();\r
+       $s = $db->select()->from('casestudies')\r
+               ->order('id ASC');\r
 \r
 \r
-        if (!$acl) {\r
-            $s->where('online = ?', 1);\r
-        }\r
+       if (!$acl) {\r
+           $s->where('online = ?', 1);\r
+       }\r
 \r
-        $q = $s->query();\r
+       $q = $s->query();\r
 \r
-        $count = 1;\r
+       $count = 1;\r
 \r
 \r
-        $res = '';\r
+       $res = '';\r
 \r
-        while ($r = $q->fetch()) {\r
+       while ($r = $q->fetch()) {\r
 \r
-            $r = CubeIT_Util_Cms::unserialize($r);\r
+           $r = CubeIT_Util_Cms::unserialize($r);\r
 \r
-            $addSpacer = false;\r
+           $addSpacer = false;\r
 \r
-            if ($count == 3) {\r
-                $count = 1;\r
-                $addClass = '';\r
-                //   $addSpacer = true;\r
-            } else {\r
-                $addClass = ' blocmargin';\r
-                $count++;\r
-            }\r
+           if ($count == 3) {\r
+               $count = 1;\r
+               $addClass = '';\r
+               //   $addSpacer = true;\r
+           } else {\r
+               $addClass = ' blocmargin';\r
+               $count++;\r
+           }\r
 \r
-            $addOffline = '';\r
-            if ($acl && $r->online == 0) {\r
-                $addOffline = 'data-offline="1"';\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
+           $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
+           // if ($addSpacer) {\r
+           //    $res .= '<div class="spacer"></div>';\r
+           // }\r
+       }\r
 \r
-        return $res;\r
+       return $res;\r
     }\r
 \r
 }\r

diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php
index 27be6140ecfde2f76e2d646332ceb7cfe7439a82..3a48265b10f170ed1d3ca3442a9aa321967de6a2 100644 (file)
--- a/framework/application/views/helpers/RealisationsList.php
+++ b/framework/application/views/helpers/RealisationsList.php
@@ -4,45 +4,58 @@ class Cubedesigners_View_Helper_RealisationsList extends Zend_View_Helper_Abstra
 \r
     public function RealisationsList($datas) {\r
 \r
-        $db = Zend_Db_Table::getDefaultAdapter();\r
-        $s = $db->select()->from('realisations')\r
-                ->order('id ASC');\r
-        $q = $s->query();\r
+       $acl = Bootstrap::getInstance()->isAllowed("edition");\r
 \r
-        $count = 1;\r
+       $db = Zend_Db_Table::getDefaultAdapter();\r
+       $s = $db->select()->from('realisations')\r
+               ->order('id ASC');\r
 \r
-        $res = '';\r
+       if (!$acl) {\r
+           $s->where('online = ?', 1);\r
+       }\r
 \r
+       $q = $s->query();\r
 \r
+       $count = 1;\r
 \r
-        while ($r = $q->fetch()) {\r
-            $addSpacer = false;\r
+       $res = '';\r
 \r
-            if ($count == 6) {\r
-                $count = 1;\r
-                $addClass = '';\r
-                //   $addSpacer = true;\r
-            } else {\r
-                $addClass = ' blocmargin';\r
-                $count++;\r
-            }\r
+       while ($r = $q->fetch()) {\r
 \r
+           $r = CubeIT_Util_Cms::unserialize($r);\r
 \r
-            $image = $this->view->imageProcess($r->visuel, $r->titre, 130, 130);\r
-            $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']);\r
-            //$res .= '<a href="' . $url . '">';\r
-            $res .= '<a href="#" onclick="return false;" data-url="' . $url . '">';\r
-            $res .= '<div class="bloc' . $addClass . '" data-tags="' . $r->tags . '">';\r
-            $res .= '<div class="project-photo">' . $image . '</div>';\r
-            $res .= '<div class="project-title">' . $r->titre . '</div>';\r
-            $res .= '</div>';\r
-            $res .= '</a>';\r
-            // if ($addSpacer) {\r
-            //    $res .= '<div class="spacer"></div>';\r
-            // }\r
-        }\r
+           $addSpacer = false;\r
 \r
-        return $res;\r
+           if ($count == 4) {\r
+               $count = 1;\r
+               $addClass = '';\r
+               //   $addSpacer = true;\r
+           } else {\r
+               $addClass = ' blocmargin';\r
+               $count++;\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, 230, 230);\r
+           $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']);\r
+           //$res .= '<a href="' . $url . '">';\r
+\r
+           $res .= '<a href="#" onclick="return false;" data-url="' . $url . '">';\r
+           $res .= '<div class="bloc' . $addClass . '" data-tags="' . $r->tags . '">';\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
+       }\r
+\r
+       return $res;\r
     }\r
 \r
 }\r

diff --git a/framework/application/views/scripts/templates/casestudies.phtml b/framework/application/views/scripts/templates/casestudies.phtml
index 242c41450b65413092dd3096e8701270d015ad71..b978e027422fbc72eeb26c2bdbbfe37c92e1d4f9 100644 (file)
--- a/framework/application/views/scripts/templates/casestudies.phtml
+++ b/framework/application/views/scripts/templates/casestudies.phtml
@@ -5,13 +5,14 @@ $this->headScript()->addScriptAndStyle('casestudies');
 <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
 \r
 <div id="casestudies-tagslist">\r
-    <?php echo $this->CasestudiesTagsList($this->studies); ?>\r
+    <?php\r
+    echo $this->CasestudiesTagsList($this->studies);\r
+    ?>\r
 </div>\r
 \r
 <div id="casestudies-list">\r
     <?php\r
     $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
     echo $this->CasestudiesList($datas);\r
-    //fb($datas);\r
     ?>\r
-</div>\r
+</div>
\ No newline at end of file

diff --git a/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml
index 67a59861217d11c0f00c40392afbc7db751eced8..87b1d977ce0d535ce5acb8507d6379f0c96f3f3d 100644 (file)
--- a/framework/application/views/scripts/templates/realisations.phtml
+++ b/framework/application/views/scripts/templates/realisations.phtml
@@ -8,7 +8,6 @@ $this->headScript()->addScriptAndStyle('realisations');
     <?php echo $this->CasestudiesTagsList($this->studies); ?>\r
 </div>\r
 \r
-\r
 <div id="realisations-list">\r
     <?php\r
     $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r

diff --git a/less/realisations.less b/less/realisations.less
index 8ad133b06632b04064446af2816b968c53c1232b..280107df0a9adf8fe7ccaf7ddaad6c4e4091ecd9 100644 (file)
--- a/less/realisations.less
+++ b/less/realisations.less
@@ -43,7 +43,7 @@
     overflow: hidden;
     
     .bloc {    
-        width:130px;
+        width:230px;
         float:left;
     }
 
@@ -52,8 +52,8 @@
     }
 
     .bloc .project-photo {
-        width:130px;
-        height:130px;
+        width:230px;
+        height:230px;
         background-color: #ccc;
         margin:0 0 5px 0;
     }
@@ -65,7 +65,7 @@
     }
 
     .blocmargin {
-        margin-right:40px;
+        margin-right:15px;
     }
     
     .spacer {