]> _ Git - cubedesigners-v7.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 26 Nov 2014 11:54:29 +0000 (11:54 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 26 Nov 2014 11:54:29 +0000 (11:54 +0000)
15 files changed:
.htaccess
framework/application/Bootstrap.php
framework/application/configs/application.ini
framework/application/controllers/IndexController.php
framework/application/views/helpers/AgencyBlocs.php
framework/application/views/helpers/FooterActualites.php
framework/application/views/helpers/RealisationsList.php
framework/application/views/helpers/Twocols.php
framework/application/views/scripts/common/footer.phtml
framework/application/views/scripts/common/header.phtml
framework/application/views/scripts/realisations/index.phtml
framework/application/views/scripts/studies/index.phtml
framework/application/views/scripts/templates/agence.phtml
less/agence.less
less/footer.less

index 3f5849485ab36f49cdaacec303e9185b930348b8..4570e6395f00d9e72c0d199f58dde0f382bcfdc7 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -16,7 +16,7 @@
        RewriteBase /
        # Redirection to www. subdomain
        RewriteCond %{HTTP_HOST} !=www.cubedesigners.fr
-       RewriteCond %{HTTP_HOST} !=www.cubedesigners.com
+       #RewriteCond %{HTTP_HOST} !=www.cubedesigners.com
        RewriteRule ^(.*)$ http://www.cubedesigners.fr/$1 [R=301,L]
        # Redirect auth header to env
        RewriteRule ^.*$ - [E=REMOTE_USER:%{HTTP:Authorization}]
index a0ba199f6fd6ee1df41f9556436373cda3f603a5..2b9d60a55f65f27ee681a8556c4bd804ad69bcc1 100644 (file)
@@ -128,6 +128,73 @@ class Bootstrap extends CubeIT_Bootstrap {
                return $templates;
        }
 
+       /**
+        *
+        * @param Zend_Controller_Request_Http $req
+        * @return boolean|string
+        */
+       public function handleRedirections($req) {
+               $res = parent::handleRedirections($req);
+               if ($res !== false) {
+                       return $res;
+               }
+
+               $path = trim($req->getPathInfo(), '/ ');
+               $e = explode('/', $path);
+               $locale = array_shift($e);
+
+               $res = '/';
+               if ($locale == 'en') {
+                       return 'http://en.cubedesigners.com/en/' . $path;
+               }
+
+               if ($locale == 'references_web') {
+                       $res.='Portfolio';
+                       return $res;
+               }
+
+               if ($locale != 'fr') {
+                       return false;
+               }
+
+               if (count($e) == 1) {
+                       $u = $e[0];
+                       if ($u == '1-Sites-internet') {
+                               $res.='Projets-Web';
+                       } elseif ($u == '2-Design-graphique') {
+                               $res.='Graphisme';
+                       } elseif ($u == '3-Design-industriel') {
+                               $res.='Design-industriel';
+                       } elseif ($u == '4-Multimedia-Jeux') {
+                               $res.='Multimedia';
+                       } elseif ($u == '5-Films-Animation') {
+                               $res.='Multimedia';
+                       } elseif ($u == '6-Applications-mobiles') {
+                               $res.='Projets-Web';
+                       } elseif ($u == '7-En-attente') {
+                               $res.='Graphisme';
+                       }
+                       return $res;
+               }
+
+               if (count($e) == 3) {
+                       if ($e[0] == 'Sites-internet') {
+                               $e[0] = 'Site-Web';
+                       } elseif ($e[0] == 'Multimedia-Jeux') {
+                               $e[0] = 'Multimedia';
+                       }
+
+                       // Projects
+                       /// Mobile-applications/Heredis/114-Heredis-App => Applications-mobiles/Heredis-Heredis-App
+                       $ee = explode('-', $e[2], 2);
+                       array_shift($ee);
+                       $res.=$e[0] . '/' . $e[1] . '-' . implode('-', $ee);
+                       return $res;
+               }
+
+               return false;
+       }
+
        public function run() {
                // run have to be the last call of bootstrap
                parent::run();
index 3f098d094ae71c4e6c0c1526f620f7c423221fcd..d4bb0f960e6b2173a1f37dabf67d5c105949c418 100644 (file)
@@ -19,7 +19,7 @@ timezone = 'Europe/Paris'
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
 
-webhost = www.cubedesigners.com
+webhost = www.cubedesigners.fr
 
 database.adapter = pdo_mysql
 database.params.host = localhost
index d4df5311020553dadfecd5af7a3a490b7f6d1b15..cf69518b0bfb46486a02af2c5260d44cb0221346 100644 (file)
@@ -1,6 +1,5 @@
 <?php
 
 class IndexController extends CubeIT_Controller_IndexController {
-       
-}
 
+}
index 24edab45e51fa6a76b88fcaa7a68d271ac5c1e29..f7c13a0aeabcb02589b405aac54eecadab44c0ca 100644 (file)
@@ -1,37 +1,37 @@
-<?php\r
-\r
-class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {\r
-\r
-    public function agencyBlocs($blocs) {\r
-\r
-        $blocs = $blocs['blocs'];\r
-\r
-        $res = '<div class="blocs">';\r
-\r
-        $i = 0;\r
-\r
-        foreach ($blocs as $id => $bloc) {\r
-\r
-            if (($i % 2) == 0 && $i != 0) {\r
-                $res.='<div class="spacer"></div>';\r
-            }\r
-\r
-            $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120);\r
-\r
-            $res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';\r
-            $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';\r
-            $res.='<h3 itemprop="name">' . $bloc['titre'] . '</h3>';\r
-            $res.='<span class="poste" itemprop="jobTitle">' . $bloc['poste'] . '</span>';\r
-            $res.='<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';\r
-            $res.='</div>';\r
-\r
-            $i++;\r
-        }\r
-\r
-        $res .= '</div>';\r
-        return $res;\r
-    }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
+
+       public function agencyBlocs($blocs) {
+
+               $blocs = $blocs['blocs'];
+
+               $res = '<div class="blocs">';
+
+               $i = 0;
+
+               foreach ($blocs as $id => $bloc) {
+
+                       if (($i % 2) == 0 && $i != 0) {
+                               $res.='<div class="spacer"></div>';
+                       }
+
+                       $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120);
+
+                       $res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';
+                       $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';
+                       $res.='<h3 itemprop="name">' . $bloc['titre'] . '</h3>';
+                       $res.='<span class="poste" itemprop="jobTitle">' . $bloc['poste'] . '</span>';
+                       $res.= $this->view->markupDotclear($bloc['texte'], array('class' => 'texte'));
+                       $res.='</div>';
+
+                       $i++;
+               }
+
+               $res .= '</div>';
+               return $res;
+       }
+
+}
+
+?>
index fb0015d29f56acef29347dadba1ca525a66a33b5..36fa77a0fd661d0ad54cf09a6d52efbdeca2f2fb 100644 (file)
@@ -9,8 +9,12 @@ class Cubedesigners_View_Helper_FooterActualites extends Zend_View_Helper_Abstra
                $nbActus = count($actus);
 
                $res = '<section class="actus">';
+               $res.='<h2>' . __('Actualités') . '</h2>';
                foreach ($actus as $id => $actu) {
-                       $res.='<article class="actu">' . $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date')) . $this->view->markupDotclear($actu['texte']) . '</article>';
+                       $res.='<article class="actu">';
+                       $res.= $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date'));
+                       $res.='<h3>' . nl2br($actu['texte']) . '</h3>';
+                       $res.='</article>';
                }
                $res.= '</section>';
 
index 113e1a1c86abf2b522d58fa7518c0f9e262ee08e..8d391d5a0b40a9e2bbb3822ddbafcb0dad1ee403 100644 (file)
@@ -32,7 +32,7 @@ class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abst
 
                        $rea = $this->view->imageProcess($r->visuel, $r->titre, 170, 127);
                        $rea.='<h2>' . $r->titre . '</h2>';
-                       $rea.='<h3>' . Cubedesigners_Util::getCategoryById($r->categories) . ' // ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
+                       $rea.='<h3>' . Cubedesigners_Util::getCategoryById($r->categories) . ' / ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
 
                        $url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea']);
 
index 6f82a95cf1705e85898d2561eea9a90e29aa3b6d..6905233ff3625e5b5b9a09b2f5e47a7053cf462a 100644 (file)
@@ -5,10 +5,10 @@ class Cubedesigners_View_Helper_Twocols extends Zend_View_Helper_Abstract {
        public function twocols($displayTitle = true) {
                $this->view->headLink()->appendStylesheet('/less/twocols.less');
                $res = '<div class="twocols">';
+               $res.='<section>';
                if ($displayTitle) {
                        $res.= '<div class="title">' . $this->view->markupDotclear($this->view->titre) . '</div>';
                }
-               $res.='<section>';
                $res.='<div class="cols">';
                $res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnegauche) . '</div>';
                $res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnedroite) . '</div>';
index 53ee8d1ca7343e575d4edc7aa3f127fa092ca518..005a7af8d599cf922296cd82823d7f293aaeae66 100644 (file)
@@ -19,7 +19,6 @@ echo $this->clear();
                     </div>
 
                     <div class="bloc">
-                        <h2><?php echo __("Actualités"); ?></h2>
                                                <?php echo $this->footerActualites($this->option('actus')); ?>
                                                <div class="social">
                                                        <h2><?php echo __("Suivez-nous"); ?></h2>
@@ -45,7 +44,7 @@ echo $this->clear();
                                                <?php
                                                $fr = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
                                                if (!isset($this->enversion)) {
-                                                       $en = 'http://www.cubedesigners.com/en';
+                                                       $en = 'http://en.cubedesigners.com/en/';
                                                } else {
                                                        $en = $this->enversion;
                                                }
index 8b7fefb6c361638d07e4ecfba7ea58bfae082900..43868fdcd836cb02a74dfc83ed7eef5928f76f85 100644 (file)
@@ -14,12 +14,14 @@ if (!is_null($homepage)) {
                /* LOGO */
 
                echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
-               echo '<div class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></div>';
-
+               if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {
+                       echo '<div class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></div>';
+               } else {
+                       echo '<div class="sublogo"><h2>Cubedesigners</h2><h3>Agence de création sur mesure</h3></div>';
+               }
 
                /* NAVIGATION */
                $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
-
                echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
                ?>
 
index 753fd69de1c1dcf11e3bb150d4ce3827977d1557..d277a15c7be5e8f5aafe03413856a247fbd95536 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 
 $r = CubeIT_Util_Cms::unserialize($this->realisation);
-$this->headTitle($r->titre . ' - ' . $r->legende . ' // ' . $this->currentPage->getParent()->getTitle(), 'SET');
+$this->headTitle($r->titre . ' - ' . $r->legende . ' / ' . $this->currentPage->getParent()->getTitle(), 'SET');
 $this->headSeo()->setDescription($this->realisation->description);
 $this->headOpenGraph()->setDescription($this->realisation->description);
 
index 75ad2d1fc1a32742e668d64b2f22b327e9504af5..7c8391624f64e44a739ac751f0d4d57990296b05 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-$this->headTitle($this->titre . ' // ' . $this->currentPage->getParent()->getTitle() . ' // Cubedesigners', 'SET');
+$this->headTitle($this->titre . ' / ' . $this->currentPage->getParent()->getTitle() . ' // Cubedesigners', 'SET');
 $this->headSeo()->setDescription($this->studie->legende);
 $this->headOpenGraph()->setDescription($this->studie->legende);
 $this->headScript()->addScriptAndStyle('casestudies_detail');
index e849aef7c963ee067ff5ebd6d617e53017625cf0..200d1e6057a40befc1fde01ccc3e910e9ae47c1c 100644 (file)
@@ -3,28 +3,17 @@ $this->headScript()->addScriptAndStyle('agence');
 $this->headScript()->addScriptAndStyle('slideshow');
 echo $this->twocols();
 ?>
+<div class="agency-pictos">
+       <div class="bloc-holder">
+               <?php echo $this->agencyPictos($this->pictos); ?>
+       </div>
+</div>
 
+<div class="agency-photo"><?php echo $this->imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?></div>
 
-<section>
-    <div class="agency-pictos">
-        <div class="bloc-holder">
-                       <?php echo $this->agencyPictos($this->pictos); ?>
-        </div>
-    </div>
-</section>
-
-<section>
-    <div class="agency-photo"><?php echo $this->imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?></div>
-</section>
-
-<section>
-    <div class="agency-persons">
-        <div class="bloc-holder">
-
-            <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
-
-                       <?php echo $this->agencyBlocs($this->equipe); ?>
-
-        </div>
-    </div>
+<section class="agency-persons">
+       <div class="bloc-holder">
+               <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
+               <?php echo $this->agencyBlocs($this->equipe); ?>
+       </div>
 </section>
\ No newline at end of file
index 1da7ac56cc2a1aa8c7180b4d155d5364e0da1630..9726aef91e1ddc5d5a00bf854e56dac99d656038 100644 (file)
         border-radius: 60px;
     }
 }
-
-
-/* max-width pour faibles résolutions */
-@media screen and (max-width: 1009px) {
-
-
-}
\ No newline at end of file
index 7da5f7aefa265e008c40bbb9301f6dde0291fdd5..eee0a7f09835c8c494ff0f7aad57043d084bc62e 100644 (file)
                                }
 
                                .actus{
-                                       height: 262px;
+                                       height:366px;
                                        .actu {
                                                color:#6c6c6c;
                                                padding-bottom: 20px;
 
-                                               .dotclear {
+                                               h3 {
                                                        width:90%;
                                                        font-size:16px;
                                                        line-height:20px;
                        padding:8px 0 0 0;
                }
 
+               .Pinterest{
+                       display:none;
+               }
+
                .Facebook:hover {
                        background-color: #39599f;
                }