From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 25 Nov 2014 13:33:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=af1a05b0b77d22e085783b2013167f25f08b24f3;p=cubedesigners-v7.git

---

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index e402a3e..3f098d0 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,7 +1,7 @@
 [production]
-dev = false
+dev = true
 
-minify.js = false
+minify.js = true
 minify.css = true
 
 bin.mysqldump = /usr/bin/mysqldump
diff --git a/framework/application/configs/settings.ini b/framework/application/configs/settings.ini
index d46c1f4..0a3683f 100644
--- a/framework/application/configs/settings.ini
+++ b/framework/application/configs/settings.ini
@@ -1,8 +1,9 @@
 [production]
+localesEnabled.0 = "fr"
 tags = ""
-longTitle.fr = "Cubedesigners"
+longTitle.fr = "Cubedesigners // Agence de design global // Graphisme, web, design produit // Paris Montpellier"
 longTitle.en = ""
-description.fr = ""
+description.fr = "Cubedesigners est une agence de Design global : graphisme, sites internet et design produit située à Paris et Montpellier."
 description.en = ""
 contact.fr.bloc = "Pour toute information,
 un email unique : [contact@cubedesigners.com|mailto:contact@cubedesigners.com]
@@ -112,12 +113,12 @@ contact.en.bureaux.1.markers.1.pays = "FR"
 contact.en.bureaux.1.markers.1.tel = ""
 contact.en.bureaux.1.markers.1.fax = ""
 contact.en.bureaux.1.markers.1.icon = false
-actus.fr.actualites.0.date = "2013-11-21 00:00:00"
-actus.fr.actualites.0.texte = "Cubedesigners réalise le graphisme de l’exposition Mars pour la Cité de l’espace."
-actus.fr.actualites.1.date = "2013-07-16 00:00:00"
-actus.fr.actualites.1.texte = "Nous sommes fiers de vous présenter la boutique Fnac Disney Infinity !"
-actus.fr.actualites.2.date = "2013-07-07 00:00:00"
-actus.fr.actualites.2.texte = "Hercules lance la webcam HD Twist, design Cubedesigners. une webcam mini au pied original : flexible, en silicone tendre, elle se fixe partout !"
+actus.fr.actualites.0.date = "2014-11-21 00:00:00"
+actus.fr.actualites.0.texte = "Bienvenue sur notre nouveau site !"
+actus.fr.actualites.1.date = "2014-11-12 00:00:00"
+actus.fr.actualites.1.texte = "Cubedesigners réalise les supports de communication de la Cité de l'espace pour la journée d’atterrissage de Philae sur la comète Tchouri."
+actus.fr.actualites.2.date = "2014-04-26 00:00:00"
+actus.fr.actualites.2.texte = "Nouvelle exposition pour la Cité de l’espace à Toulouse : Explorations extrêmes."
 actus.en.actualites.0.date = "2014-01-20 12:19:32"
 actus.en.actualites.0.texte = ""
 actus.en.actualites.1.date = "2014-01-20 12:19:32"
@@ -129,28 +130,41 @@ actus.en.actualites.3.texte = ""
 actus.en.actualites.4.date = "2014-01-20 12:19:32"
 actus.en.actualites.4.texte = ""
 followus.fr.reseauxsociaux.0.titre = "Facebook"
-followus.fr.reseauxsociaux.0.url = "https://fr-fr.facebook.com/Cubedesigners"
+followus.fr.reseauxsociaux.0.url = "https://facebook.com/Cubedesigners"
+followus.fr.reseauxsociaux.0.color = "#39599f"
 followus.fr.reseauxsociaux.0.picto.0 = "52fa1da5-picto-fb.svg"
 followus.fr.reseauxsociaux.1.titre = "Twitter"
 followus.fr.reseauxsociaux.1.url = "https://twitter.com/Cubedesigners"
+followus.fr.reseauxsociaux.1.color = "#45b0e3"
 followus.fr.reseauxsociaux.1.picto.0 = "52fa1dad-picto-tw.svg"
 followus.fr.reseauxsociaux.2.titre = "Google Plus"
-followus.fr.reseauxsociaux.2.url = "https://plus.google.com/108505338910338279554"
+followus.fr.reseauxsociaux.2.url = "https://www.google.com/+Cubedesigners"
+followus.fr.reseauxsociaux.2.color = "#e64405"
 followus.fr.reseauxsociaux.2.picto.0 = "52fa1db5-picto-gplus.svg"
 followus.fr.reseauxsociaux.3.titre = "Pinterest"
 followus.fr.reseauxsociaux.3.url = "https://www.pinterest.com/"
+followus.fr.reseauxsociaux.3.color = "#ca111a"
 followus.fr.reseauxsociaux.3.picto.0 = "52fa1dbc-picto-pi.svg"
+followus.fr.reseauxsociaux.4.titre = "Youtube"
+followus.fr.reseauxsociaux.4.url = "https://www.youtube.com/user/Cubedesigners"
+followus.fr.reseauxsociaux.4.color = "#c22528"
+followus.fr.reseauxsociaux.4.picto.0 = "546b73b4-546b63a0-youtube.svg"
 followus.en.reseauxsociaux.0.titre = ""
 followus.en.reseauxsociaux.0.url = ""
+followus.en.reseauxsociaux.0.color = false
 followus.en.reseauxsociaux.0.picto = false
 followus.en.reseauxsociaux.1.titre = ""
 followus.en.reseauxsociaux.1.url = ""
+followus.en.reseauxsociaux.1.color = false
 followus.en.reseauxsociaux.1.picto = false
 followus.en.reseauxsociaux.2.titre = ""
 followus.en.reseauxsociaux.2.url = ""
+followus.en.reseauxsociaux.2.color = false
 followus.en.reseauxsociaux.2.picto = false
 followus.en.reseauxsociaux.3.titre = ""
 followus.en.reseauxsociaux.3.url = ""
+followus.en.reseauxsociaux.3.color = false
 followus.en.reseauxsociaux.3.picto = false
-copyright.fr = "Copyright © Cubedesigners. Tous droits réservés"
+copyright.fr = "Copyright © Cubedesigners. Tous droits réservés. "
 copyright.en = ""
+
diff --git a/framework/application/forms/CMS/Sub/Home/Slideshow/Slides.php b/framework/application/forms/CMS/Sub/Home/Slideshow/Slides.php
index 7f6b355..2961f09 100644
--- a/framework/application/forms/CMS/Sub/Home/Slideshow/Slides.php
+++ b/framework/application/forms/CMS/Sub/Home/Slideshow/Slides.php
@@ -2,15 +2,13 @@
 
 class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slides extends CubeIT_Form_Multi_SubForm {
 
-    public function init() {
-        parent::init();
+	public function init() {
+		parent::init();
 
-        $slide = new Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide();
-        $this->setBaseSubForm($slide);
-        $this->setBaseLegend('Edition du slide « $legende »');
-        $this->setNewLegend('Nouveau slide');
-    }
+		$slide = new Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide();
+		$this->setBaseSubForm($slide);
+		$this->setBaseLegend('Edition du slide « $legende »');
+		$this->setNewLegend('Nouveau slide');
+	}
 
 }
-
-?>
diff --git a/framework/application/views/helpers/FooterActualites.php b/framework/application/views/helpers/FooterActualites.php
index 94f782d..fb0015d 100644
--- a/framework/application/views/helpers/FooterActualites.php
+++ b/framework/application/views/helpers/FooterActualites.php
@@ -1,22 +1,22 @@
-<?php
-
-class Cubedesigners_View_Helper_FooterActualites extends Zend_View_Helper_Abstract {
-
-    public function footerActualites($actus) {
-
-        $actus = $actus["actualites"];
-
-        $nbActus = count($actus);
-
-        $res = '<div class="actus">';
-        foreach ($actus as $id => $actu) {
-            $res.='<div class="actu"><p class="date">' . $this->view->dateTime($actu['date'], "dd-MM-y") . '</p><span class="texte">' . $this->view->markupDotclear($actu['texte']) . '<span></div>';
-        }
-        $res.= '</div>';
-
-        return $res;
-    }
-
-}
-
-?>
+<?php
+
+class Cubedesigners_View_Helper_FooterActualites extends Zend_View_Helper_Abstract {
+
+	public function footerActualites($actus) {
+
+		$actus = $actus["actualites"];
+
+		$nbActus = count($actus);
+
+		$res = '<section class="actus">';
+		foreach ($actus as $id => $actu) {
+			$res.='<article class="actu">' . $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date')) . $this->view->markupDotclear($actu['texte']) . '</article>';
+		}
+		$res.= '</section>';
+
+		return $res;
+	}
+
+}
+
+?>
diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php
index 6185c38..924e631 100644
--- a/framework/application/views/helpers/HomeSlideshow.php
+++ b/framework/application/views/helpers/HomeSlideshow.php
@@ -34,7 +34,12 @@ class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstrac
 			$attributes['style'] = 'background-image:url(' . CubeIT_View_Helper_ImageCms::getPath($slide['background']) . ');';
 			$imgHolder = $this->view->htmlElement($image, 'div', array('class' => 'imgholder'));
 			$mask = $this->htmlElement($imgHolder, 'div', array('class' => 'masque', 'style' => 'top:-' . $offset . 'px;height:' . (572 + $offset) . 'px;'));
-			$s.=$this->view->htmlElement($mask, 'div', $attributes);
+
+			$link = $slide['lien'];
+			$sl = $this->view->htmlElement($mask, 'div', $attributes);
+			$link['label'] = $sl;
+
+			$s .= $this->view->linkCMS($link);
 		}
 
 		$options = array('arrows' => true,
@@ -45,7 +50,7 @@ class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstrac
 
 		$res.='</div>';
 		$res.='</div>';
-		$res.='</div>';
+		$res.='</section>';
 
 		return $res;
 	}
diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 29ec12f..53ee8d1 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -6,36 +6,27 @@ $mentions = '/';
 if (!is_null($mentions_page)) {
 	$mentions = $mentions_page->getHref();
 }
+echo $this->clear();
 ?>
 <footer>
     <div id="footer">
         <div class="footer-holder">
-
             <div class="footer-top">
-
                 <div class="footer-top-content">
-
                     <div class="bloc">
-
                         <h2><?php echo __("Nous contacter"); ?></h2>
-
 						<?php echo $this->footerContact($this->option('contact')); ?>
                     </div>
 
                     <div class="bloc">
-
                         <h2><?php echo __("Actualités"); ?></h2>
-
 						<?php echo $this->footerActualites($this->option('actus')); ?>
-
 						<div class="social">
 							<h2><?php echo __("Suivez-nous"); ?></h2>
 							<?php echo $this->footerSocials($this->option('followus')); ?>
 						</div>
                     </div>
-
                 </div>
-
             </div>
 
             <div class="footer-bottom">
@@ -45,7 +36,8 @@ if (!is_null($mentions_page)) {
 						echo $this->option('copyright');
 
 						if (!is_null($mentions)) {
-							echo ' <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
+							echo $this->linkPage($mentions_page);
+							//echo ' <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
 						}
 						?>
 					</div>
@@ -57,7 +49,7 @@ if (!is_null($mentions_page)) {
 						} else {
 							$en = $this->enversion;
 						}
-						echo $this->link('fr', $fr, array('class' => 'active', array('hreflang' => 'en')));
+						echo $this->link('fr', $fr, array('class' => 'active', 'hreflang' => 'fr'));
 						echo $this->link('en', $en, array('hreflang' => 'en'));
 						?>
 					</nav>
diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 955b49a..8b7fefb 100644
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -14,7 +14,7 @@ if (!is_null($homepage)) {
 		/* LOGO */
 
 		echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
-		echo '<span class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></span>';
+		echo '<div class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></div>';
 
 
 		/* NAVIGATION */
diff --git a/framework/application/views/scripts/templates/contact.phtml b/framework/application/views/scripts/templates/contact.phtml
index 120d466..863d746 100644
--- a/framework/application/views/scripts/templates/contact.phtml
+++ b/framework/application/views/scripts/templates/contact.phtml
@@ -3,8 +3,6 @@ $this->headScript()->addGoogleMaps(array('key' => $this->options['googleapi']));
 $this->headScript()->addScriptAndStyle('contact');
 
 $bureaux = $this->option('contact')['bureaux'];
-
-
 $i = 1;
 foreach ($bureaux as $bureau) {
 	$this->headScriptVariables()->setVariable('map' . $i, $bureaux[$i - 1]['map']);
diff --git a/js/slideshow.js b/js/slideshow.js
index a1cf3b2..99d99c5 100644
--- a/js/slideshow.js
+++ b/js/slideshow.js
@@ -6,9 +6,8 @@ function loadCarrousel() {
 		var ww = $(window).width();
 		var m = (ww - 1600) / 2;
 		$(s).find(".imgholder").css({marginLeft: m});
-		$(s).find(".arrows").css({left: 960 + ((ww - 960) / 2) - 77 - 10});
+		$(s).find(".arrows").css({left: 960 + ((ww - 960) / 2) - 77 - 10 - 30});
 	});
 
-
 }
 
diff --git a/js/taglist.js b/js/taglist.js
index 95091a5..0d729c8 100644
--- a/js/taglist.js
+++ b/js/taglist.js
@@ -29,10 +29,21 @@
 			if (id != 0) {
 				this.list.find('[data-cat][data-cat!="' + id + '"]').hide();
 			}
+
+			this.updateMargins();
+			setTimeout(function () {
+				$this.updateMargins();
+			}, 500);
+		},
+		updateMargins: function () {
 			var i = 1;
+			var $this = this;
+
 			this.list.find('[data-cat]:visible').each(function () {
 				if (i % $this.perline == 0) {
 					$(this).addClass('last');
+				} else {
+					$(this).removeClass('last');
 				}
 				i++;
 			});
diff --git a/less/footer.less b/less/footer.less
index 06e2d1c..7da5f7a 100644
--- a/less/footer.less
+++ b/less/footer.less
@@ -36,6 +36,8 @@
 
 						.dotclear {
 							width:90%;
+							font-size:16px;
+							line-height:20px;
 						}
 
 						&:last-child {
@@ -44,10 +46,6 @@
 						.date {
 							font-size:12px;
 						}
-						.texte {
-							font-size:16px;
-							line-height:20px;
-						}
 					}
 				}
 				&:last-child{
diff --git a/less/slideshow.less b/less/slideshow.less
index 042e57c..bda60bc 100644
--- a/less/slideshow.less
+++ b/less/slideshow.less
@@ -107,12 +107,13 @@
 
 	.arrows{
 		position:absolute;
-		bottom:48px;
+		bottom:18px;
 		display:block;
 		width:77px;
 		height:38px;
 		white-space:nowrap;
 		z-index:3;
+		border:30px solid transparent;
 		a {
 			background-color: transparent;
 			width: 37px;