(no commit message)

diff --git a/framework/application/forms/CMS/Expertise.php b/framework/application/forms/CMS/Expertise.php
index 54692a5c22475e050cab49f829d390a50238a49c..54b7c7154217c484a048260695a0546dd8e65a13 100644 (file)
--- a/framework/application/forms/CMS/Expertise.php
+++ b/framework/application/forms/CMS/Expertise.php
@@ -3,5 +3,3 @@
 class Cubedesigners_Form_CMS_Expertise extends Cubedesigners_Form_CMS {
 
 }
-
-?>

diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index 386ce4bcb8017ee4ba9f7b9190ae782afd51aee0..c02f8009ab7f9ed6005d69fcf2476257eedfcb7c 100644 (file)
--- a/framework/application/views/helpers/FooterContact.php
+++ b/framework/application/views/helpers/FooterContact.php
@@ -10,7 +10,7 @@ class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract
 
                $bureaux = $contact['bureaux'];
 
-               foreach ($bureaux as $id => $bureau) {
+               foreach ($bureaux as $bureau) {
 
                        $res.='<div class="bureau" itemscope itemtype="http://schema.org/LocalBusiness">';
 

diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php
index 7c1b86e453034fcbe81a9fc96a3b292cf4bc955a..b63e951a7bc9a44fca1a7dabd4f70bf09c986a09 100644 (file)
--- a/framework/application/views/helpers/HomeBlocs.php
+++ b/framework/application/views/helpers/HomeBlocs.php
@@ -1,49 +1,31 @@
-<?php\r
-\r
-class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {\r
-\r
-    public function homeBlocs($blocs, $type) {\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($bloc['picto'], $bloc['titre'], 120, 120);\r
-\r
-            $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120);\r
-\r
-            $res .= '<article>';\r
-            $res.='<div class="sousbloc">';\r
-            $res.= $image;\r
-            $res.= '<h3>' . $bloc['titre'] . '</h3>';\r
-            $res.= '<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';\r
-            $res.='</div>';\r
-            $res .= '</article>';\r
-\r
-            $i++;\r
-        }\r
-\r
-        $res .= '</div>';\r
-\r
-        if ($type == "agence") {\r
-            $res .= $this->view->linkInternal(__("Découvrez l'agence"), 2);\r
-        }\r
-\r
-        /* if ($type == "expertises") {\r
-          $res .= $this->view->linkInternal(__("Explorez nos expertises"), 5);\r
-          } */\r
-\r
-        return $res;\r
-    }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
+
+       public function homeBlocs($blocs, $displayDetailsButton = false) {
+
+               $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->imageCms($bloc['picto'], $bloc['titre'], 120, 120);
+                       $res .= '<article class="sousbloc">';
+                       $res.= $image;
+                       $res.= '<h3>' . $bloc['titre'] . '</h3>';
+                       $res.= '<div class="text">' . $this->view->markupDotclear($bloc['texte']);
+                       if ($displayDetailsButton) {
+                               $res.=$this->view->linkInternal(__('En savoir plus'), $bloc['lien'], array('class' => 'but'));
+                       }
+                       $res.='</div>';
+                       $res .= '</article>';
+                       $i++;
+               }
+               $res .= '</div>';
+               return $res;
+       }
+
+}

diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php
index 3840c890638dc999db4f7afd9361ebc281f0419f..a853fe748d2bbc3b601a1e59227c350872ea2efd 100644 (file)
--- a/framework/application/views/helpers/Liste.php
+++ b/framework/application/views/helpers/Liste.php
@@ -2,7 +2,7 @@
 
 class Cubedesigners_View_Helper_Liste extends Zend_View_Helper_Abstract {
 
-       public function liste($items, $attrs = array()) {
+       public function liste($items, $displayDetailsButtons = false, $attrs = array()) {
 
                $defaultAttrs = array('class' => array('list'));
                $attrs = array_merge($defaultAttrs, $attrs);
@@ -10,7 +10,7 @@ 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>';
-               $res.=$this->view->homeBlocs($items);
+               $res.=$this->view->homeBlocs($items, $displayDetailsButtons);
                if ($items['button']['label']) {
                        $res.=$this->view->linkCMS($items['button'], array('class' => 'but'));
                }

diff --git a/framework/application/views/scripts/templates/casestudies.phtml b/framework/application/views/scripts/templates/casestudies.phtml
index 772601078fd32feec0699dc85d9136510febc3ec..95b8739eda678247498be1437842cc9eac915fd7 100644 (file)
--- a/framework/application/views/scripts/templates/casestudies.phtml
+++ b/framework/application/views/scripts/templates/casestudies.phtml
@@ -1,18 +1,20 @@
-<?php\r
-$this->headScript()->addScriptAndStyle('casestudies');\r
-?>\r
-\r
-<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
-\r
-<div id="casestudies-tagslist">\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
+$this->headScript()->addScriptAndStyle('casestudies');
+?>
+
+<div class="content">
+       <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+       <div id="casestudies-tagslist">
+               <?php
+               echo $this->CategoriesList('casestudies');
+               ?>
+       </div>
+
+       <div id="casestudies-list">
+               <?php
+               $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);
+               echo $this->CasestudiesList($datas);
+               ?>
+       </div>
 </div>
\ No newline at end of file

diff --git a/framework/application/views/scripts/templates/expertises.phtml b/framework/application/views/scripts/templates/expertises.phtml
index 792e81dd17cb1a7278eea1b81e1f6756937509c5..16ccdb79cc2ac4b775fa5403b5a2964afbe720cf 100644 (file)
--- a/framework/application/views/scripts/templates/expertises.phtml
+++ b/framework/application/views/scripts/templates/expertises.phtml
@@ -3,4 +3,4 @@
 $this->headScript()->addScriptAndStyle('expertises');
 echo $this->twocols();
 echo $this->htmlElement(nl2br($this->citation), 'blockquote', array('class' => 'citation'));
-echo $this->liste($this->expertises, array('id' => 'expertises'));
+echo $this->liste($this->expertises, true, array('id' => 'expertises'));

diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 01c4b137de46db6a35e3edd5814d264b8fa93c60..1eadbae719c608f9d69c150784c1d662113bc456 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -15,5 +15,5 @@ fb($this->slideshow);
     </div>
 </section>
 <?php
-echo $this->liste($this->agence, array('id' => 'agency'));
-echo $this->liste($this->expertises, array('id' => 'expertiseshome'));
+echo $this->liste($this->agence, false, array('id' => 'agency'));
+echo $this->liste($this->expertises, false, array('id' => 'expertiseshome'));

diff --git a/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml
index 471c3ef8ecc034ad5765baceb219f141a5a4b280..ce461b0aac75d72286b077243d718b67d803f610 100644 (file)
--- a/framework/application/views/scripts/templates/realisations.phtml
+++ b/framework/application/views/scripts/templates/realisations.phtml
@@ -1,19 +1,20 @@
-<?php\r
-$this->headScript()->addScriptAndStyle('realisations');\r
-?>\r
-\r
-<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
-\r
-<div id="realisations-tagslist">\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
-</div>\r
-\r
+<?php
+$this->headScript()->addScriptAndStyle('realisations');
+?>
+<div class="content">
+       <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+       <div id="realisations-tagslist">
+               <?php
+               echo $this->CategoriesList("realisations");
+               ?>
+       </div>
+
+       <div id="realisations-list">
+               <?php
+               $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);
+               echo $this->RealisationsList($datas);
+               ?>
+       </div>
+</div>
+

diff --git a/less/common.less b/less/common.less
index 221c90e67011cc329922032bced65a80b740faf5..aa81cb61782f0e2de6446ffc2e9ac695004f7168 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -1,11 +1,5 @@
 @roboto: 'Roboto Condensed', sans-serif;
 
-* {
-       font-weight: 300;
-}
-
-
-
 .content,.cubeit-content{
        width:980px;
        margin:0 auto;
@@ -18,16 +12,20 @@ body {
     font-weight:300;
     color:#1b1b1b;
        opacity:0;
-       transition:opacity 0.5s linear;
+       letter-spacing: -0.01em;
+       transition:opacity 0.25s linear;
 }
 
 .wf-active body{
        opacity:1;
 }
 
-h1, h2 {
+h1,h2,h3,h4,h5,h6 {
     font-weight: 300;
 }
+strong,b{
+       font-weight: 400;
+}
 
 a {
        text-decoration: none;
@@ -57,6 +55,16 @@ a.but {
 
 
 #main{
+       margin: 0 auto;
+    overflow:hidden;
+
+       .main-holder {
+               min-width: 950px;
+               max-width: 1140px;
+               width:100%;
+               margin: 0 auto;
+               padding: 0px 20px 50px 20px;
+       }
        ul{
                list-style:none;
                li{
@@ -67,24 +75,20 @@ a.but {
        }
 }
 
-
-#main {
-    margin: 0 auto;
-    //min-width: 1024px;
-    //max-width: 1200px;
-    width:100%;
-    overflow:hidden;
-}
-
-#main .main-holder {
-    min-width: 950px;
-    max-width: 1140px;
-    width:100%;
-    margin: 0 auto;
-    padding: 0px 20px 50px 20px;
-}
-
-#wrapper {
-
+.title {
+       width: 980px;
+       margin: 0 auto;
+       padding: 40px 0 0 0;
+       h1 {
+               text-align: left;
+               font-weight: 300;
+               font-size: 56px;
+               margin:0 0 10px 0;
+       }
+       h2 {
+               text-align: left;
+               font-weight: 300;
+               font-size: 22px;
+               padding:0 0 20px 0;
+       }
 }
-

diff --git a/less/footer.less b/less/footer.less
index 285e1b040b4b1395b051ee5700e4c5c750bcf0c4..61deea9f9e7ce1593883070dfc311a4054d4c7ca 100644 (file)
--- a/less/footer.less
+++ b/less/footer.less
@@ -1,19 +1,20 @@
 #footer {
-
        .footer-top {
                padding:50px 0 0 0;
                background-color: #282828;
                .footer-top-content {
-                       min-width: 980px;
-                       max-width: 980px;
-                       width:100%;
+                       width:980px;
                        margin: 0 auto;
                        overflow: hidden;
                        padding-bottom:50px;
+                       white-space:nowrap;
                        .bloc {
-                               float: left;
-                               //max-width: 490px;
-                               width: 50%;
+                               display: inline-block;
+                               white-space: normal;
+                               vertical-align:top;
+                               width:470px;
+                               margin:0 40px 0 0;
+
                                h2 {
                                        color:#fff;
                                        font-size:56px;
@@ -32,6 +33,7 @@
                                        .actu {
                                                color:#6c6c6c;
                                                padding-bottom: 20px;
+
                                                .dotclear {
                                                        width:90%;
                                                }
@@ -44,9 +46,13 @@
                                                }
                                                .texte {
                                                        font-size:16px;
+                                                       line-height:20px;
                                                }
                                        }
                                }
+                               &:last-child{
+                                       margin-right: 0;
+                               }
                        }
                }
        }
@@ -60,9 +66,16 @@
                padding-bottom: 50px;
        }
        .bureau {
-               float:left;
-               width:50%;
+               display:inline-block;
+               width: 214px;
+               vertical-align: top;
                color:#6c6c6c;
+               margin:0 42px 0 0;
+               &:last-child{
+                       margin-right: 0;
+               }
+
+
                .titre,.numeros {
                        padding-bottom: 20px;
                }

diff --git a/less/list.less b/less/list.less
index 1c6c2fa049bdaeae4e6c9cd566ad344e330181bf..d249074ff6ea65b9ed72e2aac65f9133587f675d 100644 (file)
--- a/less/list.less
+++ b/less/list.less
@@ -32,25 +32,29 @@ section.list{
                .blocs {
                        padding: 40px 0;
                        overflow:hidden;
+                       white-space:nowrap;
                        .spacer {
                                clear:left;
                                padding:25px 0;
                        }
-               }
-
-               .sousbloc {
-                       float:left;
-                       width:50%;
-
-                       .texte {
-                               width: 60%;
-                               float:left;
-                       }
 
-                       img {
-                               float:left;
-                               padding: 0 25px 0 0;
+                       .sousbloc {
+                               white-space: normal;
+                               display:inline-block;
+                               width:470px;
+                               margin:0 40px 0 0;
+
+                               .text {
+                                       width: 60%;
+                                       float:left;
+                               }
+                               img {
+                                       float:left;
+                                       padding: 0 25px 0 0;
+                               }
                        }
                }
+
+
        }
 }
\ No newline at end of file

diff --git a/less/twocols.less b/less/twocols.less
index 320fe1ca93a177c02bb2072faf40050cf8f0d301..36e5be85fa174544379797494b7ea3d934d50769 100644 (file)
--- a/less/twocols.less
+++ b/less/twocols.less
@@ -1,25 +1,4 @@
 .twocols{
-
-       .title {
-               min-width: 980px;
-               max-width: 980px;
-               margin: 0 auto;
-               padding: 40px 0 0 0;
-               h1 {
-                       text-align: left;
-                       font-weight: 300;
-                       font-size: 56px;
-                       margin:0 0 10px 0;
-               }
-               h2 {
-                       text-align: left;
-                       font-weight: 300;
-                       font-size: 22px;
-                       padding:0 0 20px 0;
-               }
-       }
-
-
        .dotclear{
                p{
                        margin:30px 0 30px 0;
@@ -45,8 +24,8 @@
                .col {
                        white-space: normal;
                        display:inline-block;
-                       width:465px;
-                       margin:0 50px 0 0 ;
+                       width:470px;
+                       margin:0 40px 0 0 ;
                        vertical-align: top;
                        &:last-child{
                                margin:0;