From: bruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 11 Feb 2014 16:07:03 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=33a462c715301e8e02f4f9eb9555db7ea064ef2b;p=cubedesigners-v7.git

---

diff --git a/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php b/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php
index 7dd6737..e1cba8a 100644
--- a/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php
+++ b/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php
@@ -9,6 +9,10 @@ class Cubedesigners_Form_CMS_Sub_Agence_Persons_Bloc extends CubeIT_Form_SubForm
         $titre->setLabel('Prénom et nom');
         $this->addElement($titre);
 
+        $poste = new Zend_Form_Element_Text('poste');
+        $poste->setLabel('Poste');
+        $this->addElement($poste);
+
         $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
         $texte->setLabel('Texte');
         $this->addElement($texte);
diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studie.php b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
index d543739..0a505c8 100644
--- a/framework/application/forms/CMS/Sub/Casestudies/Studie.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
@@ -5,6 +5,10 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studie extends CubeIT_Form_SubForm
     public function init() {
         parent::init();
 
+        $online = new Zend_Form_Element_Checkbox('online');
+        $online->setLabel('En ligne');
+        $this->addElement($online);
+
         $titre = new Zend_Form_Element_Text('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
diff --git a/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php b/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
index 7417b5b..30a8ee2 100644
--- a/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
+++ b/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
@@ -14,6 +14,10 @@ class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide extends CubeIT_Form_SubFor
         $legend->setLabel('Legende');
         $this->addElement($legend);
 
+        $time = new Zend_Form_Element_Text('time');
+        $time->setLabel("Temps d'affichage (en secondes)");
+        $this->addElement($time);
+
         $link = new CubeIT_Form_Element_Link('lien');
         $link->labelEnabled(false);
         $this->addSubForm($link, 'lien');
diff --git a/framework/application/views/helpers/AgencyBlocs.php b/framework/application/views/helpers/AgencyBlocs.php
index 46ef2a2..85b8ff8 100644
--- a/framework/application/views/helpers/AgencyBlocs.php
+++ b/framework/application/views/helpers/AgencyBlocs.php
@@ -21,9 +21,10 @@ class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
             $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120);
 
 
-            $res.='<div class="sousbloc">';
-            $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo"></span>';
-            $res.='<h2>' . $this->view->markupDotclear($bloc['titre']) . '</h2>';
+            $res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';
+            $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';
+            $res.='<h2 itemprop="name">' . $bloc['titre'] . '</h2>';
+            $res.='<span class="poste" itemprop="jobTitle">' . $bloc['poste'] . '</span>';
             $res.='<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';
             $res.='</div>';
 
diff --git a/framework/application/views/helpers/AgencyPictos.php b/framework/application/views/helpers/AgencyPictos.php
index 915953c..4b62dc3 100644
--- a/framework/application/views/helpers/AgencyPictos.php
+++ b/framework/application/views/helpers/AgencyPictos.php
@@ -17,17 +17,13 @@ class Cubedesigners_View_Helper_AgencyPictos extends Zend_View_Helper_Abstract {
             }
 
             $image = $this->view->imageCms($bloc['picto'], '', 70, 70, array());
-            // $image = $this->view->imageProcess($bloc['picto'], $bloc['picto'], 70, 70, array(), 'C', 'C', 'M', false, 'auto', null, 92, 'files');
-            //$image = $this->view->imageProcess()->imageProcessGetUrl($bloc['picto'], $bloc['titre'], 120, 120);
-
 
+            $res .= '<article>';
             $res.='<div class="sousbloc">';
-            //$res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo"></span>';
             $res.=$image;
             $res.= $this->view->markupDotclear($bloc['texte']);
-            //$res.='<h1>' . $this->view->markupDotclear($bloc['titre']) . '</h1>';
-            //$res.='<h2>' . $this->view->markupDotclear($bloc['soustitre']) . '</h2>';
             $res.='</div>';
+            $res .= '</article>';
 
             $i++;
         }
diff --git a/framework/application/views/helpers/ContactInfos.php b/framework/application/views/helpers/ContactInfos.php
index e2f1503..bda016e 100644
--- a/framework/application/views/helpers/ContactInfos.php
+++ b/framework/application/views/helpers/ContactInfos.php
@@ -10,19 +10,19 @@ class Cubedesigners_View_Helper_ContactInfos extends Zend_View_Helper_Abstract {
 
         foreach ($bureaux as $id => $bureau) {
 
-            $res.='<div class="col">';
+            $res.='<div class="col"  itemscope itemtype="http://schema.org/LocalBusiness">';
 
-            $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';
+            $res.='<p class="titre" itemprop="name">' . $bureau['coordonnees']['nom'] . '<p>';
 
-            $res.='<div class="adresse">';
+            $res.='<div class="adresse"  itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
             $res.='<p>' . __('Cubedesigners') . '</p>';
-            $res.='<p>' . $bureau['coordonnees']['adresse'] . '</p>';
-            $res.='<p>' . $bureau['coordonnees']['code_postal'] . ' ' . $bureau['coordonnees']['ville'] . ' ' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '</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> <span itemprop="addressCountry">' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '</span></p>';
             $res.='</div>';
 
             $res.='<div class="numeros">';
-            $res.='<p>' . __('Tel') . ' ' . $bureau['coordonnees']['tel'] . '</p>';
-            $res.='<p>' . __('Fax') . ' ' . $bureau['coordonnees']['fax'] . '</p>';
+            $res.='<p itemprop="telephone">' . __('Tel') . ' ' . $bureau['coordonnees']['tel'] . '</p>';
+            $res.='<p itemprop="faxNumber">' . __('Fax') . ' ' . $bureau['coordonnees']['fax'] . '</p>';
             $res.='</div>';
 
             /* $res.='<div class="geoloc">';
diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index fc1b054..ef11d67 100644
--- a/framework/application/views/helpers/FooterContact.php
+++ b/framework/application/views/helpers/FooterContact.php
@@ -12,20 +12,22 @@ class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract
 
         foreach ($bureaux as $id => $bureau) {
 
-            $res.='<div class="bureau">';
+            $res.='<div class="bureau" itemscope itemtype="http://schema.org/LocalBusiness">';
 
-            $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';
+            $res.='<p class="titre" itemprop="name">' . $bureau['coordonnees']['nom'] . '<p>';
 
             $res.='<div class="numeros">';
-            $res.='<p>' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel']) . '</p>';
-            $res.='<p>' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';
+            $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.='<div class="adresse">';
+            //$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>' . $bureau['coordonnees']['adresse'] . '</p>';
-            $res.='<p>' . $bureau['coordonnees']['code_postal'] . ' ' . $bureau['coordonnees']['ville'] . '</p>';
-            $res.='<p>' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '<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">';
diff --git a/framework/application/views/helpers/FooterSocials.php b/framework/application/views/helpers/FooterSocials.php
index 4df9ba2..a0c5a7a 100644
--- a/framework/application/views/helpers/FooterSocials.php
+++ b/framework/application/views/helpers/FooterSocials.php
@@ -10,8 +10,8 @@ class Cubedesigners_View_Helper_FooterSocials extends Zend_View_Helper_Abstract
 
         $res = '<div class="reseaux">';
         foreach ($socials as $id => $social) {
-            $image = $this->view->imageCms($social['picto'], $social['titre'], 45, 45);
-            $res.='<div class="social"><a href="' . $social['url'] . '">' . $image . '</a></div>';
+            $image = $this->view->imageCms($social['picto'], $social['titre'], 30, 30);
+            $res.='<a href="' . $social['url'] . '"><div class="social ' . $social['titre'] . '">' . $image . '</div></a>';
         }
         $res.= '</div>';
 
diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php
index 54e1fb2..380d4c7 100644
--- a/framework/application/views/helpers/HomeBlocs.php
+++ b/framework/application/views/helpers/HomeBlocs.php
@@ -2,7 +2,7 @@
 
 class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
 
-    public function homeBlocs($blocs) {
+    public function homeBlocs($blocs, $type) {
 
         $blocs = $blocs['blocs'];
 
@@ -20,16 +20,27 @@ class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
 
             $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120);
 
+            $res .= '<article>';
             $res.='<div class="sousbloc">';
             $res.= $image;
-            $res.= '<h2>' . $this->view->markupDotclear($bloc['titre']) . '</h2>';
+            $res.= '<h2>' . $bloc['titre'] . '</h2>';
             $res.= '<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';
             $res.='</div>';
+            $res .= '</article>';
 
             $i++;
         }
 
         $res .= '</div>';
+
+        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;
     }
 
diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php
index 9777527..771aff5 100644
--- a/framework/application/views/helpers/HomeSlideshow.php
+++ b/framework/application/views/helpers/HomeSlideshow.php
@@ -24,7 +24,14 @@ class Cubedesigners_View_Helper_HomeSlideshow extends Zend_View_Helper_Abstract
 
 
             $image = $this->view->imageProcess()->imageProcessGetUrl($slide['image'], $slide['legende'], 980, 400);
-            $res.='<div class="slide" id="slide-' . $id . '" data-link="' . $l . '" data-image="' . $image . '" data-legend="' . $slide['legende'] . '"></div>';
+
+            if (!$slide['time']) {
+                $time = 6000;
+            } else {
+                $time = $slide['time'] * 1000;
+            }
+
+            $res.='<div class="slide" id="slide-' . $id . '" data-link="' . $l . '" data-image="' . $image . '" data-legend="' . $slide['legende'] . '" data-time="' . $time . '"></div>';
         }
 
 
diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 5725c9d..ef53669 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -2,50 +2,51 @@
 $this->headLink()->appendStylesheet('/less/footer.less');
 
 $mentions_page = $this->navigation()->getContainer()->findOneById($this->localeDefault() . '/7');
-//fb($mentions_page);
 $mentions = '/';
 if (!is_null($mentions_page)) {
     $mentions = $mentions_page->getHref();
 }
 ?>
-<div id="footer">
-    <div class="footer-holder">
+<footer>
+    <div id="footer">
+        <div class="footer-holder">
 
-        <div class="footer-top">
+            <div class="footer-top">
 
-            <div class="footer-top-content">
+                <div class="footer-top-content">
 
-                <div class="bloc">
+                    <div class="bloc">
 
-                    <h1>Nous contacter</h1>
+                        <h2><?php echo __("Nous contacter"); ?></h2>
 
-                    <?php echo $this->footerContact($this->option('contact')); ?>
-                </div>
+                        <?php echo $this->footerContact($this->option('contact')); ?>
+                    </div>
+
+                    <div class="bloc">
 
-                <div class="bloc">
+                        <h2><?php echo __("Actualités"); ?></h2>
 
-                    <h1>Actualités</h1>
+                        <?php echo $this->footerActualites($this->option('actus')); ?>
 
-                    <?php echo $this->footerActualites($this->option('actus')); ?>
+                        <h2><?php echo __("Suivez-nous"); ?></h2>
 
-                    <h2>Suivez-nous</h2>
+                        <?php echo $this->footerSocials($this->option('followus')); ?>
 
-                    <?php echo $this->footerSocials($this->option('followus')); ?>
+                    </div>
 
                 </div>
 
             </div>
 
-        </div>
+            <div class="footer-bottom">
+                <?php
+                echo $this->option('copyright');
 
-        <div class="footer-bottom">
-            <?php
-            echo $this->option('copyright');
-
-            if (!is_null($mentions)) {
-                echo ' | <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
-            }
-            ?>
+                if (!is_null($mentions)) {
+                    echo ' | <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
+                }
+                ?>
+            </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</footer>
\ No newline at end of file
diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 990fea3..b3621e1 100644
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -7,19 +7,21 @@ if (!is_null($homepage)) {
     $home = $homepage->getHref();
 }
 ?>
+<header>
+    <div id="header">
 
-<div id="header">
+        <?php
+        /* LOGO */
+        if (!is_null($home)) {
+            echo '<a href="' . $home . '" class="logo"><div class="logo"></div></a>';
+            echo '<span class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></span>';
+        }
 
-    <?php
-    /* LOGO */
-    if (!is_null($home)) {
-        echo '<a href="' . $home . '" class="logo"><div class="logo"></div></a>';
-    }
+        /* NAVIGATION */
+        $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
 
-    /* NAVIGATION */
-    $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
+        echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
+        ?>
 
-    echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
-    ?>
-
-</div>
\ No newline at end of file
+    </div>
+</header>
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml
index 372d997..ae4a737 100644
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -3,25 +3,34 @@ $this->headScript()->addScriptAndStyle('agence');
 ?>
 
 <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
-<div class="agency-description">
-    <div class="col"><?php echo $this->markupDotclear($this->colonnegauche); ?></div>
-    <div class="col"><?php echo $this->markupDotclear($this->colonnedroite); ?></div>
-</div>
-
-<div class="agency-pictos">
-    <div class="bloc-holder">
-        <?php echo $this->agencyPictos($this->pictos); ?>
+
+<section>
+    <div class="agency-description">
+        <div class="col"><?php echo $this->markupDotclear($this->colonnegauche); ?></div>
+        <div class="col"><?php echo $this->markupDotclear($this->colonnedroite); ?></div>
+    </div>
+</section>
+
+<section>
+    <div class="agency-pictos">
+        <div class="bloc-holder">
+            <?php echo $this->agencyPictos($this->pictos); ?>
+        </div>
     </div>
-</div>
+</section>
 
-<div class="agency-photo"><?php echo $this->imageProcess($this->photo, '', 1200, 545); ?></div>
+<section>
+    <div class="agency-photo"><?php echo $this->imageProcess($this->photo, '', 1200, 545); ?></div>
+</section>
 
-<div class="agency-persons">
-    <div class="bloc-holder">
+<section>
+    <div class="agency-persons">
+        <div class="bloc-holder">
 
-        <h1><?php echo ucfirst($this->equipe['titre']); ?></h1>
+            <h1><?php echo ucfirst($this->equipe['titre']); ?></h1>
 
-        <?php echo $this->agencyBlocs($this->equipe); ?>
+            <?php echo $this->agencyBlocs($this->equipe); ?>
 
+        </div>
     </div>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 6e10e7f..99f722e 100644
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -4,30 +4,36 @@ $this->headScript()->addScriptAndStyle('home');
 
 <div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>
 
-<div id="home-slideshow">
-    <div class="slides-holder">
-        <?php
-        echo $this->homeSlideshow($this->slideshow);
-        ?>
+<section>
+    <div id="home-slideshow">
+        <div class="slides-holder">
+            <?php
+            echo $this->homeSlideshow($this->slideshow);
+            ?>
+        </div>
     </div>
-</div>
+</section>
 
-<div id="home-agency">
-    <div class="bloc-holder">
+<section>
+    <div id="home-agency">
+        <div class="bloc-holder">
 
-        <h1><?php echo ucfirst($this->agence['titre']); ?></h1>
+            <h1><?php echo ucfirst($this->agence['titre']); ?></h1>
 
-        <?php echo $this->homeBlocs($this->agence); ?>
+            <?php echo $this->homeBlocs($this->agence, 'agence'); ?>
 
+        </div>
     </div>
-</div>
+</section>
 
-<div id="home-expertise">
-    <div class="bloc-holder">
+<section>
+    <div id="home-expertise">
+        <div class="bloc-holder">
 
-        <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>
+            <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>
 
-        <?php echo $this->homeBlocs($this->expertises); ?>
+            <?php echo $this->homeBlocs($this->expertises, 'expertises'); ?>
 
+        </div>
     </div>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/images/next.png b/images/next.png
index 228516a..c70d48e 100644
Binary files a/images/next.png and b/images/next.png differ
diff --git a/images/next_over.png b/images/next_over.png
new file mode 100644
index 0000000..33e3cd8
Binary files /dev/null and b/images/next_over.png differ
diff --git a/images/prev.png b/images/prev.png
index 37acecf..9414ceb 100644
Binary files a/images/prev.png and b/images/prev.png differ
diff --git a/images/prev_over.png b/images/prev_over.png
new file mode 100644
index 0000000..c04cf31
Binary files /dev/null and b/images/prev_over.png differ
diff --git a/js/home.js b/js/home.js
index 2fffa33..a1bd5df 100644
--- a/js/home.js
+++ b/js/home.js
@@ -5,6 +5,9 @@ var currentSlide;
 var currentSlideId;
 var isAnim = false;
 var animDuration = 500;
+var autoSlide = true;
+var switchTimer;
+var time;
 
 function load_home() {
 	slideShow();
@@ -35,10 +38,32 @@ function slideShow() {
            $('#slide-legend').html(legend);
            
            $('.slide:first').fadeIn();
+           
+           if(autoSlide) {
+               time = currentSlide.attr('data-time');
+               switchTimer = window.setTimeout( nextSlide, time);
+           }
+           
     }
     
     initLinks();
-    checkPages();
+    //checkPages();
+    
+    
+    
+}
+
+function nextSlide() {
+    
+    if( autoSlide ) {
+        if( currentSlideId < nbSlides-1 && !isAnim)
+        {
+            currentSlideId++;
+        }else{
+            currentSlideId=0;
+        }
+        animSlide();
+    }
     
 }
 
@@ -58,7 +83,7 @@ function preloadSlides() {
             $(image).load(function(){
                     $(slide).html("<a href='" + $(slide).attr('data-link') + "'><img src='" + $(slide).attr('data-image') + "' /></a>");
             });
-
+            
             i++;
     });
 }
@@ -66,62 +91,67 @@ function preloadSlides() {
 function initLinks() {
     
     $('.next').click(function(){
+        
+        autoSlide = false;
+        
         if( currentSlideId < nbSlides-1 && !isAnim)
         {
-            isAnim = true;
-            $('#slide-legend').fadeOut();
-            
-            $(currentSlide).fadeOut(animDuration,function(){
-                    
-                    currentSlideId++;
-                    
-                    currentSlide = $('#slide-'+currentSlideId);
-                    
-                    var legende = currentSlide.attr('data-legend');
-                    $('#slide-legend').html(legende);
-                    
-                    $('#slide-'+currentSlideId).fadeIn();
-                    $('#slide-legend').fadeIn();
-                     
-                    isAnim = false;
-                    
-                    checkPages();
-
-             });
+            currentSlideId++;
+        }else{
+            currentSlideId=0;
         }
         
+        animSlide();
+        
         return false;
     });
     
     $('.prev').click(function(){
+        
+        autoSlide = false;
+        
         if( currentSlideId > 0 && !isAnim )
         {
-           isAnim = true;
-           $('#slide-legend').fadeOut();
-           
-           $(currentSlide).fadeOut(animDuration,function(){
-                    
-                    currentSlideId--;
-                    
-                    currentSlide = $('#slide-'+currentSlideId);
-                    
-                    var legende = currentSlide.attr('data-legend');
-                    $('#slide-legend').html(legende);
-                    
-                    $('#slide-'+currentSlideId).fadeIn();
-                    $('#slide-legend').fadeIn();
-                    
-                    isAnim = false;
-
-                    checkPages();
-             });
+           currentSlideId--;
+        }else{
+            currentSlideId = nbSlides-1;
         }
         
+         animSlide();
+        
         return false;
     });
     
 }
 
+function animSlide() {
+    isAnim = true;
+    $('#slide-legend').fadeOut();
+
+    $(currentSlide).fadeOut(animDuration,function(){
+
+            currentSlide = $('#slide-'+currentSlideId);
+
+            var legende = currentSlide.attr('data-legend');
+            
+            $('#slide-legend').html(legende);
+
+            $('#slide-'+currentSlideId).fadeIn();
+            
+            $('#slide-legend').fadeIn();
+
+            isAnim = false;
+            
+             if( autoSlide ) {
+                time = $('#slide-'+currentSlideId).attr('data-time');
+                fb(time);
+                switchTimer = window.setTimeout( nextSlide, time);
+            }
+    
+
+     });
+}
+
 function checkPages() {
     if( currentSlideId >= nbSlides-1) {
         $('.next').css("visibility","hidden");
diff --git a/less/contact.less b/less/contact.less
index 4131adc..16eb3a0 100644
--- a/less/contact.less
+++ b/less/contact.less
@@ -18,7 +18,7 @@
     background-repeat:  no-repeat;
     background-position:0px 10px;
     font-weight: normal;
-    padding-left:70px;
+    padding-left:60px;
     padding-bottom: 50px;
 }
 
@@ -31,7 +31,7 @@
     background-image: url('../images/picto_geoloc.svg');
     background-repeat:  no-repeat;
     background-position:0px 0px;
-    padding-left:70px;
+    padding-left:60px;
     padding-bottom: 50px;
 }
 
@@ -39,7 +39,7 @@
     background-image: url('../images/picto_tel.svg');
     background-repeat:  no-repeat;
     background-position:0px 0px;
-    padding-left:70px;
+    padding-left:60px;
     padding-bottom: 50px;
 }
 
diff --git a/less/footer.less b/less/footer.less
index eeb40c7..9044cca 100644
--- a/less/footer.less
+++ b/less/footer.less
@@ -102,7 +102,32 @@
 /* Footer Suivez-nous */
 #footer .reseaux .social {
     float: left;
+    width: 50px;
+    height: 50px;
+    text-align: center;
     margin-right: 20px;
+    background-color: #191919;
+    border-radius: 25px;
+}
+
+#footer .reseaux .social img {
+    margin-top: 10px;
+}
+
+#footer .reseaux .Facebook:hover {
+    background-color: #39599f;
+}
+
+#footer .reseaux .Twitter:hover {
+    background-color: #45b0e3;
+}
+
+#footer .reseaux .Google:hover {
+    background-color: #e64405;
+}
+
+#footer .reseaux .Pinterest:hover {
+    background-color: #ca111a;
 }
 
 /* Footer Copyright */
diff --git a/less/header.less b/less/header.less
index fff4bb4..5c28ff3 100644
--- a/less/header.less
+++ b/less/header.less
@@ -13,7 +13,7 @@
     }
 
     ul a{
-            text-decoration: none;
+            //text-decoration: none;
             color:#282828;
 
             padding: 10px;
@@ -35,6 +35,10 @@
             height:130px;
             float:left;
     }
+    
+    .sublogo {
+        display:none;
+    }
 
     .navigation{
             margin: 50px 0;
diff --git a/less/home.less b/less/home.less
index 32f29d6..8f5749f 100644
--- a/less/home.less
+++ b/less/home.less
@@ -41,23 +41,35 @@
     }
 
     .slides-holder a {
-        margin: 25px 0 0 0;
-        width: 12px;
-        height: 22px;
+        margin: 20px 0 0 0;
+        width: 37px;
+        height: 38px;
         float: right;
-        padding: 0 0 25px;
+        //padding: 0 0 25px;
+    }
+    
+    .slides-holder a:hover {
+       // background-color: #84ae1e;
     }
 
     .slides-holder .prev {
         background: url('../images/prev.png') no-repeat;
         background-position: center top;
-        margin-right: 30px;
+        margin-right: 10px;
+    }
+    
+    .slides-holder .prev:hover {
+        background: url('../images/prev_over.png') no-repeat;
     }
 
     .slides-holder .next {
         background: url('../images/next.png') no-repeat;
         background-position: center top;
     }
+    
+    .slides-holder .next:hover {
+        background: url('../images/next_over.png') no-repeat;
+    }
 }
 
 
@@ -101,9 +113,24 @@
     padding: 0 0 20px 0;
 }
 
+#home-agency .bloc-holder a,
+#home-expertise .bloc-holder a {
+    color:white;
+    clear:both;
+    background-color: #2874ce;
+    border-radius: 2px;
+    padding: 5px 20px;
+}
+
+#home-agency .bloc-holder a:hover,
+#home-expertise .bloc-holder a:hover {
+    background-color: #84ae1e;
+}
+
 #home-agency .bloc-holder .blocs,
 #home-expertise .bloc-holder .blocs {
     padding: 40px 0;
+    overflow:hidden;
 }
 
 #home-agency .bloc-holder .blocs .spacer,