(no commit message)

diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index ef11d67feeb8bcf5e17919456b895d97a5416cc9..386ce4bcb8017ee4ba9f7b9190ae782afd51aee0 100644 (file)
--- a/framework/application/views/helpers/FooterContact.php
+++ b/framework/application/views/helpers/FooterContact.php
@@ -1,45 +1,45 @@
-<?php\r
-\r
-class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract {\r
-\r
-    public function footerContact($contact) {\r
-\r
-        $res = '<div class="contact-texte">' . $this->view->markupDotclear($contact['bloc']) . '</div>';\r
-\r
-        //fb($contact['bureau']);\r
-\r
-        $bureaux = $contact['bureaux'];\r
-\r
-        foreach ($bureaux as $id => $bureau) {\r
-\r
-            $res.='<div class="bureau" itemscope itemtype="http://schema.org/LocalBusiness">';\r
-\r
-            $res.='<p class="titre" itemprop="name">' . $bureau['coordonnees']['nom'] . '<p>';\r
-\r
-            $res.='<div class="numeros">';\r
-            $res.='<p itemprop="telephone">' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel']) . '</p>';\r
-            $res.='<p itemprop="faxNumber">' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';\r
-            $res.='</div>';\r
-\r
-            //$res.= $this->view->microdataPlace($bureau['coordonnees']['adresse']);\r
-\r
-            $res.='<div class="adresse" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';\r
-            $res.='<p>' . __('Cubedesigners') . '</p>';\r
-            $res.='<p itemprop="streetAddress">' . $bureau['coordonnees']['adresse'] . '</p>';\r
-            $res.='<p><span itemprop="postalCode">' . $bureau['coordonnees']['code_postal'] . '</span> <span itemprop="addressLocality">' . $bureau['coordonnees']['ville'] . '</span></p>';\r
-            $res.='<p itemprop="addressCountry">' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '<p>';\r
-            $res.='</div>';\r
-\r
-            $res.='<div class="geoloc">';\r
-            $res.=$this->view->linkGeo(__("Plan d'accès"), $bureau['coordonnees']['adresse'] . ',' . $bureau['coordonnees']['ville'] . ',' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory'));\r
-            $res.='</div>';\r
-\r
-            $res.='</div>';\r
-        }\r
-\r
-        return $res;\r
-    }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract {
+
+       public function footerContact($contact) {
+
+               $res = '<div class="contact-texte">' . $this->view->markupDotclear($contact['bloc']) . '</div>';
+
+               //fb($contact['bureau']);
+
+               $bureaux = $contact['bureaux'];
+
+               foreach ($bureaux as $id => $bureau) {
+
+                       $res.='<div class="bureau" itemscope itemtype="http://schema.org/LocalBusiness">';
+
+                       $res.='<p class="titre" itemprop="name">' . $bureau['coordonnees']['nom'] . '<p>';
+
+                       $res.='<div class="numeros">';
+                       $res.='<p itemprop="telephone">' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel']) . '</p>';
+                       $res.='<p itemprop="faxNumber">' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';
+                       $res.='</div>';
+
+                       //$res.= $this->view->microdataPlace($bureau['coordonnees']['adresse']);
+
+                       $res.='<div class="adresse" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+                       $res.='<p>' . __('Cubedesigners') . '</p>';
+                       $res.='<p itemprop="streetAddress">' . $bureau['coordonnees']['adresse'] . '</p>';
+                       $res.='<p><span itemprop="postalCode">' . $bureau['coordonnees']['code_postal'] . '</span> <span itemprop="addressLocality">' . $bureau['coordonnees']['ville'] . '</span></p>';
+                       $res.='<p itemprop="addressCountry">' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '<p>';
+                       $res.='</div>';
+
+                       $res.='<div class="geoloc">';
+                       $res.=$this->view->linkGeo(__("Plan d'accès"), $bureau['coordonnees']['adresse'] . ',' . $bureau['coordonnees']['ville'] . ',' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory'), array('class' => 'but'));
+                       $res.='</div>';
+
+                       $res.='</div>';
+               }
+
+               return $res;
+       }
+
+}
+
+?>

diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php
index 79501eb946267220aff5fbe5ec01264c39b176fb..3840c890638dc999db4f7afd9361ebc281f0419f 100644 (file)
--- a/framework/application/views/helpers/Liste.php
+++ b/framework/application/views/helpers/Liste.php
@@ -11,6 +11,9 @@ class Cubedesigners_View_Helper_Liste extends Zend_View_Helper_Abstract {
                $res = '<div class="bloc-holder">';
                $res.='<h2>' . ucfirst($items['titre']) . '</h2>';
                $res.=$this->view->homeBlocs($items);
+               if ($items['button']['label']) {
+                       $res.=$this->view->linkCMS($items['button'], array('class' => 'but'));
+               }
                $res.='</div>';
 
                return $this->view->htmlElement($res, 'section', $attrs);

diff --git a/less/common.less b/less/common.less
index c55bdcd2696a0015e8f6c00b00dbb5e5bcb5f050..221c90e67011cc329922032bced65a80b740faf5 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -4,6 +4,8 @@
        font-weight: 300;
 }
 
+
+
 .content,.cubeit-content{
        width:980px;
        margin:0 auto;
@@ -15,6 +17,12 @@ body {
     font-size:16px;
     font-weight:300;
     color:#1b1b1b;
+       opacity:0;
+       transition:opacity 0.5s linear;
+}
+
+.wf-active body{
+       opacity:1;
 }
 
 h1, h2 {
@@ -31,6 +39,23 @@ a:active {
        color:#3885e0;
 }
 
+a.but {
+       display: inline-block;
+       color:#fff;
+       clear:both;
+       border-radius: 2px;
+       padding: 10px 15px 12px;
+       line-height:12px;
+       margin:15px 0 0 0;
+       font-weight:400;
+       font-size:16px;
+       &:hover,&.active {
+               background-color: #84ae1e !important;
+               color:#fff !important;
+       }
+}
+
+
 #main{
        ul{
                list-style:none;

diff --git a/less/footer.less b/less/footer.less
index 913cbbf8a524dd783bbe4213fc288a7056407e0a..285e1b040b4b1395b051ee5700e4c5c750bcf0c4 100644 (file)
--- a/less/footer.less
+++ b/less/footer.less
@@ -28,7 +28,7 @@
                                }
 
                                .actus{
-                                       height: 255px;
+                                       height: 262px;
                                        .actu {
                                                color:#6c6c6c;
                                                padding-bottom: 20px;
@@ -72,19 +72,12 @@
                }
                .geoloc {
                        padding-top : 30px;
-                       a {
+                       a.but {
                                background-color: #191919;
-                               border-radius: 2px;
-                               padding: 5px 20px;
                                color:#6c6c6c;
-                               &:hover,&.active{
-                                       background-color: #84ae1e;
-                                       color:#fff;
-                               }
+                               margin:0;
                        }
                }
-
-
        }
 
 
@@ -105,14 +98,12 @@
                .Facebook:hover {
                        background-color: #39599f;
                }
-
                .Twitter:hover {
                        background-color: #45b0e3;
                }
                .Google:hover {
                        background-color: #e64405;
                }
-
                .Pinterest:hover {
                        background-color: #ca111a;
                }

diff --git a/less/list.less b/less/list.less
index 1b8fc38de85b7a77fa541a37e0be5c9146ac95bc..1c6c2fa049bdaeae4e6c9cd566ad344e330181bf 100644 (file)
--- a/less/list.less
+++ b/less/list.less
@@ -25,15 +25,8 @@ section.list{
                        font-size:32px;
                        padding: 0 0 20px 0;
                }
-               a {
-                       color:white;
-                       clear:both;
+               a.but {
                        background-color: #2874ce;
-                       border-radius: 2px;
-                       padding: 5px 20px;
-                       :hover {
-                               background-color: #84ae1e;
-                       }
                }
 
                .blocs {
@@ -58,7 +51,6 @@ section.list{
                                float:left;
                                padding: 0 25px 0 0;
                        }
-
                }
        }
 }
\ No newline at end of file