From 676b527a8ddd927af3d0f8085269c527342c5da4 Mon Sep 17 00:00:00 2001 From: "bruno@cubedesigners.com" Date: Wed, 22 Jan 2014 08:26:18 +0000 Subject: [PATCH] --- framework/application/forms/CMS/Agence.php | 23 ++++- framework/application/forms/CMS/Home.php | 8 ++ .../views/helpers/FooterActualites.php | 2 +- .../views/helpers/FooterContact.php | 2 +- .../views/helpers/FooterSocials.php | 2 +- .../views/scripts/templates/home.phtml | 22 ++++- less/footer.less | 19 +++- less/header.less | 8 +- less/home.less | 99 ++++++++++++++++--- 9 files changed, 155 insertions(+), 30 deletions(-) diff --git a/framework/application/forms/CMS/Agence.php b/framework/application/forms/CMS/Agence.php index 856b70e..a1cd504 100644 --- 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() { parent::init(); - $titre = new Zend_Form_Element_Text('titre'); + $titre = new CubeIT_Form_Element_Markitup('titre'); $titre->setLabel('Titre'); $this->addElement($titre); + + $left = new CubeIT_Form_Element_Markitup('colonnegauche'); + $left->setLabel('Description colonne gauche'); + $this->addElement($left); + + $right = new CubeIT_Form_Element_Markitup('colonnedroite'); + $right->setLabel('Description colonne droite'); + $this->addElement($right); + + $pictos = new Cubedesigners_Form_CMS_Sub_Agence_Pictos(); + $pictos->setLabel('Pictogrammes'); + $this->addSubForm($pictos, 'pictos'); + + $photo = new CubeIT_Form_Element_File_Image('photo'); + $photo->setMaxItems(1); + $photo->setLabel('Photo'); + $this->addElement($photo); + + $equipe = new Cubedesigners_Form_CMS_Sub_Agence_Persons(); + $equipe->setLabel('Bloc L\'équipe'); + $this->addSubForm($equipe, 'equipe'); } } diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php index 7e117b5..301e6f0 100644 --- 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 448d943..e891680 100644 --- 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 $res = '
'; foreach ($actus as $id => $actu) { - $res.='

' . $actu['date'] . '

' . $this->view->markupDotclear($actu['texte']) . '

'; + $res.='

' . $actu['date'] . '

' . $this->view->markupDotclear($actu['texte']) . '
'; } $res.= '
'; diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php index 2b01eda..59184e8 100644 --- 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.=''; $res.='
'; - $res.=$this->view->linkGeo(__('Plan d\'accès'), $bureau['adresse']['adresse'] . ',' . $bureau['adresse']['ville'] . ',' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory')); + $res.=$this->view->linkGeo(__("Plan d'accès"), $bureau['adresse']['adresse'] . ',' . $bureau['adresse']['ville'] . ',' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory')); $res.='
'; $res.=''; diff --git a/framework/application/views/helpers/FooterSocials.php b/framework/application/views/helpers/FooterSocials.php index 50d68fd..4df9ba2 100644 --- 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 $res = '
'; foreach ($socials as $id => $social) { - $image = $this->view->imageProcess($social['picto'], $social['titre'], 45, 45); + $image = $this->view->imageCms($social['picto'], $social['titre'], 45, 45); $res.=''; } $res.= '
'; diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml index 37d7396..5312dca 100644 --- a/framework/application/views/scripts/templates/home.phtml +++ b/framework/application/views/scripts/templates/home.phtml @@ -4,14 +4,30 @@ $this->headScript()->addScriptAndStyle('home');
markupDotclear($this->titre); ?>
-
+
+
+ homeSlideshow($this->slideshow); + ?> +
+
-
+

agence['titre']); ?>

- homeAgence($this->agence); ?> + homeBlocs($this->agence); ?> + +
+
+ +
+
+ +

expertises['titre']); ?>

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