From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 8 Sep 2014 13:39:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d3ceb8a17e1f5e12569652cc06e769145d4b907f;p=cubedesigners-v7.git

---

diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index ef11d67..386ce4b 100644
--- a/framework/application/views/helpers/FooterContact.php
+++ b/framework/application/views/helpers/FooterContact.php
@@ -1,45 +1,45 @@
-<?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'));
-            $res.='</div>';
-
-            $res.='</div>';
-        }
-
-        return $res;
-    }
-
-}
-
-?>
+<?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 79501eb..3840c89 100644
--- 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 c55bdcd..221c90e 100644
--- 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 913cbbf..285e1b0 100644
--- 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 1b8fc38..1c6c2fa 100644
--- 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