From fd57052654f425f6b3f543c9a96d5dbb9b0b04d8 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 8 Sep 2014 15:05:59 +0000 Subject: [PATCH] --- framework/application/forms/CMS/Expertise.php | 2 - .../views/helpers/FooterContact.php | 2 +- .../application/views/helpers/HomeBlocs.php | 80 +++++++------------ framework/application/views/helpers/Liste.php | 4 +- .../views/scripts/templates/casestudies.phtml | 36 +++++---- .../views/scripts/templates/expertises.phtml | 2 +- .../views/scripts/templates/home.phtml | 4 +- .../scripts/templates/realisations.phtml | 39 ++++----- less/common.less | 60 +++++++------- less/footer.less | 31 ++++--- less/list.less | 30 ++++--- less/twocols.less | 25 +----- 12 files changed, 149 insertions(+), 166 deletions(-) diff --git a/framework/application/forms/CMS/Expertise.php b/framework/application/forms/CMS/Expertise.php index 54692a5..54b7c71 100644 --- 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 386ce4b..c02f800 100644 --- 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.='
'; diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php index 7c1b86e..b63e951 100644 --- a/framework/application/views/helpers/HomeBlocs.php +++ b/framework/application/views/helpers/HomeBlocs.php @@ -1,49 +1,31 @@ -'; - - $i = 0; - - foreach ($blocs as $id => $bloc) { - - if (($i % 2) == 0 && $i != 0) { - $res.='
'; - } - - //$image = $this->view->imageProcess($bloc['picto'], $bloc['titre'], 120, 120); - - $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120); - - $res .= '
'; - $res.='
'; - $res.= $image; - $res.= '

' . $bloc['titre'] . '

'; - $res.= '' . $this->view->markupDotclear($bloc['texte']) . ''; - $res.='
'; - $res .= '
'; - - $i++; - } - - $res .= '
'; - - if ($type == "agence") { - $res .= $this->view->linkInternal(__("Découvrez l'agence"), 2); - } - - /* if ($type == "expertises") { - $res .= $this->view->linkInternal(__("Explorez nos expertises"), 5); - } */ - - return $res; - } - -} - -?> +'; + $i = 0; + foreach ($blocs as $id => $bloc) { + if (($i % 2) == 0 && $i != 0) { + $res.='
'; + } + $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120); + $res .= '
'; + $res.= $image; + $res.= '

' . $bloc['titre'] . '

'; + $res.= '
' . $this->view->markupDotclear($bloc['texte']); + if ($displayDetailsButton) { + $res.=$this->view->linkInternal(__('En savoir plus'), $bloc['lien'], array('class' => 'but')); + } + $res.='
'; + $res .= '
'; + $i++; + } + $res .= ''; + return $res; + } + +} diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php index 3840c89..a853fe7 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 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 = '
'; $res.='

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

'; - $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 7726010..95b8739 100644 --- a/framework/application/views/scripts/templates/casestudies.phtml +++ b/framework/application/views/scripts/templates/casestudies.phtml @@ -1,18 +1,20 @@ -headScript()->addScriptAndStyle('casestudies'); -?> - -
markupDotclear($this->titre); ?>
- -
- CategoriesList('casestudies'); - ?> -
- -
- getCMSDatasOfPage($this->id); - echo $this->CasestudiesList($datas); - ?> +headScript()->addScriptAndStyle('casestudies'); +?> + +
+
markupDotclear($this->titre); ?>
+ +
+ CategoriesList('casestudies'); + ?> +
+ +
+ getCMSDatasOfPage($this->id); + echo $this->CasestudiesList($datas); + ?> +
\ 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 792e81d..16ccdb7 100644 --- 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 01c4b13..1eadbae 100644 --- a/framework/application/views/scripts/templates/home.phtml +++ b/framework/application/views/scripts/templates/home.phtml @@ -15,5 +15,5 @@ fb($this->slideshow);
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 471c3ef..ce461b0 100644 --- a/framework/application/views/scripts/templates/realisations.phtml +++ b/framework/application/views/scripts/templates/realisations.phtml @@ -1,19 +1,20 @@ -headScript()->addScriptAndStyle('realisations'); -?> - -
markupDotclear($this->titre); ?>
- -
- CategoriesList("realisations"); - ?> -
- -
- getCMSDatasOfPage($this->id); - echo $this->RealisationsList($datas); - ?> -
- +headScript()->addScriptAndStyle('realisations'); +?> +
+
markupDotclear($this->titre); ?>
+ +
+ CategoriesList("realisations"); + ?> +
+ +
+ getCMSDatasOfPage($this->id); + echo $this->RealisationsList($datas); + ?> +
+
+ diff --git a/less/common.less b/less/common.less index 221c90e..aa81cb6 100644 --- 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 285e1b0..61deea9 100644 --- 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 1c6c2fa..d249074 100644 --- 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 320fe1c..36e5be8 100644 --- 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; -- 2.39.5