From 3b16ab0cb0bf74f31247b93a63b69744be347b0b Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 28 Jul 2015 10:11:24 +0000 Subject: [PATCH] Update logo Update home layers Update footer emal logo Add merge attribute function for view helpers --- framework/application/views/helpers/Liste.php | 13 +- .../views/scripts/templates/home.phtml | 4 +- images/logo.svg | 451 +++--------------- images/picto_footer_mail.png | Bin 964 -> 0 bytes images/picto_footer_mail.svg | 2 +- less/00-constants.less | 8 +- less/admin.less | 2 +- less/bannerCookies.less | 2 +- less/header.less | 3 +- less/list.less | 17 +- 10 files changed, 83 insertions(+), 419 deletions(-) delete mode 100644 images/picto_footer_mail.png diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php index 26cbb9f..266af9e 100644 --- a/framework/application/views/helpers/Liste.php +++ b/framework/application/views/helpers/Liste.php @@ -1,22 +1,21 @@ array('list')); - $attrs = array_merge($defaultAttrs, $attrs); + $attrs = $this->_mergeAttributes($defaultAttrs, $attrs); $this->view->headLink()->appendStylesheet('/less/list.less'); $res = '
'; if ($items['titre']) { - $res.='

' . ucfirst($items['titre']) . '

'; + $res .= '

' . ucfirst($items['titre']) . '

'; } - $res.=$this->view->homeBlocs($items, $displayDetailsButtons, $cols); + $res .= $this->view->homeBlocs($items, $displayDetailsButtons, $cols); if ($items['button']['label']) { - $res.=$this->view->linkCMS($items['button'], array('class' => 'but')); + $res .= $this->view->linkCMS($items['button'], array('class' => 'but')); } - $res.='
'; + $res .= ''; return $this->view->htmlElement($res, 'section', $attrs); } diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml index e8d15ef..acf4c44 100644 --- a/framework/application/views/scripts/templates/home.phtml +++ b/framework/application/views/scripts/templates/home.phtml @@ -2,5 +2,5 @@ $this->headScript()->addScriptAndStyle('home'); $this->beforeMain = $this->homeSlideshow($this->slideshow); -echo $this->liste($this->agence, false, array('id' => 'agency')); -echo $this->liste($this->expertises, false, array('id' => 'expertiseshome')); +echo $this->liste($this->agence, false, array('id' => 'agency', 'class' => 'white')); +echo $this->liste($this->expertises, false, array('id' => 'expertiseshome', 'class' => 'grey')); diff --git a/images/logo.svg b/images/logo.svg index 6d55e53..a5710f6 100644 --- a/images/logo.svg +++ b/images/logo.svg @@ -1,405 +1,62 @@ - - - -