(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 2b9d60a55f65f27ee681a8556c4bd804ad69bcc1..5c52db7e58d4c106f32fd80f62b114d5e836a9d4 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -9,11 +9,6 @@ class Bootstrap extends CubeIT_Bootstrap {
                $this->bootstrap('scripts');
        }
 
-       protected function _initScripts() {
-               parent::_initScripts();
-               $this->getView()->headScript()->addTagHandler();
-       }
-
        protected function _initRouter($initCms = true) {
                $router = parent::_initRouter($initCms);
                return $router;

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index d4bb0f960e6b2173a1f37dabf67d5c105949c418..6f1f976b9a6ac8ee0272110c9d7f8ae8c294fccd 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -37,6 +37,7 @@ former.home = /home/cubedesigners/www
 seo.universalAnalytics = UA-4339912-1
 seo.google = google93c0129ef18a399d.html
 seo.bing = 8986457D1D126C38A815027C839372DC
+seo.pinterest=fa7873389173bc29df6ef3ea8789bca2
 
 navigation.containers[]=0;
 ;navigation.containers[]=-1;

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index 710784e5b3821183237afd17333788e4c640fc39..31b4eda6a51bcc6ab66d0a333237aa45f6228de9 100644 (file)
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -1,8 +1,6 @@
 <?php
 
-//$fonts = array('custom' => array('families' => array('roboto_condensedlight'), 'urls' => array('/css/fonts/robotocondensed-light.css?nocache=1')));
 $fonts = array('google' => array('families' => array('Roboto+Condensed:400,300,700:latin')));
-$this->headScript()->addGSAP();
 $this->headScript()->addWebFont($fonts);
 $this->headScript()->addFastclick();
 

diff --git a/framework/application/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php
index 1dd1474e3d5b6d423329a1bda3eba74345d143fe..dcd517d3258ba1366dc5f74a9dac7186bbab58d5 100644 (file)
--- a/framework/application/views/helpers/CasestudiesDetail.php
+++ b/framework/application/views/helpers/CasestudiesDetail.php
@@ -6,7 +6,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs
 
                $visuel_detail = $this->view->imageProcess($studie->visuel_detail, $studie->titre, 980, 400);
 
-               $res = '<article class="case">';
+               $res = '<div class="case">';
                $res.='<div class="content">';
                $res.='<h1>' . $studie->titre . '</h1>';
                $res.='<h2>' . $studie->description . '</h2>';
@@ -92,7 +92,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs
                        }
                }
                $res .= '</div>';
-               $res .= '</article>';
+               $res .= '</div>';
 
                return $res;
        }

diff --git a/framework/application/views/helpers/HeadScript.php b/framework/application/views/helpers/HeadScript.php
new file mode 100644 (file)
index 0000000..7fdc234
--- /dev/null
+++ b/framework/application/views/helpers/HeadScript.php
@@ -0,0 +1,13 @@
+<?php
+
+class Cubedesigners_View_Helper_HeadScript extends CubeIT_View_Helper_HeadScript {
+
+       public function addCommonsJQuery() {
+               $this->addJQuery();
+               $this->addModernizr();
+               $this->addBase64();
+               $this->addCubeIT();
+               return $this;
+       }
+
+}

diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php
index 924e63133500491f666c5c5b209e22f31537c0e1..7cd2fc290fc5ad5173e8a8463e217c348fdc4fdc 100644 (file)
--- a/framework/application/views/helpers/HomeSlideshow.php
+++ b/framework/application/views/helpers/HomeSlideshow.php
@@ -4,6 +4,7 @@ class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstrac
 
        public function homeSlideshow($slides) {
                $this->headScript()->addSlideshow();
+               $this->headScript()->addGSAP();
                $this->addScriptAndStyle('carrousel');
 
                $slides = $slides['slides'];

diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php
index 755874cfc489b96a4949e200a3f36420f385cea2..21e316be1d6921a328e48f2a9dd9dcab25a74644 100644 (file)
--- a/framework/application/views/helpers/Liste.php
+++ b/framework/application/views/helpers/Liste.php
@@ -9,7 +9,9 @@ class Cubedesigners_View_Helper_Liste extends Zend_View_Helper_Abstract {
 
                $this->view->headLink()->appendStylesheet('/less/list.less');
                $res = '<div class="bloc-holder">';
-               $res.='<h2>' . ucfirst($items['titre']) . '</h2>';
+               if ($items['titre']) {
+                       $res.='<h2>' . ucfirst($items['titre']) . '</h2>';
+               }
                $res.=$this->view->homeBlocs($items, $displayDetailsButtons, $cols);
                if ($items['button']['label']) {
                        $res.=$this->view->linkCMS($items['button'], array('class' => 'but'));

diff --git a/framework/application/views/helpers/Twocols.php b/framework/application/views/helpers/Twocols.php
index 6905233ff3625e5b5b9a09b2f5e47a7053cf462a..4688d08545ccebf34a9ec0627cb3145d5853177d 100644 (file)
--- a/framework/application/views/helpers/Twocols.php
+++ b/framework/application/views/helpers/Twocols.php
@@ -6,7 +6,7 @@ class Cubedesigners_View_Helper_Twocols extends Zend_View_Helper_Abstract {
                $this->view->headLink()->appendStylesheet('/less/twocols.less');
                $res = '<div class="twocols">';
                $res.='<section>';
-               if ($displayTitle) {
+               if ($displayTitle && trim($this->view->titre)) {
                        $res.= '<div class="title">' . $this->view->markupDotclear($this->view->titre) . '</div>';
                }
                $res.='<div class="cols">';

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 005a7af8d599cf922296cd82823d7f293aaeae66..cbc43a8987e21c46f8bf1d781200cfb29d07f41b 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -8,52 +8,50 @@ if (!is_null($mentions_page)) {
 }
 echo $this->clear();
 ?>
-<footer>
-    <div id="footer">
-        <div class="footer-holder">
-            <div class="footer-top">
-                <div class="footer-top-content">
-                    <div class="bloc">
-                        <h2><?php echo __("Nous contacter"); ?></h2>
-                                               <?php echo $this->footerContact($this->option('contact')); ?>
-                    </div>
+<footer id="footer">
+       <div class="footer-holder">
+               <div class="footer-top">
+                       <div class="footer-top-content">
+                               <div class="bloc">
+                                       <h2><?php echo __("Nous contacter"); ?></h2>
+                                       <?php echo $this->footerContact($this->option('contact')); ?>
+                               </div>
 
-                    <div class="bloc">
-                                               <?php echo $this->footerActualites($this->option('actus')); ?>
-                                               <div class="social">
-                                                       <h2><?php echo __("Suivez-nous"); ?></h2>
-                                                       <?php echo $this->footerSocials($this->option('followus')); ?>
-                                               </div>
-                    </div>
-                </div>
-            </div>
+                               <div class="bloc">
+                                       <?php echo $this->footerActualites($this->option('actus')); ?>
+                                       <div class="social">
+                                               <h2><?php echo __("Suivez-nous"); ?></h2>
+                                               <?php echo $this->footerSocials($this->option('followus')); ?>
+                                       </div>
+                               </div>
+                       </div>
+               </div>
 
-            <div class="footer-bottom">
-                               <div class="content">
-                                       <div class="copyright">
-                                               <?php
-                                               echo $this->option('copyright');
+               <div class="footer-bottom">
+                       <div class="content">
+                               <div class="copyright">
+                                       <?php
+                                       echo $this->option('copyright');
 
-                                               if (!is_null($mentions)) {
-                                                       echo $this->linkPage($mentions_page);
-                                                       //echo ' <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
-                                               }
-                                               ?>
-                                       </div>
-                                       <nav  class="locales">
-                                               <?php
-                                               $fr = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-                                               if (!isset($this->enversion)) {
-                                                       $en = 'http://en.cubedesigners.com/en/';
-                                               } else {
-                                                       $en = $this->enversion;
-                                               }
-                                               echo $this->link('fr', $fr, array('class' => 'active', 'hreflang' => 'fr'));
-                                               echo $this->link('en', $en, array('hreflang' => 'en'));
-                                               ?>
-                                       </nav>
+                                       if (!is_null($mentions)) {
+                                               echo $this->linkPage($mentions_page);
+                                               //echo ' <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
+                                       }
+                                       ?>
                                </div>
-            </div>
-        </div>
-    </div>
+                               <nav  class="locales">
+                                       <?php
+                                       $fr = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                                       if (!isset($this->enversion)) {
+                                               $en = 'http://en.cubedesigners.com/en/';
+                                       } else {
+                                               $en = $this->enversion;
+                                       }
+                                       echo $this->link('fr', $fr, array('class' => 'active', 'hreflang' => 'fr'));
+                                       echo $this->link('en', $en, array('hreflang' => 'en'));
+                                       ?>
+                               </nav>
+                       </div>
+               </div>
+       </div>
 </footer>
\ No newline at end of file

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index ec7d33ea2186efb3020033ed0e3727920fdf2ebb..919e9c6f25a01f0f2ba75769b3c8c7f284707974 100644 (file)
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -13,9 +13,9 @@ if (!is_null($homepage)) {
                /* LOGO */
                echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
                if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {
-                       echo '<div class="sublogo"><h1>' . $this->logoTitle . '</h1><h2>' . $this->baseline . '</h2></div>';
+                       echo '<div class="sublogo"><h1>' . $this->cmsValue('logoTitle') . '</h1><h2>' . $this->cmsValue('baseline') . '</h2></div>';
                } else {
-                       echo '<div class="sublogo"><h2>' . $this->logoTitle . '</h2><h3>' . $this->baseline . '</h3></div>';
+                       echo '<div class="sublogo"><h2>' . $this->cmsValue('logoTitle') . '</h2><h3>' . $this->cmsValue('baseline') . '</h3></div>';
                }
                /* NAVIGATION */
                $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);

diff --git a/framework/application/views/scripts/studies/index.phtml b/framework/application/views/scripts/studies/index.phtml
index 7c8391624f64e44a739ac751f0d4d57990296b05..013cbbf547444a0d0f726aa66a3f407f2be6f32c 100644 (file)
--- a/framework/application/views/scripts/studies/index.phtml
+++ b/framework/application/views/scripts/studies/index.phtml
@@ -1,13 +1,9 @@
 <?php
-$this->headTitle($this->titre . ' / ' . $this->currentPage->getParent()->getTitle() . ' // Cubedesigners', 'SET');
+$this->headTitle($this->titre . ' / ' . $this->currentPage->getParent()->getTitle(), 'SET');
 $this->headSeo()->setDescription($this->studie->legende);
 $this->headOpenGraph()->setDescription($this->studie->legende);
 $this->headScript()->addScriptAndStyle('casestudies_detail');
-?>
-
 
-
-<?php
 echo $this->CasestudiesDetail($this->studie);
 ?>
 

diff --git a/js/main.js b/js/main.js
new file mode 100644 (file)
index 0000000..af196db
--- /dev/null
+++ b/js/main.js
@@ -0,0 +1,3 @@
+require([
+       'common',
+]);
\ No newline at end of file