(no commit message)

diff --git a/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php b/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php
index 7dd6737b98725314f7f9087649c787830852bc85..e1cba8a04743a34268c69b6176e4541915abfc42 100644 (file)
--- 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 d543739c2f5cd545e9a2a682f186f0de7d6e4bf2..0a505c8f4f0c6519232aab26abe25804b405d9c9 100644 (file)
--- 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 7417b5b1f22a2e6c8ddddc0a4b53e188a873de61..30a8ee231b5d9e090d3c1e1c1cc9b29799a58c7b 100644 (file)
--- 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 46ef2a274f3b9100df1b671c53027f41273fa1a4..85b8ff8e32c40367d5ad173d0b7fbc21684aa931 100644 (file)
--- 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);\r
 \r
 \r
-            $res.='<div class="sousbloc">';\r
-            $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo"></span>';\r
-            $res.='<h2>' . $this->view->markupDotclear($bloc['titre']) . '</h2>';\r
+            $res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';\r
+            $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';\r
+            $res.='<h2 itemprop="name">' . $bloc['titre'] . '</h2>';\r
+            $res.='<span class="poste" itemprop="jobTitle">' . $bloc['poste'] . '</span>';\r
             $res.='<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';\r
             $res.='</div>';\r
 \r

diff --git a/framework/application/views/helpers/AgencyPictos.php b/framework/application/views/helpers/AgencyPictos.php
index 915953c918be964ae77ca36cb5e8f03bde9c1699..4b62dc3b6b2b7f7246ed0ede4e26421b547e99f6 100644 (file)
--- 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 {
             }\r
 \r
             $image = $this->view->imageCms($bloc['picto'], '', 70, 70, array());\r
-            // $image = $this->view->imageProcess($bloc['picto'], $bloc['picto'], 70, 70, array(), 'C', 'C', 'M', false, 'auto', null, 92, 'files');\r
-            //$image = $this->view->imageProcess()->imageProcessGetUrl($bloc['picto'], $bloc['titre'], 120, 120);\r
-\r
 \r
+            $res .= '<article>';\r
             $res.='<div class="sousbloc">';\r
-            //$res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo"></span>';\r
             $res.=$image;\r
             $res.= $this->view->markupDotclear($bloc['texte']);\r
-            //$res.='<h1>' . $this->view->markupDotclear($bloc['titre']) . '</h1>';\r
-            //$res.='<h2>' . $this->view->markupDotclear($bloc['soustitre']) . '</h2>';\r
             $res.='</div>';\r
+            $res .= '</article>';\r
 \r
             $i++;\r
         }\r

diff --git a/framework/application/views/helpers/ContactInfos.php b/framework/application/views/helpers/ContactInfos.php
index e2f15038af2028d2e365b21dabb0aece34fd2229..bda016e6c745a81c7581d1b9e3755cfb0a9cb862 100644 (file)
--- 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 {
 \r
         foreach ($bureaux as $id => $bureau) {\r
 \r
-            $res.='<div class="col">';\r
+            $res.='<div class="col"  itemscope itemtype="http://schema.org/LocalBusiness">';\r
 \r
-            $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';\r
+            $res.='<p class="titre" itemprop="name">' . $bureau['coordonnees']['nom'] . '<p>';\r
 \r
-            $res.='<div class="adresse">';\r
+            $res.='<div class="adresse"  itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';\r
             $res.='<p>' . __('Cubedesigners') . '</p>';\r
-            $res.='<p>' . $bureau['coordonnees']['adresse'] . '</p>';\r
-            $res.='<p>' . $bureau['coordonnees']['code_postal'] . ' ' . $bureau['coordonnees']['ville'] . ' ' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '</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> <span itemprop="addressCountry">' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '</span></p>';\r
             $res.='</div>';\r
 \r
             $res.='<div class="numeros">';\r
-            $res.='<p>' . __('Tel') . ' ' . $bureau['coordonnees']['tel'] . '</p>';\r
-            $res.='<p>' . __('Fax') . ' ' . $bureau['coordonnees']['fax'] . '</p>';\r
+            $res.='<p itemprop="telephone">' . __('Tel') . ' ' . $bureau['coordonnees']['tel'] . '</p>';\r
+            $res.='<p itemprop="faxNumber">' . __('Fax') . ' ' . $bureau['coordonnees']['fax'] . '</p>';\r
             $res.='</div>';\r
 \r
             /* $res.='<div class="geoloc">';\r

diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index fc1b054b1ffd397d40b8cc45b0638f176b411b4a..ef11d67feeb8bcf5e17919456b895d97a5416cc9 100644 (file)
--- 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
 \r
         foreach ($bureaux as $id => $bureau) {\r
 \r
-            $res.='<div class="bureau">';\r
+            $res.='<div class="bureau" itemscope itemtype="http://schema.org/LocalBusiness">';\r
 \r
-            $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';\r
+            $res.='<p class="titre" itemprop="name">' . $bureau['coordonnees']['nom'] . '<p>';\r
 \r
             $res.='<div class="numeros">';\r
-            $res.='<p>' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel']) . '</p>';\r
-            $res.='<p>' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';\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.='<div class="adresse">';\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>' . $bureau['coordonnees']['adresse'] . '</p>';\r
-            $res.='<p>' . $bureau['coordonnees']['code_postal'] . ' ' . $bureau['coordonnees']['ville'] . '</p>';\r
-            $res.='<p>' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '<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

diff --git a/framework/application/views/helpers/FooterSocials.php b/framework/application/views/helpers/FooterSocials.php
index 4df9ba2b07cb4eb8840e0ba26358f1b490248497..a0c5a7a198f2e43f820e72082794499cdfea907a 100644 (file)
--- 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
 \r
         $res = '<div class="reseaux">';\r
         foreach ($socials as $id => $social) {\r
-            $image = $this->view->imageCms($social['picto'], $social['titre'], 45, 45);\r
-            $res.='<div class="social"><a href="' . $social['url'] . '">' . $image . '</a></div>';\r
+            $image = $this->view->imageCms($social['picto'], $social['titre'], 30, 30);\r
+            $res.='<a href="' . $social['url'] . '"><div class="social ' . $social['titre'] . '">' . $image . '</div></a>';\r
         }\r
         $res.= '</div>';\r
 \r

diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php
index 54e1fb22e98a872facc70c1636cdceaab94f29b0..380d4c7a0a10f5058c5909e06020b752ae3a3628 100644 (file)
--- a/framework/application/views/helpers/HomeBlocs.php
+++ b/framework/application/views/helpers/HomeBlocs.php
@@ -2,7 +2,7 @@
 \r
 class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {\r
 \r
-    public function homeBlocs($blocs) {\r
+    public function homeBlocs($blocs, $type) {\r
 \r
         $blocs = $blocs['blocs'];\r
 \r
@@ -20,16 +20,27 @@ class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
 \r
             $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120);\r
 \r
+            $res .= '<article>';\r
             $res.='<div class="sousbloc">';\r
             $res.= $image;\r
-            $res.= '<h2>' . $this->view->markupDotclear($bloc['titre']) . '</h2>';\r
+            $res.= '<h2>' . $bloc['titre'] . '</h2>';\r
             $res.= '<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';\r
             $res.='</div>';\r
+            $res .= '</article>';\r
 \r
             $i++;\r
         }\r
 \r
         $res .= '</div>';\r
+\r
+        if ($type == "agence") {\r
+            $res .= $this->view->linkInternal(__("Découvrez l'agence"), 2);\r
+        }\r
+\r
+        /* if ($type == "expertises") {\r
+          $res .= $this->view->linkInternal(__("Explorez nos expertises"), 5);\r
+          } */\r
+\r
         return $res;\r
     }\r
 \r

diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php
index 97775273678f088eed1ce5a1ceb3acec1093cfca..771aff54bff671b52842fae2bcbac86ce9b662bc 100644 (file)
--- 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
 \r
 \r
             $image = $this->view->imageProcess()->imageProcessGetUrl($slide['image'], $slide['legende'], 980, 400);\r
-            $res.='<div class="slide" id="slide-' . $id . '" data-link="' . $l . '" data-image="' . $image . '" data-legend="' . $slide['legende'] . '"></div>';\r
+\r
+            if (!$slide['time']) {\r
+                $time = 6000;\r
+            } else {\r
+                $time = $slide['time'] * 1000;\r
+            }\r
+\r
+            $res.='<div class="slide" id="slide-' . $id . '" data-link="' . $l . '" data-image="' . $image . '" data-legend="' . $slide['legende'] . '" data-time="' . $time . '"></div>';\r
         }\r
 \r
 \r

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 5725c9d5590453187c4373465dabc6bbc4cadb18..ef536698d598d61108f08dc3f9e8d70b62315d0f 100644 (file)
--- 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');\r
 \r
 $mentions_page = $this->navigation()->getContainer()->findOneById($this->localeDefault() . '/7');\r
-//fb($mentions_page);\r
 $mentions = '/';\r
 if (!is_null($mentions_page)) {\r
     $mentions = $mentions_page->getHref();\r
 }\r
 ?>\r
-<div id="footer">\r
-    <div class="footer-holder">\r
+<footer>\r
+    <div id="footer">\r
+        <div class="footer-holder">\r
 \r
-        <div class="footer-top">\r
+            <div class="footer-top">\r
 \r
-            <div class="footer-top-content">\r
+                <div class="footer-top-content">\r
 \r
-                <div class="bloc">\r
+                    <div class="bloc">\r
 \r
-                    <h1>Nous contacter</h1>\r
+                        <h2><?php echo __("Nous contacter"); ?></h2>\r
 \r
-                    <?php echo $this->footerContact($this->option('contact')); ?>\r
-                </div>\r
+                        <?php echo $this->footerContact($this->option('contact')); ?>\r
+                    </div>\r
+\r
+                    <div class="bloc">\r
 \r
-                <div class="bloc">\r
+                        <h2><?php echo __("Actualités"); ?></h2>\r
 \r
-                    <h1>Actualités</h1>\r
+                        <?php echo $this->footerActualites($this->option('actus')); ?>\r
 \r
-                    <?php echo $this->footerActualites($this->option('actus')); ?>\r
+                        <h2><?php echo __("Suivez-nous"); ?></h2>\r
 \r
-                    <h2>Suivez-nous</h2>\r
+                        <?php echo $this->footerSocials($this->option('followus')); ?>\r
 \r
-                    <?php echo $this->footerSocials($this->option('followus')); ?>\r
+                    </div>\r
 \r
                 </div>\r
 \r
             </div>\r
 \r
-        </div>\r
+            <div class="footer-bottom">\r
+                <?php\r
+                echo $this->option('copyright');\r
 \r
-        <div class="footer-bottom">\r
-            <?php\r
-            echo $this->option('copyright');\r
-\r
-            if (!is_null($mentions)) {\r
-                echo ' | <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';\r
-            }\r
-            ?>\r
+                if (!is_null($mentions)) {\r
+                    echo ' | <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';\r
+                }\r
+                ?>\r
+            </div>\r
         </div>\r
     </div>\r
-</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 990fea385e4e6345f32bcff62e5ed59c71e115bf..b3621e119231d373dab78babfd7210490b4b430b 100644 (file)
--- 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();\r
 }\r
 ?>\r
+<header>\r
+    <div id="header">\r
 \r
-<div id="header">\r
+        <?php\r
+        /* LOGO */\r
+        if (!is_null($home)) {\r
+            echo '<a href="' . $home . '" class="logo"><div class="logo"></div></a>';\r
+            echo '<span class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></span>';\r
+        }\r
 \r
-    <?php\r
-    /* LOGO */\r
-    if (!is_null($home)) {\r
-        echo '<a href="' . $home . '" class="logo"><div class="logo"></div></a>';\r
-    }\r
+        /* NAVIGATION */\r
+        $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);\r
 \r
-    /* NAVIGATION */\r
-    $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);\r
+        echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";\r
+        ?>\r
 \r
-    echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";\r
-    ?>\r
-\r
-</div>
\ No newline at end of file
+    </div>\r
+</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 372d9973db7b24f13f12fd12222add0c9c695d48..ae4a737383b11b6bad261a4933e27456ddfc389e 100644 (file)
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -3,25 +3,34 @@ $this->headScript()->addScriptAndStyle('agence');
 ?>\r
 \r
 <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
-<div class="agency-description">\r
-    <div class="col"><?php echo $this->markupDotclear($this->colonnegauche); ?></div>\r
-    <div class="col"><?php echo $this->markupDotclear($this->colonnedroite); ?></div>\r
-</div>\r
-\r
-<div class="agency-pictos">\r
-    <div class="bloc-holder">\r
-        <?php echo $this->agencyPictos($this->pictos); ?>\r
+\r
+<section>\r
+    <div class="agency-description">\r
+        <div class="col"><?php echo $this->markupDotclear($this->colonnegauche); ?></div>\r
+        <div class="col"><?php echo $this->markupDotclear($this->colonnedroite); ?></div>\r
+    </div>\r
+</section>\r
+\r
+<section>\r
+    <div class="agency-pictos">\r
+        <div class="bloc-holder">\r
+            <?php echo $this->agencyPictos($this->pictos); ?>\r
+        </div>\r
     </div>\r
-</div>\r
+</section>\r
 \r
-<div class="agency-photo"><?php echo $this->imageProcess($this->photo, '', 1200, 545); ?></div>\r
+<section>\r
+    <div class="agency-photo"><?php echo $this->imageProcess($this->photo, '', 1200, 545); ?></div>\r
+</section>\r
 \r
-<div class="agency-persons">\r
-    <div class="bloc-holder">\r
+<section>\r
+    <div class="agency-persons">\r
+        <div class="bloc-holder">\r
 \r
-        <h1><?php echo ucfirst($this->equipe['titre']); ?></h1>\r
+            <h1><?php echo ucfirst($this->equipe['titre']); ?></h1>\r
 \r
-        <?php echo $this->agencyBlocs($this->equipe); ?>\r
+            <?php echo $this->agencyBlocs($this->equipe); ?>\r
 \r
+        </div>\r
     </div>\r
-</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 6e10e7feacd4fecf9ba82d58f6e1e275790ac3bb..99f722e1354bfe2a1260c9b30892780b0f855e74 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -4,30 +4,36 @@ $this->headScript()->addScriptAndStyle('home');
 \r
 <div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
 \r
-<div id="home-slideshow">\r
-    <div class="slides-holder">\r
-        <?php\r
-        echo $this->homeSlideshow($this->slideshow);\r
-        ?>\r
+<section>\r
+    <div id="home-slideshow">\r
+        <div class="slides-holder">\r
+            <?php\r
+            echo $this->homeSlideshow($this->slideshow);\r
+            ?>\r
+        </div>\r
     </div>\r
-</div>\r
+</section>\r
 \r
-<div id="home-agency">\r
-    <div class="bloc-holder">\r
+<section>\r
+    <div id="home-agency">\r
+        <div class="bloc-holder">\r
 \r
-        <h1><?php echo ucfirst($this->agence['titre']); ?></h1>\r
+            <h1><?php echo ucfirst($this->agence['titre']); ?></h1>\r
 \r
-        <?php echo $this->homeBlocs($this->agence); ?>\r
+            <?php echo $this->homeBlocs($this->agence, 'agence'); ?>\r
 \r
+        </div>\r
     </div>\r
-</div>\r
+</section>\r
 \r
-<div id="home-expertise">\r
-    <div class="bloc-holder">\r
+<section>\r
+    <div id="home-expertise">\r
+        <div class="bloc-holder">\r
 \r
-        <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>\r
+            <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>\r
 \r
-        <?php echo $this->homeBlocs($this->expertises); ?>\r
+            <?php echo $this->homeBlocs($this->expertises, 'expertises'); ?>\r
 \r
+        </div>\r
     </div>\r
-</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 228516a0f47df1dfcbb68ccd9d390168550c4e94..c70d48e9f0dc58ebb058f3dfe7100852aaadb1fc 100644 (file)
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 (file)
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 37acecfb70c9ee9f4e6441a7b8082f91f2df1132..9414cebe60069c68154ce1e7e12180c72f180f18 100644 (file)
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 (file)
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 2fffa33c780739ba313e0e1b10a5bdd026af3fd9..a1bd5dfd79f4d5b63e6a9fd6d4503bc82f8347bb 100644 (file)
--- 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 4131adc55d137717b9a44256ea78f1340e1895c3..16eb3a0d91a44228727562d7201ca2f47f71748d 100644 (file)
--- 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 eeb40c7c4161b8086722a4a400c8e6a86b4c4d49..9044cca6f0137aee3cb0b4a92558be0d944485a5 100644 (file)
--- 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 fff4bb4f133c5c6b0aa88d41bad05863219d437d..5c28ff3f1eccc3e855bddf05ac536f284fa5b6fd 100644 (file)
--- 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 32f29d67c76cf92210dd3d739143aab867f2a11e..8f5749f90b0a1dd824fbc6b3e2245fd7ea198e8d 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -41,23 +41,35 @@
     }\r
 \r
     .slides-holder a {\r
-        margin: 25px 0 0 0;\r
-        width: 12px;\r
-        height: 22px;\r
+        margin: 20px 0 0 0;\r
+        width: 37px;\r
+        height: 38px;\r
         float: right;\r
-        padding: 0 0 25px;\r
+        //padding: 0 0 25px;\r
+    }\r
+    \r
+    .slides-holder a:hover {\r
+       // background-color: #84ae1e;\r
     }\r
 \r
     .slides-holder .prev {\r
         background: url('../images/prev.png') no-repeat;\r
         background-position: center top;\r
-        margin-right: 30px;\r
+        margin-right: 10px;\r
+    }\r
+    \r
+    .slides-holder .prev:hover {\r
+        background: url('../images/prev_over.png') no-repeat;\r
     }\r
 \r
     .slides-holder .next {\r
         background: url('../images/next.png') no-repeat;\r
         background-position: center top;\r
     }\r
+    \r
+    .slides-holder .next:hover {\r
+        background: url('../images/next_over.png') no-repeat;\r
+    }\r
 }\r
 \r
 \r
@@ -101,9 +113,24 @@
     padding: 0 0 20px 0;\r
 }\r
 \r
+#home-agency .bloc-holder a,\r
+#home-expertise .bloc-holder a {\r
+    color:white;\r
+    clear:both;\r
+    background-color: #2874ce;\r
+    border-radius: 2px;\r
+    padding: 5px 20px;\r
+}\r
+\r
+#home-agency .bloc-holder a:hover,\r
+#home-expertise .bloc-holder a:hover {\r
+    background-color: #84ae1e;\r
+}\r
+\r
 #home-agency .bloc-holder .blocs,\r
 #home-expertise .bloc-holder .blocs {\r
     padding: 40px 0;\r
+    overflow:hidden;\r
 }\r
 \r
 #home-agency .bloc-holder .blocs .spacer,\r