]> _ Git - cubedesigners-v7.git/commitdiff
(no commit message)
authorbruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Jan 2014 13:58:33 +0000 (13:58 +0000)
committerbruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Jan 2014 13:58:33 +0000 (13:58 +0000)
26 files changed:
framework/application/configs/application.ini
framework/application/forms/CMS/Contact.php
framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Agence/Persons/Blocs.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Agence/Pictos/Bloc.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Agence/Pictos/Blocs.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Contact.php
framework/application/forms/CMS/Sub/Contact/Office.php
framework/application/forms/CMS/Sub/Contact/Offices.php
framework/application/forms/CMS/Sub/ContactMarkers.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Coordonnees.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/MapPoint.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/MapSettings.php [new file with mode: 0644]
framework/application/forms/Settings.php
framework/application/views/helpers/ContactInfos.php [new file with mode: 0644]
framework/application/views/helpers/FooterContact.php
framework/application/views/scripts/templates/contact.phtml [new file with mode: 0644]
images/picto_footer_mail.svg
images/picto_geoloc.svg [new file with mode: 0644]
images/picto_tel.svg [new file with mode: 0644]
js/contact.js [new file with mode: 0644]
less/agence.less
less/common.less
less/contact.less [new file with mode: 0644]
less/footer.less
less/home.less

index febcaa7db0930470a7fa9bc644d90250bf4f40e7..9f715db58486f326a463e236802363a4681f68df 100644 (file)
@@ -44,6 +44,8 @@ navigation.containers[]=0;
 navigation.containers[]=-2;
 navigation.containers[]=-3;
 
+googleapi=AIzaSyDKYIWGbAgnV0N9SVx0jb9lt1qqD4dSFmQ
+
 locales.fr =
 locales.en =
 
index dcf7ef70a2594fed57a4d737f6dc4e09f122032f..c272d187bdfc89d3a5f64e2b0a7adcb4cd6ab36c 100644 (file)
@@ -5,9 +5,17 @@ class Cubedesigners_Form_CMS_Contact 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
 \r
 }\r
diff --git a/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php b/framework/application/forms/CMS/Sub/Agence/Persons/Bloc.php
new file mode 100644 (file)
index 0000000..7dd6737
--- /dev/null
@@ -0,0 +1,24 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Agence_Persons_Bloc extends CubeIT_Form_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $titre = new Zend_Form_Element_Text('titre');
+        $titre->setLabel('Prénom et nom');
+        $this->addElement($titre);
+
+        $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
+        $texte->setLabel('Texte');
+        $this->addElement($texte);
+
+        $photo = new CubeIT_Form_Element_File_Image('photo');
+        $photo->setLabel('Photo');
+        $photo->setMaxItems(1);
+        $this->addElement($photo);
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/Agence/Persons/Blocs.php b/framework/application/forms/CMS/Sub/Agence/Persons/Blocs.php
new file mode 100644 (file)
index 0000000..0c6fe36
--- /dev/null
@@ -0,0 +1,16 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Agence_Persons_Blocs extends CubeIT_Form_Multi_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $bloc = new Cubedesigners_Form_CMS_Sub_Agence_Persons_Bloc();
+        $this->setBaseSubForm($bloc);
+        $this->setBaseLegend('Edition de « $titre »');
+        $this->setNewLegend('Nouvelle personne');
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/Agence/Pictos/Bloc.php b/framework/application/forms/CMS/Sub/Agence/Pictos/Bloc.php
new file mode 100644 (file)
index 0000000..35b5395
--- /dev/null
@@ -0,0 +1,28 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Agence_Pictos_Bloc extends CubeIT_Form_SubForm {
+
+    public function init() {
+        parent::init();
+
+        /* $titre = new Zend_Form_Element_Text('titre');
+          $titre->setLabel('Titre');
+          $this->addElement($titre);
+
+          $stitre = new Zend_Form_Element_Text('soustitre');
+          $stitre->setLabel('Sous-titre');
+          $this->addElement($stitre); */
+
+        $texte = new CubeIT_Form_Element_Markitup('texte');
+        $texte->setLabel('Texte');
+        $this->addElement($texte);
+
+        $picto = new CubeIT_Form_Element_File_Image('picto');
+        $picto->setLabel('Picto');
+        $picto->setMaxItems(1);
+        $this->addElement($picto);
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/Agence/Pictos/Blocs.php b/framework/application/forms/CMS/Sub/Agence/Pictos/Blocs.php
new file mode 100644 (file)
index 0000000..9cc921c
--- /dev/null
@@ -0,0 +1,16 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Agence_Pictos_Blocs extends CubeIT_Form_Multi_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $bloc = new Cubedesigners_Form_CMS_Sub_Agence_Pictos_Bloc();
+        $this->setBaseSubForm($bloc);
+        $this->setBaseLegend('Edition du picto « $texte »');
+        $this->setNewLegend('Nouveau picto');
+    }
+
+}
+
+?>
index 8cafaa13e9ee4143b9c509ffcdd669f23241570e..daad21d13b1fd9ab2e6f1c1e2778bd9cd9a3da85 100644 (file)
@@ -9,9 +9,9 @@ class Cubedesigners_Form_CMS_Sub_Contact extends CubeIT_Form_SubForm {
         $bloc->setLabel('Bloc "Nous Contacter"');
         $this->addElement($bloc);
 
-        $bureau = new Cubedesigners_Form_CMS_Sub_Contact_Offices('bureaux');
-        $bureau->setLegend('Bureaux');
-        $this->addSubForm($bureau, 'bureau');
+        $bureaux = new Cubedesigners_Form_CMS_Sub_Contact_Offices('bureaux');
+        $bureaux->setLegend('Bureaux');
+        $this->addSubForm($bureaux, 'bureaux');
     }
 
 }
index 6b01466438a1a5c30c2d17919c59665323e3e1a8..7dadfeb9182b71fac04318fd9c95f77468aebd04 100644 (file)
@@ -5,21 +5,18 @@ class Cubedesigners_Form_CMS_Sub_Contact_Office extends CubeIT_Form_SubForm {
     public function init() {
         parent::init();
 
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre du bureau');
-        $this->addElement($titre);
-
-        $telephone = new CubeIT_Form_Element_Phone('telephone');
-        $telephone->setLabel('Téléphone');
-        $this->addElement($telephone);
-
-        $fax = new CubeIT_Form_Element_Phone('fax');
-        $fax->setLabel('Fax');
-        $this->addElement($fax);
-
-        $adresse = new CubeIT_Form_Adresse('adresse');
-        $adresse->setLabel('Adresse');
-        $this->addSubForm($adresse, 'adresse');
+        /* BUREAUX */
+        $coordonnees = new Cubedesigners_Form_CMS_Sub_MapPoint('coordonnees');
+        $coordonnees->setLabel('Coordonnées');
+        $this->addSubForm($coordonnees, 'coordonnees');
+
+        $map = new Cubedesigners_Form_CMS_Sub_MapSettings('map');
+        $map->setLegend('Paramètre de la carte');
+        $this->addSubForm($map, 'map');
+
+        $marqueurs = new Cubedesigners_Form_CMS_Sub_ContactMarkers('markers');
+        $marqueurs->setLegend('Points d\'intérêts');
+        $this->addSubForm($marqueurs, 'markers');
     }
 
 }
index f98d63784a5c8e3612c8fc2b5a4eaf938dc7992a..fbb1fa16f03e28e5d21d967df358830429d5ebfa 100644 (file)
@@ -7,7 +7,7 @@ class Cubedesigners_Form_CMS_Sub_Contact_Offices extends CubeIT_Form_Multi_SubFo
 
         $office = new Cubedesigners_Form_CMS_Sub_Contact_Office();
         $this->setBaseSubForm($office);
-        $this->setBaseLegend('Edition du bureau « $titre »');
+        $this->setBaseLegend('Edition du bureau « $coordonnees »');
         $this->setNewLegend('Nouveau bureau');
     }
 
diff --git a/framework/application/forms/CMS/Sub/ContactMarkers.php b/framework/application/forms/CMS/Sub/ContactMarkers.php
new file mode 100644 (file)
index 0000000..f08e89b
--- /dev/null
@@ -0,0 +1,15 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_ContactMarkers extends CubeIT_Form_Multi_SubForm {
+
+    public function init() {
+        parent::init();
+        $bloc = new Cubedesigners_Form_CMS_Sub_MapPoint();
+        $this->setBaseSubForm($bloc);
+        $this->setBaseLegend('Edition du point « $nom »');
+        $this->setNewLegend('Nouveau point');
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/Coordonnees.php b/framework/application/forms/CMS/Sub/Coordonnees.php
new file mode 100644 (file)
index 0000000..dcf6cb8
--- /dev/null
@@ -0,0 +1,23 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Coordonnees extends CubeIT_Form_Adresse {
+
+    public function init() {
+        $nom = new Zend_Form_Element_Text('nom');
+        $nom->setLabel('Nom');
+        $this->addElement($nom);
+
+        parent::init();
+
+        $tel = new CubeIT_Form_Element_Phone('tel');
+        $tel->setLabel('Téléphone');
+        $this->addElement($tel);
+
+        $fax = new CubeIT_Form_Element_Phone('fax');
+        $fax->setLabel('Fax');
+        $this->addElement($fax);
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/MapPoint.php b/framework/application/forms/CMS/Sub/MapPoint.php
new file mode 100644 (file)
index 0000000..ebf68e2
--- /dev/null
@@ -0,0 +1,15 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_MapPoint extends Cubedesigners_Form_CMS_Sub_Coordonnees {
+
+    public function init() {
+        parent::init();
+
+        $icon = new CubeIT_Form_Element_File_Image('icon');
+        $icon->setLabel('Icône');
+        $this->addElement($icon);
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/MapSettings.php b/framework/application/forms/CMS/Sub/MapSettings.php
new file mode 100644 (file)
index 0000000..73950cc
--- /dev/null
@@ -0,0 +1,23 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_MapSettings extends CubeIT_Form_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $zoom = new CubeIT_Form_Element_Int('zoom');
+        $zoom->setLabel('Niveau de zoom');
+        $this->addElement($zoom);
+
+        $centre = new CubeIT_Form_Adresse('centre');
+        $centre->setLegend('Centrer la carte sur');
+        $this->addSubForm($centre, 'centre');
+
+        $google = new CubeIT_Form_Element_Url('googleLink');
+        $google->setLabel('Lien vers plan agrandi');
+        $this->addElement($google);
+    }
+
+}
+
+?>
index 0b4fb74b7476ad01e296a5f3582d62c54dc9f1e5..c161d5c773384833aeee52a210db1fb2fb1f0aef 100644 (file)
@@ -20,6 +20,7 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings {
         $contact->setLabel('Informations de contact');
         $this->addSubFormLocalized($contact, 'contact');
 
+
         /* BLOC ACTUALITES */
         $actus = new Cubedesigners_Form_CMS_Sub_News();
         $actus->setLabel('Bloc Actualités');
diff --git a/framework/application/views/helpers/ContactInfos.php b/framework/application/views/helpers/ContactInfos.php
new file mode 100644 (file)
index 0000000..e2f1503
--- /dev/null
@@ -0,0 +1,40 @@
+<?php\r
+\r
+class Cubedesigners_View_Helper_ContactInfos extends Zend_View_Helper_Abstract {\r
+\r
+    public function contactInfos($texte, $bureaux) {\r
+\r
+        $res = '<div class="contact-texte">' . $this->view->markupDotclear($texte) . '</div>';\r
+\r
+        //$bureaux = $contact['bureaux'];\r
+\r
+        foreach ($bureaux as $id => $bureau) {\r
+\r
+            $res.='<div class="col">';\r
+\r
+            $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';\r
+\r
+            $res.='<div class="adresse">';\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.='</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.='</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.='</div>'; */\r
+\r
+            $res.='</div>';\r
+        }\r
+\r
+        return $res;\r
+    }\r
+\r
+}\r
+\r
+?>\r
index 59184e816cbcaddf2a0504cc3a48480bfcff8029..d710033550e1d5dc7153312dd2374c7132aade20 100644 (file)
@@ -6,28 +6,30 @@ class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract
 \r
         $res = '<div class="contact-texte">' . $this->view->markupDotclear($contact['bloc']) . '</div>';\r
 \r
-        $bureaux = $contact['bureau'];\r
+        //fb($contact['bureau']);\r
+\r
+        $bureaux = $contact['bureaux'];\r
 \r
         foreach ($bureaux as $id => $bureau) {\r
 \r
             $res.='<div class="bureau">';\r
 \r
-            $res.='<p class="titre">' . $bureau['titre'] . '<p>';\r
+            $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';\r
 \r
             $res.='<div class="numeros">';\r
-            $res.='<p>' . __('Tel') . ' ' . $bureau['telephone'] . '</p>';\r
-            $res.='<p>' . __('Fax') . ' ' . $bureau['fax'] . '</p>';\r
+            $res.='<p>' . __('Tel') . ' ' . $bureau['coordonnees']['tel'] . '</p>';\r
+            $res.='<p>' . __('Fax') . ' ' . $bureau['coordonnees']['fax'] . '</p>';\r
             $res.='</div>';\r
 \r
             $res.='<div class="adresse">';\r
             $res.='<p>' . __('Cubedesigners') . '</p>';\r
-            $res.='<p>' . $bureau['adresse']['adresse'] . '</p>';\r
-            $res.='<p>' . $bureau['adresse']['code_postal'] . ' ' . $bureau['adresse']['ville'] . '</p>';\r
-            $res.='<p>' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory') . '<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.='</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['coordonnees']['adresse'] . ',' . $bureau['coordonnees']['ville'] . ',' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory'));\r
             $res.='</div>';\r
 \r
             $res.='</div>';\r
diff --git a/framework/application/views/scripts/templates/contact.phtml b/framework/application/views/scripts/templates/contact.phtml
new file mode 100644 (file)
index 0000000..94b6ebb
--- /dev/null
@@ -0,0 +1,37 @@
+<?php\r
+$this->headScript()->addGoogleMaps(array('key' => $this->options['googleapi']));\r
+$this->headScript()->addScriptAndStyle('contact');\r
+\r
+$bureaux = $this->option('contact')['bureaux'];\r
+\r
+//fb($bureaux);\r
+\r
+$i = 1;\r
+foreach ($bureaux as $bureau) {\r
+    $this->headScriptVariables()->setVariable('map' . $i, $bureaux[$i - 1]['map']);\r
+    $this->headScriptVariables()->setVariable('coordonnees' . $i, $bureaux[$i - 1]['coordonnees']);\r
+    $this->headScriptVariables()->setVariable('markers' . $i, $bureaux[$i - 1]['markers']);\r
+    $i++;\r
+}\r
+?>\r
+\r
+<div id="contact-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
+\r
+<div id="contact-informations">\r
+    <?php echo $this->contactInfos($this->option('contact')['bloc'], $bureaux); ?>\r
+</div>\r
+\r
+<div id="contact-maps">\r
+    <?php\r
+    $j = 1;\r
+    foreach ($bureaux as $bureau) {\r
+        echo '<div id="map' . $j . '"></div>';\r
+        $j++;\r
+    }\r
+    ?>\r
+</div>\r
+\r
+<div id="contact-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>
\ No newline at end of file
index 553f11fc9d6db5be4b5ac69823fc98fe419776e2..30fefa0969950df41328d93bd40f903e7793f46f 100644 (file)
@@ -4,13 +4,13 @@
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
         width="48.189px" height="48.188px" viewBox="0 0 48.189 48.188" enable-background="new 0 0 48.189 48.188" xml:space="preserve">\r
 <g>\r
-       <circle fill="#4981C3" cx="24.095" cy="24.095" r="21.26"/>\r
+       <circle fill="#3885E0" cx="24.222" cy="23.914" r="21.26"/>\r
        <g>\r
-               <polygon fill="#FFFFFF" points="12.288,16.832 20.354,23.437 12.288,31.442               "/>\r
-               <polygon fill="#FFFFFF" points="35.902,16.832 27.836,23.437 35.902,31.442               "/>\r
-               <polygon fill="#FFFFFF" points="12.855,15.699 24.095,24.91 35.335,15.699                "/>\r
+               <polygon fill="#FFFFFF" points="12.416,16.652 20.482,23.256 12.416,31.262               "/>\r
+               <polygon fill="#FFFFFF" points="36.03,16.652 27.964,23.256 36.03,31.262                 "/>\r
+               <polygon fill="#FFFFFF" points="12.983,15.519 24.223,24.73 35.463,15.519                "/>\r
                <g>\r
-                       <polygon fill="#FFFFFF" points="24.095,26.49 21.257,24.165 12.855,32.49 35.335,32.49 26.934,24.165                      "/>\r
+                       <polygon fill="#FFFFFF" points="24.223,26.31 21.385,23.985 12.983,32.31 35.463,32.31 27.061,23.985                      "/>\r
                </g>\r
        </g>\r
 </g>\r
diff --git a/images/picto_geoloc.svg b/images/picto_geoloc.svg
new file mode 100644 (file)
index 0000000..ffe1ed1
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="48.189px" height="48.188px" viewBox="0 0 48.189 48.188" enable-background="new 0 0 48.189 48.188" xml:space="preserve">\r
+<g>\r
+       <circle fill="#191919" cx="24.02" cy="23.913" r="21.26"/>\r
+       <path fill="#FFFFFF" d="M26.785,11.808c-0.565-0.237-1.143-0.389-1.723-0.472c-0.013-0.004-0.029-0.005-0.042-0.007\r
+               c-0.334-0.047-0.668-0.078-0.999-0.076c-0.332-0.002-0.665,0.029-0.998,0.076c-0.014,0.002-0.029,0.003-0.044,0.007\r
+               c-0.579,0.083-1.156,0.234-1.721,0.472c-3.595,1.513-5.283,5.654-3.77,9.249l1.245,2.959l5.287,12.558l5.287-12.558l1.244-2.959\r
+               C32.066,17.462,30.379,13.321,26.785,11.808z M24.02,21.287c-1.963,0-3.556-1.59-3.556-3.555s1.593-3.556,3.556-3.556\r
+               c1.964,0,3.556,1.591,3.556,3.556S25.984,21.287,24.02,21.287z"/>\r
+</g>\r
+</svg>\r
diff --git a/images/picto_tel.svg b/images/picto_tel.svg
new file mode 100644 (file)
index 0000000..f68b1b6
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="48.189px" height="48.188px" viewBox="0 0 48.189 48.188" enable-background="new 0 0 48.189 48.188" xml:space="preserve">\r
+<circle fill="#191919" cx="24.02" cy="23.913" r="21.26"/>\r
+<g>\r
+       <path fill="#FFFFFF" d="M27.848,28.911c-2.119,1.232-5.253-1.828-6.016-2.627c0.004-0.004,0.006-0.006,0.006-0.006\r
+               s-0.039-0.036-0.094-0.087c-0.05-0.054-0.086-0.093-0.086-0.093s-0.002,0.002-0.006,0.006c-0.799-0.763-3.859-3.897-2.627-6.016\r
+               c-2.979-2.979-5.833-5.833-5.833-5.833l-1.188,1.188c0,0-1.236,6.364,6.293,14.016c-0.003,0.003-0.004,0.004-0.006,0.006\r
+               c0.031,0.031,0.062,0.056,0.093,0.087c0.03,0.031,0.056,0.062,0.087,0.093c0.002-0.002,0.003-0.004,0.005-0.006\r
+               c7.652,7.529,14.017,6.293,14.017,6.293l1.188-1.188C33.681,34.744,30.828,31.891,27.848,28.911z"/>\r
+       \r
+               <rect x="13.468" y="14.362" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.2429 -7.8598)" fill="#FFFFFF" width="8.282" height="2.631"/>\r
+       \r
+               <rect x="28.11" y="29.003" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.8845 -13.9246)" fill="#FFFFFF" width="8.282" height="2.631"/>\r
+</g>\r
+</svg>\r
diff --git a/js/contact.js b/js/contact.js
new file mode 100644 (file)
index 0000000..e48e241
--- /dev/null
@@ -0,0 +1,148 @@
+var markers=[];
+
+var mapStyles =[
+                    {
+                    stylers: [
+                      { 
+                          saturation: -100
+                      }
+                    ]
+                  },
+               { 
+                       featureType: "road",
+                       elementType: "labels.text.fill",
+                       stylers: [
+                       {
+                               color: "#000000"
+                       }
+                       ]
+               },
+                { 
+                       featureType: "landscape.natural",
+                       stylers: [
+                       {
+                               color: "#000000"
+                       }
+                       ]
+               }
+               ];
+
+function initMaps(){
+    
+       var mapSettings=Application.map1;
+       var centre=mapSettings.centre;
+       var coder=new google.maps.Geocoder();
+       coder.geocode({
+               address:centre.adresse+' - '+centre.ville,
+               region:centre.pays
+       },function(res){
+               var result=res[0];
+               var center=result.geometry.location;
+               
+               var mapOptions = {
+                       zoom:parseInt(mapSettings.zoom),
+                       center: center,
+                       mapTypeControlOptions: {
+                               mapTypeIds: [google.maps.MapTypeId.ROADMAP]
+                       },
+                       styles:mapStyles,
+                       mapTypeId: google.maps.MapTypeId.ROADMAP
+               };
+
+               var map = new google.maps.Map(document.getElementById('map1'),
+                       mapOptions);
+                       
+               Application.markers1.unshift(Application.coordonnees1);
+               
+               for(var i=0;i<Application.markers1.length;i++){
+                       m=Application.markers1[i];
+                       
+                       addMarker(m,map);
+               }
+       });     
+        
+        
+       var mapSettings2=Application.map2;
+       var centre2=mapSettings2.centre;
+       var coder2=new google.maps.Geocoder();
+       coder2.geocode({
+               address:centre2.adresse+' - '+centre2.ville,
+               region:centre2.pays
+       },function(res){
+               var result=res[0];
+               var center=result.geometry.location;
+               
+               var mapOptions = {
+                       zoom:parseInt(mapSettings2.zoom),
+                       center: center,
+                       mapTypeControlOptions: {
+                               mapTypeIds: [google.maps.MapTypeId.ROADMAP]
+                       },
+                       styles:mapStyles,
+                       mapTypeId: google.maps.MapTypeId.ROADMAP
+               };
+
+               var map = new google.maps.Map(document.getElementById('map2'),
+                       mapOptions);
+               
+                Application.markers2.unshift(Application.coordonnees2);
+               
+               for(var i=0;i<Application.markers2.length;i++){
+                       m=Application.markers2[i];
+                       
+                       addMarker(m,map);
+               }
+       });     
+}
+
+google.maps.event.addDomListener(window, 'load', initMaps);
+
+
+function addMarker(m,map){
+    
+       var coder=new google.maps.Geocoder();
+       coder.geocode({
+               address:m.adresse+' - '+m.ville,
+               region:m.pays
+       },function(res){
+               var result=res[0];
+               var pos=result.geometry.location;
+                       
+               var marker = new google.maps.Marker({
+                       icon: '/'+m.icon[0],
+                       position: pos,
+                       map: map
+               });
+                       
+               var content=makeInfoContent(m);
+               marker.infos=new google.maps.InfoWindow({
+                       content:content
+               });
+               window.markers.push(marker);
+               google.maps.event.addListener(marker, 'click', function() {
+                       for(var i=0;i<window.markers.length;i++){
+                               var ma=window.markers[i];
+                               ma.infos.close();
+                       }
+                       this.infos.open(map,this);
+               });
+       });
+}
+
+function makeInfoContent(c){
+       var res='';
+       if(c.nom!=''){
+               res+='<strong>'+c.nom+'</strong><br />';        
+       }
+       if(c.adresse!=''){
+               res+=c.adresse+'<br />';
+       }
+       if(c.code_postal){
+               res+=c.code_postal+' ';
+       }
+       if(c.ville!=''){
+               res+=c.ville+'<br />';
+       }
+       return res;
+       
+}
\ No newline at end of file
index e1c905c1d7631e20b03cf5597423511d5567e8f5..f5fb6d182d1bf81f094c54c8ea7a22b601513299 100644 (file)
 }
 
 .agency-persons .bloc-holder h1  {
-    font-family: 'roboto_condensedlight';
-    font-weight: normal;
     font-size:56px;
 }
 
 .agency-persons .bloc-holder h2{
-    font-family: 'roboto_condensedlight';
-    font-weight: normal;
     font-size:32px;
     padding: 0 0 20px 0;
 }
 .agency-persons .bloc-holder .sousbloc {
     float:left;
     //width:50%;
-    width:47%;
+    width: 47.5%;
     margin-right: 20px;
 }
 
index 21398c5c8547fb5fb611d04ad9a9a5074ef7e78f..f39db4aaa1a1339540fc2945b9e90ea1f67b9341 100644 (file)
@@ -1,9 +1,24 @@
 body {\r
     font-family: 'roboto_condensedlight';\r
     font-size:16px;\r
+    font-weight: normal;\r
     color:#1b1b1b;\r
 }\r
 \r
+h1, h2 {\r
+    font-weight: normal;\r
+}\r
+\r
+a {\r
+        text-decoration: none;\r
+       color:#3885e0;\r
+}\r
+\r
+a:hover,\r
+a:active {\r
+       color:#3885e0;\r
+}\r
+\r
 #main {\r
     margin: 0 auto;\r
     //min-width: 1024px;\r
diff --git a/less/contact.less b/less/contact.less
new file mode 100644 (file)
index 0000000..4131adc
--- /dev/null
@@ -0,0 +1,81 @@
+/* Contact Title */
+#contact-title {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 50px 0 50px 0;
+}
+
+#contact-title h1 {
+    text-align: left;
+    font-weight: normal;
+    font-size: 56px;
+}
+
+/* Contact informations */
+#contact-informations .contact-texte {
+    background-image: url('../images/picto_footer_mail.svg');
+    background-repeat:  no-repeat;
+    background-position:0px 10px;
+    font-weight: normal;
+    padding-left:70px;
+    padding-bottom: 50px;
+}
+
+#contact-informations .col .titre {
+    padding-bottom: 20px;
+    font-size: 32px;
+}
+
+#contact-informations .col .adresse {
+    background-image: url('../images/picto_geoloc.svg');
+    background-repeat:  no-repeat;
+    background-position:0px 0px;
+    padding-left:70px;
+    padding-bottom: 50px;
+}
+
+#contact-informations .col .numeros {
+    background-image: url('../images/picto_tel.svg');
+    background-repeat:  no-repeat;
+    background-position:0px 0px;
+    padding-left:70px;
+    padding-bottom: 50px;
+}
+
+/* Contact maps */
+#contact-maps {
+    overflow:hidden;
+    padding: 0 0 50px 0;
+}
+
+#map1 {
+    width: 47.5%;
+    float:left;
+    height: 390px;
+}
+#map2 {
+    width: 50.5%;
+    float:right;
+    height: 390px;
+}
+
+/* Contact description */
+#contact-informations,
+#contact-description {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    overflow: hidden;
+    padding: 0 0 50px 0;
+}
+
+.col {
+    float:left;
+    margin-right: 20px;
+    width: 47%;
+}
+
+.col .dotclear {
+    width:95%;
+}
\ No newline at end of file
index 00dd0b8bbe7064a3dc3ef5de4c46d0142127c3cb..ce5697fec8bb51c1fdcc7e64ebfabfda265287ff 100644 (file)
 }
 
 #footer .footer-top .footer-top-content .bloc h1 {
-    font-family: 'roboto_condensedlight';
-    font-weight: normal;
     color:#fff;
-    font-size:56px;;
+    font-size:56px;
     padding-top: 50px;
     padding-bottom: 50px;
 }
 
 #footer .footer-top .footer-top-content .bloc h2 {
-    font-family: 'roboto_condensedlight';
-    font-weight: normal;
     color:#fff;
-    font-size:56px;;
+    font-size:56px;
     padding-top: 50px;
     padding-bottom: 20px;
 }
@@ -45,8 +41,6 @@
     background-image: url('../images/picto_footer_mail.svg');
     background-repeat:  no-repeat;
     background-position:0px 10px;
-    font-family: 'roboto_condensedlight';
-    font-weight: normal;
     color:#fff;
     padding-left:70px;
     padding-bottom: 50px;
@@ -81,8 +75,6 @@
 
 /* Footer Actualites */
 #footer .actu {
-    font-family: 'roboto_condensedlight';
-    font-weight: normal;
     color:#6c6c6c;
     padding-bottom: 20px;
 }
     text-align: center;
     font-size: 12px;
     line-height: 30px;
-}
-
-/* Footer Liens */
-#footer a{
-        text-decoration: none;
-       color:#3885e0;
-}
-
-#footer a:hover,
-#footer .active a{
-       color:#3885e0;
 }
\ No newline at end of file
index cf708b032294984227a469275287a5d3be9c3df3..3a362ca81268e57b646a6906da1020f9935479d0 100644 (file)
@@ -5,13 +5,11 @@
 \r
 .home-title h1 {\r
     text-align: center;\r
-    font-weight: normal;\r
     font-size: 56px;\r
 }\r
 \r
 .home-title h2 {\r
     text-align: center;\r
-    font-weight: normal;\r
     font-size: 32px;\r
 }\r
 \r
 \r
 .home-agency .bloc-holder h1,\r
 .home-expertise .bloc-holder h1  {\r
-    font-family: 'roboto_condensedlight';\r
-    font-weight: normal;\r
     font-size:56px;\r
 }\r
 \r
 .home-agency .bloc-holder h2,\r
 .home-expertise .bloc-holder h2 {\r
-    font-family: 'roboto_condensedlight';\r
-    font-weight: normal;\r
     font-size:32px;\r
     padding: 0 0 20px 0;\r
 }\r