wait #7235 @3

diff --git a/framework/application/views/helpers/AgencyBlocs.php b/framework/application/views/helpers/AgencyBlocs.php
index 93f721a0b4616c89a3da0a31e4b4788984125f9e..9f71c74d87e40c48f0ad90efb37c2837fbec2608 100644 (file)
--- a/framework/application/views/helpers/AgencyBlocs.php
+++ b/framework/application/views/helpers/AgencyBlocs.php
@@ -2,7 +2,7 @@
 
 class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
 
-       public function agencyBlocs($blocs) {
+       public function agencyBlocs($blocs,$size=92) {
 
                $blocs = $blocs['blocs'];
 
@@ -16,7 +16,7 @@ class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
 //                             $res.='<div class="spacer"></div>';
 //                     }
 
-                       $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 92, 92);
+                       $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], $size, $size);
 
                        $res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';
                        $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';
@@ -33,6 +33,4 @@ class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
                return $res;
        }
 
-}
-
-?>
+}
\ No newline at end of file

diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php
index edd52d13698e0e82e5aed8702e85613fcdddaabf..980cf2810fb65e3d97c2f16b95fd436e9838c7d5 100644 (file)
--- a/framework/application/views/helpers/HomeBlocs.php
+++ b/framework/application/views/helpers/HomeBlocs.php
@@ -2,7 +2,7 @@
 
 class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
 
-       public function homeBlocs($blocs, $displayDetailsButton = false, $cols = 2) {
+       public function homeBlocs($blocs, $displayDetailsButton = false, $cols = 2,$pictoSize=92) {
 
                $blocs = $blocs['blocs'];
 
@@ -14,7 +14,7 @@ class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
 //                                     $res.='<div class="spacer"></div>';
 //                             }
 //                     }
-                       $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 92, 92);
+                       $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], $pictoSize, $pictoSize);
 
             if(!empty($bloc['lien'])) {
                 $image = $this->view->linkInternal($image, $bloc['lien']);

diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php
index df356fe7cded0b0a54cd788ceac1bcf01c873abe..fe1716f478d00a151566b2223f1194b7d2cecb48 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 CubeIT_View_Helper_Abstract {
 
-       public function liste($items, $displayDetailsButtons = false, $attrs = array(), $cols = 2) {
+       public function liste($items, $displayDetailsButtons = false, $attrs = array(), $cols = 2,$pictoSize=92) {
                $defaultAttrs = array('class' => array('list'));
                $attrs = $this->_mergeAttributes($defaultAttrs, $attrs);
 
@@ -22,10 +22,10 @@ class Cubedesigners_View_Helper_Liste extends CubeIT_View_Helper_Abstract {
             }
 
             if($items['text']) {
-                $res .= '<p>' . $items['text'] . '</p>';
+                $res .= '<p>' . nl2br($items['text']) . '</p>';
             }
                }
-               $res .= $this->view->homeBlocs($items, $displayDetailsButtons, $cols);
+               $res .= $this->view->homeBlocs($items, $displayDetailsButtons, $cols,$pictoSize);
                if ($items['button']['label']) {
             $items['button']['label'] = $this->linkArrow($items['button']['label']);
                        $res .= $this->view->linkCMS($items['button'], array('class' => 'animated-arrow'));

diff --git a/framework/application/views/helpers/TextLayer.php b/framework/application/views/helpers/TextLayer.php
index 34b87e08fd3d3fdae95927c43ef8c4ceae0afb2b..71644a5b9d1730e6505c9f0851d99ad0671c1ea3 100644 (file)
--- a/framework/application/views/helpers/TextLayer.php
+++ b/framework/application/views/helpers/TextLayer.php
@@ -6,7 +6,7 @@ class Cubedesigners_View_Helper_TextLayer extends Zend_View_Helper_Abstract
     public function textLayer($text)
     {
         $this->view->headLink()->appendStylesheet('/less/twocols.less');
-        $res = '<div class="twocols content">';
+        $res = '<div class="title twocols content">';
         $res .= '<section>';
 
         // Replacing <br /> tags with normal line breaks to allow for more flexible styling via CSS white-space

diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml
index 84dcd6371b8f5917d7e289b1ce7e75c2215a5564..ef8c7c0c28ae807d9bb96cf6d44b060a0f8519ce 100644 (file)
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -6,18 +6,16 @@ echo $this->intro();
 
 
 <div class="agency-photo mb-4vw"><?php echo $this->imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?></div>
-<div class="agency-pictos mb-4vw">
+
+<section class="agency-persons mb-4vw">
     <div class="bloc-holder content">
-        <?php echo $this->agencyPictos($this->pictos); ?>
+        <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
+        <?php echo $this->agencyBlocs($this->equipe, 120); ?>
     </div>
-</div>
-<section class="agency-persons mb-4vw">
-       <div class="bloc-holder content">
-               <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
-               <?php echo $this->agencyBlocs($this->equipe); ?>
-       </div>
 </section>
+<?php echo $this->liste($this->agence, false, array('id' => 'clients', 'class' => 'blue')); ?>
 <div class="agency-photo mb-4vw"><?php echo $this->imageSlideshowContinuous($this->photo2, null, array(), array('arrowspermanent' => 1)); ?></div>
 <?php
 echo $this->textLayer($this->text);
-?>
\ No newline at end of file
+?>
+<div class="spacer" style="padding-top:50px;"></div>

diff --git a/less/00-constants.less b/less/00-constants.less
index d164bbfcf65aa7b29b8555afc7982064bb94de20..b16ebb84d1f559d15e0dd19130b1479c4e7bd20f 100644 (file)
--- a/less/00-constants.less
+++ b/less/00-constants.less
@@ -7,6 +7,7 @@
 
 @yellow: #469ef6;
 @black: #242323;
+@blue: #0d4d8e;
 
 @import "01-mixins";
 @import "02-utilities";

diff --git a/less/agence.less b/less/agence.less
index 123e19f50c1460d639145b7e1f3f376654713c74..cd239b1e56cb0167aeb06d94be1695156ec335c6 100644 (file)
--- a/less/agence.less
+++ b/less/agence.less
@@ -5,6 +5,8 @@
 
 .agency-pictos {
        /* Agence pictos */
+       background-color: @blue;
+       color:#fff;
        .bloc-holder {
                overflow: hidden;
 
@@ -19,7 +21,7 @@
        article {
                display: inline-block;
                vertical-align: top;
-               width: 33%;
+               width: 50%;
                padding-right: 20px;
                margin: 25px 0;
                text-align: left;
@@ -80,12 +82,11 @@
        }
 
        h2 {
-               font-size: 56px;
+               font-size: 30px;
        }
 
        h3 {
-               font-size: 32px;
-               padding: 0 0 20px 0;
+               font-size: 30px;
        }
 
        .blocs {
@@ -96,6 +97,13 @@
                display: none;
        }
 
+       .poste{
+               display: block;
+               font-size: 20px;
+               font-weight: 600;
+               padding-bottom: 10px;
+       }
+
        .sousbloc {
 
                &:extend(.media);