(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index d49f5a349057ae2dbd479c7d0116d78b51c379ff..1ebd848c1b45ba3963bdee5ec48dbd766288a968 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -116,13 +116,13 @@ class Bootstrap extends CubeIT_Bootstrap {
 
                $templates = parent::getCMSTemplates();
 
-               $templates['Agence'] = array("agence" => "L'agence");
-               $templates['Realisations'] = array('realisations' => 'Réalisations');
-               $templates['Casestudies'] = array('casestudies' => 'Case-Studies');
-               $templates['CasestudiesDetail'] = array('casestudies_detail' => 'Case-Studies (détail)');
-               $templates['Expertises'] = array('expertises' => 'Expertises');
-               $templates['Contact'] = array('contact' => 'Contact');
-               $templates['Mentions'] = array('mentions' => 'Mentions légales');
+               $templates['text'] = 'Page de texte';
+               $templates['agence'] = "L'agence";
+               $templates['realisations'] = 'Réalisations';
+               $templates['Etudes de cas'] = array('casestudies' => 'Accueil des études de cas', 'casestudies_detail' => 'Détail d\'étude de cas');
+               $templates['Expertises'] = array('expertises' => 'Accueil de la rubrique Expertises',
+                       'expertise' => 'Page de détail d\'expertise');
+               $templates['contact'] = 'Contact';
 
                return $templates;
        }

diff --git a/framework/application/forms/CMS/Agence.php b/framework/application/forms/CMS/Agence.php
index f7faf9452b62a0b59553fde92c316a8de50399fa..ba3aca2c4a1ffa30968099e15ac5cd6cea68ed22 100644 (file)
--- a/framework/application/forms/CMS/Agence.php
+++ b/framework/application/forms/CMS/Agence.php
@@ -1,36 +1,24 @@
-<?php\r
-\r
-class Cubedesigners_Form_CMS_Agence extends Cubedesigners_Form_CMS {\r
-\r
-    public function init() {\r
-        parent::init();\r
-\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
-\r
+<?php
+
+class Cubedesigners_Form_CMS_Agence extends Cubedesigners_Form_CMS_Twocolumns {
+
+       public function init() {
+               parent::init();
+
+               $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');
+       }
+
+}
+
 ?>
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Contact.php b/framework/application/forms/CMS/Contact.php
index c272d187bdfc89d3a5f64e2b0a7adcb4cd6ab36c..958753808f963db15cb7668456e4df40e7449f2b 100644 (file)
--- a/framework/application/forms/CMS/Contact.php
+++ b/framework/application/forms/CMS/Contact.php
@@ -1,23 +1,5 @@
-<?php\r
-\r
-class Cubedesigners_Form_CMS_Contact extends Cubedesigners_Form_CMS {\r
-\r
-    public function init() {\r
-        parent::init();\r
-\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
-\r
-?>
\ No newline at end of file
+<?php
+
+class Cubedesigners_Form_CMS_Contact extends Cubedesigners_Form_CMS_Twocolumns {
+
+}

diff --git a/framework/application/forms/CMS/Expertise.php b/framework/application/forms/CMS/Expertise.php
new file mode 100644 (file)
index 0000000..54692a5
--- /dev/null
+++ b/framework/application/forms/CMS/Expertise.php
@@ -0,0 +1,7 @@
+<?php
+
+class Cubedesigners_Form_CMS_Expertise extends Cubedesigners_Form_CMS {
+
+}
+
+?>

diff --git a/framework/application/forms/CMS/Expertises.php b/framework/application/forms/CMS/Expertises.php
index ee1553615b75bc1c5988937b1b24782bc355f30a..5d5002f9ebd3ed09de84ab655de0d288f66cfcce 100644 (file)
--- a/framework/application/forms/CMS/Expertises.php
+++ b/framework/application/forms/CMS/Expertises.php
@@ -1,15 +1,19 @@
-<?php\r
-\r
-class Cubedesigners_Form_CMS_Expertises extends Cubedesigners_Form_CMS {\r
-\r
-    public function init() {\r
-        parent::init();\r
-\r
-        $titre = new CubeIT_Form_Element_Markitup('titre');\r
-        $titre->setLabel('Titre');\r
-        $this->addElement($titre);\r
-    }\r
-\r
-}\r
-\r
-?>
\ No newline at end of file
+<?php
+
+class Cubedesigners_Form_CMS_Expertises extends Cubedesigners_Form_CMS_Twocolumns {
+
+       public function init() {
+               parent::init();
+
+
+               $citation = new CubeIT_Form_Element_Textarea('citation');
+               $citation->setLabel('Citation');
+               $citation->setAttrib('rows', 3);
+               $this->addElement($citation);
+
+               $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
+               $expertises->setLegend('Domaines d\'expertises');
+               $this->addSubForm($expertises, 'expertises');
+       }
+
+}

diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php
index b255b8955466fe70fa3000bfce7cf419f078191e..bd7d3cdbaabd7d643850d90eea9fd48a4135e28a 100644 (file)
--- a/framework/application/forms/CMS/Home.php
+++ b/framework/application/forms/CMS/Home.php
@@ -2,25 +2,25 @@
 
 class Cubedesigners_Form_CMS_Home extends Cubedesigners_Form_CMS {
 
-    public function init() {
-        parent::init();
+       public function init() {
+               parent::init();
 
-        $titre = new CubeIT_Form_Element_Markitup('titre');
-        $titre->setLabel('Titre');
-        $this->addElement($titre);
+               $titre = new CubeIT_Form_Element_Markitup('titre');
+               $titre->setLabel('Titre');
+               $this->addElement($titre);
 
-        $slideshow = new Cubedesigners_Form_CMS_Sub_Home_Slideshow();
-        $slideshow->setLabel('Slideshow');
-        $this->addSubForm($slideshow, 'slideshow');
+               $slideshow = new Cubedesigners_Form_CMS_Sub_Home_Slideshow();
+               $slideshow->setLabel('Carrousel');
+               $this->addSubForm($slideshow, 'slideshow');
 
-        $agence = new Cubedesigners_Form_CMS_Sub_Home_Agence();
-        $agence->setLabel("Bloc L'agence");
-        $this->addSubForm($agence, 'agence');
+               $agence = new Cubedesigners_Form_CMS_Sub_Home_Agence();
+               $agence->setLabel("L'agence");
+               $this->addSubForm($agence, 'agence');
 
-        $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
-        $expertises->setLabel('Bloc Expertises');
-        $this->addSubForm($expertises, 'expertises');
-    }
+               $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
+               $expertises->setLabel(' Expertises');
+               $this->addSubForm($expertises, 'expertises');
+       }
 
 }
 

diff --git a/framework/application/forms/CMS/Mentions.php b/framework/application/forms/CMS/Mentions.php
deleted file mode 100644 (file)
index 4d6c18b..0000000
--- a/framework/application/forms/CMS/Mentions.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php\r
-\r
-class Cubedesigners_Form_CMS_Mentions extends Cubedesigners_Form_CMS {\r
-\r
-    public function init() {\r
-        parent::init();\r
-\r
-        $titre = new Zend_Form_Element_Text('titre');\r
-        $titre->setLabel('Titre');\r
-        $this->addElement($titre);\r
-    }\r
-\r
-}\r
-\r
-?>
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Home/Expertises.php b/framework/application/forms/CMS/Sub/Home/Expertises.php
index 3a9820e9c55ac5e3ac79d73dc287efa6acef1152..2f6f174f4d164fe0f6c2db5158b576550c09ecb9 100644 (file)
--- a/framework/application/forms/CMS/Sub/Home/Expertises.php
+++ b/framework/application/forms/CMS/Sub/Home/Expertises.php
@@ -2,17 +2,17 @@
 
 class Cubedesigners_Form_CMS_Sub_Home_Expertises extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
+       public function init() {
+               parent::init();
 
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre');
-        $this->addElement($titre);
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Titre');
+               $this->addElement($titre);
 
-        $blocs = new Cubedesigners_Form_CMS_Sub_Home_Expertises_Blocs('blocs');
-        $blocs->setLegend('Sous-blocs');
-        $this->addSubForm($blocs, 'blocs');
-    }
+               $blocs = new Cubedesigners_Form_CMS_Sub_Home_Expertises_Blocs('blocs');
+               $blocs->setLegend('Expertises');
+               $this->addSubForm($blocs, 'blocs');
+       }
 
 }
 

diff --git a/framework/application/forms/CMS/Sub/Home/Expertises/Bloc.php b/framework/application/forms/CMS/Sub/Home/Expertises/Bloc.php
index 3b36dfbe7bcdae75d25b3f246279eecf4ac5aa1b..4a8752225733bd9f2fd6f4fa52a326030a075c7d 100644 (file)
--- a/framework/application/forms/CMS/Sub/Home/Expertises/Bloc.php
+++ b/framework/application/forms/CMS/Sub/Home/Expertises/Bloc.php
@@ -2,22 +2,26 @@
 
 class Cubedesigners_Form_CMS_Sub_Home_Expertises_Bloc extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
-
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre du bloc');
-        $this->addElement($titre);
-
-        $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
-        $texte->setLabel('Texte');
-        $this->addElement($texte);
-
-        $picto = new CubeIT_Form_Element_File_Image('picto');
-        $picto->setLabel('Pictogramme');
-        $picto->setMaxItems(1);
-        $this->addElement($picto);
-    }
+       public function init() {
+               parent::init();
+
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Titre du bloc');
+               $this->addElement($titre);
+
+               $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
+               $texte->setLabel('Texte');
+               $this->addElement($texte);
+
+               $picto = new CubeIT_Form_Element_File_Image('picto');
+               $picto->setLabel('Pictogramme');
+               $picto->setMaxItems(1);
+               $this->addElement($picto);
+
+               $page = new CubeIT_Form_Element_Page('lien');
+               $page->setLabel('Lien vers');
+               $this->addElement($page);
+       }
 
 }
 

diff --git a/framework/application/forms/CMS/Sub/Home/Expertises/Blocs.php b/framework/application/forms/CMS/Sub/Home/Expertises/Blocs.php
index 49265e331d7202ea06a6bfb5f20c8958740d666f..7009b7a7396f24f6fd1c62b255d6852da9bbbe01 100644 (file)
--- a/framework/application/forms/CMS/Sub/Home/Expertises/Blocs.php
+++ b/framework/application/forms/CMS/Sub/Home/Expertises/Blocs.php
@@ -2,14 +2,14 @@
 
 class Cubedesigners_Form_CMS_Sub_Home_Expertises_Blocs extends CubeIT_Form_Multi_SubForm {
 
-    public function init() {
-        parent::init();
+       public function init() {
+               parent::init();
 
-        $bloc = new Cubedesigners_Form_CMS_Sub_Home_Expertises_Bloc();
-        $this->setBaseSubForm($bloc);
-        $this->setBaseLegend('Edition du bloc « $titre »');
-        $this->setNewLegend('Nouveau bloc');
-    }
+               $bloc = new Cubedesigners_Form_CMS_Sub_Home_Expertises_Bloc();
+               $this->setBaseSubForm($bloc);
+               $this->setBaseLegend('Edition du domaine « $titre »');
+               $this->setNewLegend('Nouveau domaine d\'expertise');
+       }
 
 }
 

diff --git a/framework/application/forms/CMS/Text.php b/framework/application/forms/CMS/Text.php
new file mode 100644 (file)
index 0000000..118e472
--- /dev/null
+++ b/framework/application/forms/CMS/Text.php
@@ -0,0 +1,11 @@
+<?php
+
+class Cubedesigners_Form_CMS_Text extends Cubedesigners_Form_CMS_Twocolumns {
+
+       public function init() {
+               parent::init();
+       }
+
+}
+
+?>
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Twocolumns.php b/framework/application/forms/CMS/Twocolumns.php
new file mode 100644 (file)
index 0000000..50ff278
--- /dev/null
+++ b/framework/application/forms/CMS/Twocolumns.php
@@ -0,0 +1,24 @@
+<?php
+
+class Cubedesigners_Form_CMS_Twocolumns extends Cubedesigners_Form_CMS {
+
+       public function init() {
+
+               parent::init();
+
+               $titre = new CubeIT_Form_Element_Markitup('titre');
+               $titre->setLabel('Titre');
+               $this->addElement($titre);
+
+               $left = new CubeIT_Form_Element_Markitup('colonnegauche');
+               $left->setLabel('Colonne gauche');
+               $this->addElement($left);
+
+               $right = new CubeIT_Form_Element_Markitup('colonnedroite');
+               $right->setLabel('Colonne droite');
+               $this->addElement($right);
+       }
+
+}
+
+?>

diff --git a/framework/application/views/helpers/Twocols.php b/framework/application/views/helpers/Twocols.php
new file mode 100644 (file)
index 0000000..6f82a95
--- /dev/null
+++ b/framework/application/views/helpers/Twocols.php
@@ -0,0 +1,21 @@
+<?php
+
+class Cubedesigners_View_Helper_Twocols extends Zend_View_Helper_Abstract {
+
+       public function twocols($displayTitle = true) {
+               $this->view->headLink()->appendStylesheet('/less/twocols.less');
+               $res = '<div class="twocols">';
+               if ($displayTitle) {
+                       $res.= '<div class="title">' . $this->view->markupDotclear($this->view->titre) . '</div>';
+               }
+               $res.='<section>';
+               $res.='<div class="cols">';
+               $res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnegauche) . '</div>';
+               $res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnedroite) . '</div>';
+               $res.='</div>';
+               $res.='</section>';
+               $res.='</div>';
+               return $res;
+       }
+
+}

diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml
index 7ca7e7cac3af44b0fa9ba7b8a916733291167eea..b8a26988373b375a493ad63ce65a723ec4aefbdc 100644 (file)
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -1,36 +1,29 @@
-<?php\r
-$this->headScript()->addScriptAndStyle('agence');\r
-?>\r
-\r
-<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\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
-</section>\r
-\r
-<section>\r
-    <div class="agency-photo"><?php echo $this->imageProcess($this->photo, '', 1200, 545); ?></div>\r
-</section>\r
-\r
-<section>\r
-    <div class="agency-persons">\r
-        <div class="bloc-holder">\r
-\r
-            <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>\r
-\r
-            <?php echo $this->agencyBlocs($this->equipe); ?>\r
-\r
-        </div>\r
-    </div>\r
+<?php
+$this->headScript()->addScriptAndStyle('agence');
+echo $this->twocols();
+?>
+
+
+<section>
+    <div class="agency-pictos">
+        <div class="bloc-holder">
+                       <?php echo $this->agencyPictos($this->pictos); ?>
+        </div>
+    </div>
+</section>
+
+<section>
+    <div class="agency-photo"><?php echo $this->imageProcess($this->photo, '', 1200, 545); ?></div>
+</section>
+
+<section>
+    <div class="agency-persons">
+        <div class="bloc-holder">
+
+            <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
+
+                       <?php echo $this->agencyBlocs($this->equipe); ?>
+
+        </div>
+    </div>
 </section>
\ No newline at end of file

diff --git a/framework/application/views/scripts/templates/contact.phtml b/framework/application/views/scripts/templates/contact.phtml
index 2675c25ed8437f42000cabfef7f0acc2435663c7..120d466fdd74fab5a6eb583d22df456fc8637fe9 100644 (file)
--- a/framework/application/views/scripts/templates/contact.phtml
+++ b/framework/application/views/scripts/templates/contact.phtml
@@ -1,36 +1,34 @@
-<?php\r
-$this->headScript()->addGoogleMaps(array('key' => $this->options['googleapi']));\r
-$this->headScript()->addScriptAndStyle('contact');\r
-\r
-$bureaux = $this->option('contact')['bureaux'];\r
-\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
+<?php
+$this->headScript()->addGoogleMaps(array('key' => $this->options['googleapi']));
+$this->headScript()->addScriptAndStyle('contact');
+
+$bureaux = $this->option('contact')['bureaux'];
+
+
+$i = 1;
+foreach ($bureaux as $bureau) {
+       $this->headScriptVariables()->setVariable('map' . $i, $bureaux[$i - 1]['map']);
+       $this->headScriptVariables()->setVariable('coordonnees' . $i, $bureaux[$i - 1]['coordonnees']);
+       $this->headScriptVariables()->setVariable('markers' . $i, $bureaux[$i - 1]['markers']);
+       $i++;
+}
+?>
+
+<div id="contact-title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+<div id="contact-informations">
+       <?php echo $this->contactInfos($this->option('contact')['bloc'], $bureaux); ?>
+</div>
+
+<div id="contact-maps">
+       <?php
+       $j = 1;
+       foreach ($bureaux as $bureau) {
+               echo '<div id="map' . $j . '"></div>';
+               $j++;
+       }
+       ?>
+</div>
+
+<?php
+echo $this->twocols(false);

diff --git a/framework/application/views/scripts/templates/expertises.phtml b/framework/application/views/scripts/templates/expertises.phtml
index 4936303670eb594c532522c109788815d9015291..c930930d75d9a5fe27551699ca8fdf5143f05cfd 100644 (file)
--- a/framework/application/views/scripts/templates/expertises.phtml
+++ b/framework/application/views/scripts/templates/expertises.phtml
@@ -1,5 +1,4 @@
-<?php\r
-$this->headScript()->addScriptAndStyle('expertises');\r
-?>\r
-\r
-<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
\ No newline at end of file
+<?php
+
+$this->headScript()->addScriptAndStyle('expertises');
+echo $this->twocols();

diff --git a/framework/application/views/scripts/templates/text.phtml b/framework/application/views/scripts/templates/text.phtml
new file mode 100644 (file)
index 0000000..98d08cf
--- /dev/null
+++ b/framework/application/views/scripts/templates/text.phtml
@@ -0,0 +1,3 @@
+<?php
+
+echo $this->twocols();

diff --git a/less/agence.less b/less/agence.less
index cfad1d8dbe45936f6c708f4b8b8320ce4c6e1b19..1da7ac56cc2a1aa8c7180b4d155d5364e0da1630 100644 (file)
--- a/less/agence.less
+++ b/less/agence.less
@@ -1,22 +1,3 @@
-/* Agence description */
-.agency-description {
-    min-width: 980px;
-    max-width: 980px;
-    margin: 0 auto;
-    overflow: hidden;
-    padding: 0 0 50px 0;
-    
-    .col {
-        float:left;
-        //width:50%;
-        margin-right: 20px;
-        width: 47%;
-    }
-
-    .col .dotclear {
-        width:95%;
-    }
-}
 
 /* Agence pictos */
 .agency-pictos .bloc-holder {
@@ -60,7 +41,7 @@
 .agency-photo {
     overflow:hidden;
     text-align: center;
-    
+
     img {
         vertical-align: bottom;
     }
@@ -70,7 +51,7 @@
 .agency-persons {
     background-color:#3885e0;
     color:#fff;
-    
+
     .bloc-holder {
         min-width: 980px;
         max-width: 980px;
@@ -122,6 +103,6 @@
 
 /* max-width pour faibles résolutions */
 @media screen and (max-width: 1009px) {
-       
-    
+
+
 }
\ No newline at end of file

diff --git a/less/twocols.less b/less/twocols.less
new file mode 100644 (file)
index 0000000..23b8e67
--- /dev/null
+++ b/less/twocols.less
@@ -0,0 +1,19 @@
+.twocols{
+       width: 980px;
+       margin: 0 auto;
+       .cols {
+               padding: 0 0 50px 0;
+               white-space:nowrap;
+
+               .col {
+                       white-space: normal;
+                       display:inline-block;
+                       width:465px;
+                       margin:0 50px 0 0 ;
+                       vertical-align: top;
+                       &:last-child{
+                               margin:0;
+                       }
+               }
+       }
+}
\ No newline at end of file