From: vincent@cubedesigners.com Date: Mon, 9 Jan 2017 15:24:30 +0000 (+0000) Subject: done #1074 @0:20 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2fc9f932930fbe61484a5f50415ce624166cd826;p=fluidbook-v3.git done #1074 @0:20 --- diff --git a/framework/application/views/helpers/IntroBlock.php b/framework/application/views/helpers/IntroBlock.php index 519aa99..26a34f1 100644 --- a/framework/application/views/helpers/IntroBlock.php +++ b/framework/application/views/helpers/IntroBlock.php @@ -2,7 +2,7 @@ class Fluidbook_View_Helper_IntroBlock extends CubeIT_View_Helper_Abstract { - public function introBlock($intro, $additionnalContent = '', $outsideContent = '') { + public function introBlock($intro, $additionnalContent = '', $outsideContent = '', $paddingTop = true) { $this->addScriptAndStyle('102-intro'); $res = '
'; @@ -17,9 +17,9 @@ class Fluidbook_View_Helper_IntroBlock extends CubeIT_View_Helper_Abstract { $res .= '
'; // .col-2 $res .= ''; // .grid - if ($outsideContent) { - $res .= $outsideContent; - } + if ($outsideContent) { + $res .= $outsideContent; + } $res = $this->backgroundBlock($res, $intro); @@ -27,6 +27,11 @@ class Fluidbook_View_Helper_IntroBlock extends CubeIT_View_Helper_Abstract { $res .= $this->htmlElement($this->htmlElement(nl2br($intro['chapo']), 'div'), 'blockquote'); } - return $this->htmlElement($res, 'section', array('class' => 'intro')); + $attrs = array('class' => array('intro')); + if (!$paddingTop) { + $attrs['class'][] = 'nopad'; + } + + return $this->htmlElement($res, 'section', $attrs); } } \ No newline at end of file diff --git a/framework/application/views/helpers/QuoteForm.php b/framework/application/views/helpers/QuoteForm.php index 1d67d89..09e70ef 100644 --- a/framework/application/views/helpers/QuoteForm.php +++ b/framework/application/views/helpers/QuoteForm.php @@ -2,10 +2,10 @@ class Fluidbook_View_Helper_QuoteForm extends CubeIT_View_Helper_Abstract { - public function quoteForm($formID = null) { + public function quoteForm($formID = null, $paddingTop = false) { - $this->headScript()->addScriptAndStyle('005-fancyselect'); - $this->headScript()->addScriptAndStyle('315-quote'); + $this->headScript()->addScriptAndStyle('005-fancyselect'); + $this->headScript()->addScriptAndStyle('315-quote'); $form = new Fluidbook_Form_RequestQuote(); @@ -13,11 +13,11 @@ class Fluidbook_View_Helper_QuoteForm extends CubeIT_View_Helper_Abstract { $form->setId($formID); $form->setAction($form->getAction() . '/' . $formID); } else { - $formID = $form->getId(); - } + $formID = $form->getId(); + } - $res = '
'; - $res .= '
'; + + $res = '
'; $res .= $this->title($this->option('quote_heading')); $res .= $this->markupDotclear($this->option('quote_description')); $res .= '
'; // .text @@ -25,7 +25,14 @@ class Fluidbook_View_Helper_QuoteForm extends CubeIT_View_Helper_Abstract { $res .= $form; $res .= '
'; $res .= '
'; // .form - $res .= '
'; // .request-quote + + $attrs = array('class' => array('request-quote', 'content-wrapper', 'grid'), + 'id' => $formID . 'Wrapper'); + if ($paddingTop) { + $attrs['class'][] = 'pad'; + } + + return $this->htmlElement($res, 'div', $attrs); return $res; } diff --git a/framework/application/views/scripts/templates/contact.phtml b/framework/application/views/scripts/templates/contact.phtml index 297dc50..b552446 100644 --- a/framework/application/views/scripts/templates/contact.phtml +++ b/framework/application/views/scripts/templates/contact.phtml @@ -6,7 +6,7 @@ $address = $this->option('address'); $locale = new Zend_Locale(); $country = strtoupper($locale->getTranslation($address['pays'], 'Territory')); $content = '
'; -$content .= '

'. $address['company'] .'

'; +$content .= '

' . $address['company'] . '

'; $content .= $address['adresse']; $content .= '
'; $content .= "{$address['code_postal']} {$address['ville']} - $country"; @@ -16,23 +16,25 @@ $content .= '
'; $content .= __('email :') . ' ' . $this->linkEmail($address['email']); $content .= '
'; -$res = '
'; -$res .= $this->introBlock($this->intro, $content); -$res .= '
'; // .contact-intro - +$res = ''; // Request Quote form -$res .= $this->quoteForm(); +$res .= $this->quoteForm(null, true); + +$res .= '
'; +$res .= $this->introBlock($this->intro, $content, '', false); +$res .= '
'; // .contact-intro + // Resellers $res .= '
'; -$res .= '

'. nl2br($this->resellers_title) .'

'; +$res .= '

' . nl2br($this->resellers_title) . '

'; foreach ($this->resellers as $reseller) { - $res .= '
'; - $res .= '

'. $locale->getTranslation($reseller['country'], 'Territory') .'

'; - $res .= $reseller['company']; - $res .= $this->markupDotclear($reseller['details']); - $res .= '
'; // .reseller + $res .= '
'; + $res .= '

' . $locale->getTranslation($reseller['country'], 'Territory') . '

'; + $res .= $reseller['company']; + $res .= $this->markupDotclear($reseller['details']); + $res .= '
'; // .reseller } $res .= '
'; // .resellers diff --git a/less/003-mixins.less b/less/003-mixins.less index e6de962..f21c7a9 100644 --- a/less/003-mixins.less +++ b/less/003-mixins.less @@ -132,7 +132,6 @@ .longarrow-button(@padding-vertical: 18px, @padding-horizontal: 40px, @offset: 20px, @offset-arrow: -5px) { - padding: @padding-vertical @padding-horizontal; position: relative; transition: padding @transition-time-buttons; @@ -171,4 +170,30 @@ font-size: 1.2em; margin-top: -0.05em; } +} + +.intro-padding() { + padding-top: 200px; + @media @m1280 { + padding-top: 120px; + } + @media @m900 { + padding-top: 100px; + } + @media @m768 { + padding-top: 80px; + } +} + +.intro-no-padding() { + padding-top: 0; + @media @m1280 { + padding-top: 0; + } + @media @m900 { + padding-top: 0; + } + @media @m768 { + padding-top: 0; + } } \ No newline at end of file diff --git a/less/102-intro.less b/less/102-intro.less index 7168496..32ab113 100644 --- a/less/102-intro.less +++ b/less/102-intro.less @@ -3,20 +3,20 @@ .intro { color: #151e28; + &.nopad { + .content-wrapper { + .intro-no-padding(); + } + } + .content-wrapper { + .intro-padding(); background-size: 100% auto; background-position: 100% 100%; - //padding-top: 152px; // Minimum clearance and top for fixed menu - padding-top: 200px; - - @media @m1280 { - padding-top: 120px; - } @media @m900 { padding-bottom: 85%; background-size: 180% auto; // This value needs to be synced with 410-features.js for resizeVideoLink() - padding-top: 100px; text-align: center; .title { @@ -27,10 +27,6 @@ text-align: left; } } - - @media @m768 { - padding-top: 80px; - } } blockquote { diff --git a/less/315-quote.less b/less/315-quote.less index 2bf35ed..ecfe5dd 100644 --- a/less/315-quote.less +++ b/less/315-quote.less @@ -5,6 +5,10 @@ // Request a quote section .request-quote { + &.pad { + .intro-padding(); + } + @media @m1024 { flex-wrap: wrap; }