(no commit message)

diff --git a/framework/application/forms/CMS/Agence.php b/framework/application/forms/CMS/Agence.php
index 856b70e7d4417cb97c71a7a106b42ebfb05ca1d9..a1cd504079f41aecfb6058703d2cfe280378f6aa 100644 (file)
--- a/framework/application/forms/CMS/Agence.php
+++ b/framework/application/forms/CMS/Agence.php
@@ -5,9 +5,30 @@ class Cubedesigners_Form_CMS_Agence extends Cubedesigners_Form_CMS {
     public function init() {\r
         parent::init();\r
 \r
-        $titre = new Zend_Form_Element_Text('titre');\r
+        $titre = new CubeIT_Form_Element_Markitup('titre');\r
         $titre->setLabel('Titre');\r
         $this->addElement($titre);\r
+\r
+        $left = new CubeIT_Form_Element_Markitup('colonnegauche');\r
+        $left->setLabel('Description colonne gauche');\r
+        $this->addElement($left);\r
+\r
+        $right = new CubeIT_Form_Element_Markitup('colonnedroite');\r
+        $right->setLabel('Description colonne droite');\r
+        $this->addElement($right);\r
+\r
+        $pictos = new Cubedesigners_Form_CMS_Sub_Agence_Pictos();\r
+        $pictos->setLabel('Pictogrammes');\r
+        $this->addSubForm($pictos, 'pictos');\r
+\r
+        $photo = new CubeIT_Form_Element_File_Image('photo');\r
+        $photo->setMaxItems(1);\r
+        $photo->setLabel('Photo');\r
+        $this->addElement($photo);\r
+\r
+        $equipe = new Cubedesigners_Form_CMS_Sub_Agence_Persons();\r
+        $equipe->setLabel('Bloc L\'équipe');\r
+        $this->addSubForm($equipe, 'equipe');\r
     }\r
 \r
 }\r

diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php
index 7e117b5a915f4704c39745e3c5c7654b741527f0..301e6f0e73c716d43c23fcc6aa9014cfe13cdcda 100644 (file)
--- a/framework/application/forms/CMS/Home.php
+++ b/framework/application/forms/CMS/Home.php
@@ -9,9 +9,17 @@ class Cubedesigners_Form_CMS_Home extends Cubedesigners_Form_CMS {
         $titre->setLabel('Titre');
         $this->addElement($titre);
 
+        $slideshow = new Cubedesigners_Form_CMS_Sub_Home_Slideshow();
+        $slideshow->setLabel('Slideshow');
+        $this->addSubForm($slideshow, 'slideshow');
+
         $agence = new Cubedesigners_Form_CMS_Sub_Home_Agence();
         $agence->setLabel('Bloc L\'agence');
         $this->addSubForm($agence, 'agence');
+
+        $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
+        $expertises->setLabel('Bloc Expertises');
+        $this->addSubForm($expertises, 'expertises');
     }
 
 }

diff --git a/framework/application/views/helpers/FooterActualites.php b/framework/application/views/helpers/FooterActualites.php
index 448d943e0ab8db4891425a2ecdf1a1463b6c17de..e891680483dc8d5c01e14cba404a419bf5151083 100644 (file)
--- a/framework/application/views/helpers/FooterActualites.php
+++ b/framework/application/views/helpers/FooterActualites.php
@@ -10,7 +10,7 @@ class Cubedesigners_View_Helper_FooterActualites extends Zend_View_Helper_Abstra
 \r
         $res = '<div class="actus">';\r
         foreach ($actus as $id => $actu) {\r
-            $res.='<div class="actu"><p class="date">' . $actu['date'] . '</p><p class="texte">' . $this->view->markupDotclear($actu['texte']) . '<p></div>';\r
+            $res.='<div class="actu"><p class="date">' . $actu['date'] . '</p><span class="texte">' . $this->view->markupDotclear($actu['texte']) . '<span></div>';\r
         }\r
         $res.= '</div>';\r
 \r

diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index 2b01eda05ddf693f2eafd9345ac5139aaa065367..59184e816cbcaddf2a0504cc3a48480bfcff8029 100644 (file)
--- a/framework/application/views/helpers/FooterContact.php
+++ b/framework/application/views/helpers/FooterContact.php
@@ -27,7 +27,7 @@ class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract
             $res.='</div>';\r
 \r
             $res.='<div class="geoloc">';\r
-            $res.=$this->view->linkGeo(__('Plan d\'accès'), $bureau['adresse']['adresse'] . ',' . $bureau['adresse']['ville'] . ',' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory'));\r
+            $res.=$this->view->linkGeo(__("Plan d'accès"), $bureau['adresse']['adresse'] . ',' . $bureau['adresse']['ville'] . ',' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory'));\r
             $res.='</div>';\r
 \r
             $res.='</div>';\r

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

diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 37d73968d636b90934b882fb2446303c751b3fb9..5312dca49333544d7ed256ee31b21023720e59fc 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -4,14 +4,30 @@ $this->headScript()->addScriptAndStyle('home');
 \r
 <div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
 \r
-<div class="home-slideshow"></div>\r
+<div class="home-slideshow">\r
+    <div class="slides-holder">\r
+        <?php\r
+        echo $this->homeSlideshow($this->slideshow);\r
+        ?>\r
+    </div>\r
+</div>\r
 \r
 <div class="home-agency">\r
-    <div class="home-agency-holder">\r
+    <div class="bloc-holder">\r
 \r
         <h1><?php echo ucfirst($this->agence['titre']); ?></h1>\r
 \r
-        <?php echo $this->homeAgence($this->agence); ?>\r
+        <?php echo $this->homeBlocs($this->agence); ?>\r
+\r
+    </div>\r
+</div>\r
+\r
+<div class="home-expertise">\r
+    <div class="bloc-holder">\r
+\r
+        <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>\r
+\r
+        <?php echo $this->homeBlocs($this->expertises); ?>\r
 \r
     </div>\r
 </div>
\ No newline at end of file

diff --git a/less/footer.less b/less/footer.less
index b427dc62477425347e5dc46f87f600c1a376a899..00dd0b8bbe7064a3dc3ef5de4c46d0142127c3cb 100644 (file)
--- a/less/footer.less
+++ b/less/footer.less
@@ -8,12 +8,12 @@
 }
 
 #footer .footer-top .footer-top-content {
-    min-width: 950px;
-    max-width: 1140px;
+    min-width: 980px;
+    max-width: 980px;
     width:100%;
     margin: 0 auto;
     overflow: hidden;
-    padding: 0px 20px 50px 20px;
+   padding-bottom:50px;
 }
 
 #footer .footer-top .footer-top-content .bloc {
@@ -42,7 +42,8 @@
 
 /* Footer Nous Contacter */
 #footer .contact-texte {
-    background: url('../images/picto_footer_mail.png') no-repeat;
+    background-image: url('../images/picto_footer_mail.svg');
+    background-repeat:  no-repeat;
     background-position:0px 10px;
     font-family: 'roboto_condensedlight';
     font-weight: normal;
@@ -72,6 +73,12 @@
     color:#6c6c6c;
 }
 
+#footer .bureau a:hover,
+#footer .bureau a:active {
+    background-color: #2874ce;
+    color:#fff;
+}
+
 /* Footer Actualites */
 #footer .actu {
     font-family: 'roboto_condensedlight';
@@ -80,6 +87,10 @@
     padding-bottom: 20px;
 }
 
+#footer .actu .dotclear {
+    width:90%;
+}
+
 #footer .actu:last-child {
     padding-bottom: 0;
 }

diff --git a/less/header.less b/less/header.less
index a0bf6e193df41ecaa5c536e1066fe6fc05ede8e5..b37679b7e556bccf735d82d5ff421f85a4f1f1f1 100644 (file)
--- a/less/header.less
+++ b/less/header.less
@@ -1,6 +1,6 @@
 #header {
     margin: 0 auto;
-    min-width: 1024px;
+    //min-width: 1024px;
     max-width: 1200px;
     width:100%;
     height:130px;
@@ -15,7 +15,7 @@
 
 #header ul a{
         text-decoration: none;
-       color:#3885e0;
+       color:#282828;
         
         padding: 10px;
 }
@@ -24,7 +24,7 @@
 #header ul .active a{
         border-radius: 2px;
         background-color: #84ae1e;
-       color:#356bac;
+       color:#fff;
 }
 
 #header ul li{
@@ -49,7 +49,7 @@
 
 
 /* max-width pour faibles résolutions */
-@media screen and (max-width: 1024px) {
+@media screen and (max-width: 1009px) {
        
     #header {
             margin: 0 auto;

diff --git a/less/home.less b/less/home.less
index c2dc2fb7fb19f9ae8c42aa64d63671a3c54f74ce..cf708b032294984227a469275287a5d3be9c3df3 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -17,50 +17,119 @@
 \r
 /* Home Slideshow */\r
 .home-slideshow {\r
-    height: 450px;\r
     padding-bottom:50px;\r
 }\r
 \r
-/* Home Agency */\r
+.home-slideshow .slides-holder {\r
+    min-width: 980px;\r
+    max-width: 980px;\r
+    width:100%;\r
+    margin: 0 auto;\r
+    overflow:hidden;\r
+}\r
+\r
+.home-slideshow .slides-holder .slides {\r
+    width:980px;\r
+    height:400px;\r
+}\r
+\r
+.home-slideshow .slides-holder .slides .slide {\r
+    position:absolute;\r
+    display:none;\r
+}\r
+\r
+.home-slideshow .slides-holder .slides .slide a {\r
+    margin:0;\r
+    padding: 0;\r
+}\r
+\r
+.home-slideshow .slides-holder a {\r
+    margin: 25px 0 0 0;\r
+    width: 12px;\r
+    height: 22px;\r
+    float: right;\r
+    padding: 0 0 25px;\r
+}\r
+\r
+.home-slideshow .slides-holder .prev {\r
+    background: url('../images/prev.png') no-repeat;\r
+    background-position: center top;\r
+    margin-right: 30px;\r
+}\r
+\r
+.home-slideshow .slides-holder .next {\r
+    background: url('../images/next.png') no-repeat;\r
+    background-position: center top;\r
+}\r
+\r
+#slide-legend {\r
+    padding: 25px 0 0 0;\r
+    margin-right: 30px;\r
+    font-size: 18px;\r
+    float:right;\r
+}\r
+\r
+/* Home Agency and Expertises */\r
 .home-agency {\r
     background-color:#3885e0;\r
     color:#fff;\r
 }\r
 \r
-.home-agency .home-agency-holder {\r
-    min-width: 950px;\r
-    max-width: 1140px;\r
+.home-expertise {\r
+    background-color:#fff;\r
+    color:#1b1b1b;\r
+}\r
+\r
+.home-agency .bloc-holder,\r
+.home-expertise .bloc-holder {\r
+    min-width: 980px;\r
+    max-width: 980px;\r
     width:100%;\r
     margin: 0 auto;\r
-    padding: 50px 20px 0px 20px;\r
+    padding: 50px 0;\r
     overflow:hidden;\r
 }\r
 \r
-.home-agency .home-agency-holder h1 {\r
+.home-agency .bloc-holder h1,\r
+.home-expertise .bloc-holder h1  {\r
     font-family: 'roboto_condensedlight';\r
     font-weight: normal;\r
-    color:#fff;\r
     font-size:56px;\r
 }\r
 \r
-.home-agency .home-agency-holder h2 {\r
+.home-agency .bloc-holder h2,\r
+.home-expertise .bloc-holder h2 {\r
     font-family: 'roboto_condensedlight';\r
     font-weight: normal;\r
-    color:#fff;\r
     font-size:32px;\r
+    padding: 0 0 20px 0;\r
 }\r
 \r
-.home-agency .home-agency-holder .blocs {\r
+.home-agency .bloc-holder .blocs,\r
+.home-expertise .bloc-holder .blocs {\r
     padding: 40px 0;\r
 }\r
 \r
-.home-agency .home-agency-holder .sousbloc {\r
+.home-agency .bloc-holder .blocs .spacer,\r
+.home-expertise .bloc-holder .blocs .spacer {\r
+    clear:left;\r
+    padding:25px 0;\r
+}\r
+\r
+.home-agency .bloc-holder .sousbloc,\r
+.home-expertise .bloc-holder .sousbloc {\r
     float:left;\r
     width:50%;\r
-    padding-bottom: 50px;\r
 }\r
 \r
-.home-agency .home-agency-holder .sousbloc img {\r
+.home-agency .bloc-holder .sousbloc .texte,\r
+.home-expertise .bloc-holder .sousbloc .texte {\r
+    width: 60%;\r
+    float:left;\r
+}\r
+\r
+.home-agency .bloc-holder .sousbloc img,\r
+.home-expertise .bloc-holder .sousbloc img {\r
     float:left;\r
-    padding-right: 50px;\r
+    padding: 0 50px 0 0;\r
 }
\ No newline at end of file