From: Vincent Vanwaelscappel Date: Thu, 9 Jan 2025 13:15:25 +0000 (+0100) Subject: wait #7235 @3 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9f87f15deadc6d8746d7351422630a7a7f80a60a;p=bloomsburie.git wait #7235 @3 --- diff --git a/framework/application/views/helpers/AgencyBlocs.php b/framework/application/views/helpers/AgencyBlocs.php index 93f721a..9f71c74 100644 --- 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.='
'; // } - $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 92, 92); + $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], $size, $size); $res.='
'; $res.=''; @@ -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 edd52d1..980cf28 100644 --- 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.='
'; // } // } - $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 df356fe..fe1716f 100644 --- 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 .= '

' . $items['text'] . '

'; + $res .= '

' . nl2br($items['text']) . '

'; } } - $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 34b87e0..71644a5 100644 --- 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 = '
'; + $res = '
'; $res .= '
'; // Replacing
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 84dcd63..ef8c7c0 100644 --- a/framework/application/views/scripts/templates/agence.phtml +++ b/framework/application/views/scripts/templates/agence.phtml @@ -6,18 +6,16 @@ echo $this->intro();
imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?>
-
+ +
- agencyPictos($this->pictos); ?> +

equipe['titre']); ?>

+ agencyBlocs($this->equipe, 120); ?>
-
-
-
-

equipe['titre']); ?>

- agencyBlocs($this->equipe); ?> -
+liste($this->agence, false, array('id' => 'clients', 'class' => 'blue')); ?>
imageSlideshowContinuous($this->photo2, null, array(), array('arrowspermanent' => 1)); ?>
textLayer($this->text); -?> \ No newline at end of file +?> +
diff --git a/less/00-constants.less b/less/00-constants.less index d164bbf..b16ebb8 100644 --- 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 123e19f..cd239b1 100644 --- 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);