From: bruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 10 Feb 2014 16:40:48 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=71dd3408dd1080af4ae54c3407096bb22e2a9ee8;p=cubedesigners-v7.git

---

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 2f559cb..6300f32 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -53,6 +53,19 @@ class Bootstrap extends CubeIT_Bootstrap {
         $casestudies->addColumn('couleur', 'text');
         $casestudies->addColumn('blocs', 'text');
         $casestudies->addColumn('tags', 'text');
+
+
+        $realisations = $schema->createTable('realisations');
+        $realisations->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+        $realisations->setPrimaryKey(array('id'));
+        $realisations->addColumn('titre', 'text');
+        $realisations->addColumn('legende', 'text');
+        $realisations->addColumn('agence', 'text');
+        $realisations->addColumn('description', 'text');
+        $realisations->addColumn('url', 'text');
+        $realisations->addColumn('visuel', 'string', array('length' => 128));
+        $realisations->addColumn('visuel_detail', 'text');
+        $realisations->addColumn('tags', 'text');
     }
 
     protected function _initAcl() {
@@ -70,6 +83,39 @@ class Bootstrap extends CubeIT_Bootstrap {
         if ($page->getTemplate() == 'casestudies') {
             $this->addStudiesPages($page);
         }
+
+        if ($page->getTemplate() == 'realisations') {
+            $this->addRealisationsPages($page);
+        }
+    }
+
+    /**
+     *
+     * @param CubeIT_Navigation_Page_Locale $page
+     */
+    protected function addRealisationsPages($page) {
+
+        $datas = $this->getCMSDatasOfNavigationPage($page);
+        //fb($datas);
+        $db = Zend_Db_Table::getDefaultAdapter();
+        $s = $db->select()->from('realisations')
+                ->order('id ASC');
+        $q = $s->query();
+
+        while ($r = $q->fetch()) {
+            if ($r->titre == '') {
+                continue;
+            }
+            $p = new CubeIT_Navigation_Page_Locale();
+            $p->setController('Realisations');
+            $p->setId($page->getId() . '/' . $r->id);
+            $p->setAutoUri($r, $datas['seourl_rea'], $page->getLocale());
+            $p->setSitemap(true);
+            $p->setEditable(false);
+            $p->setDomain($page->getDomain());
+            $p->setLabel($r->titre);
+            $page->addPage($p);
+        }
     }
 
     /**
@@ -84,8 +130,6 @@ class Bootstrap extends CubeIT_Bootstrap {
                 ->order('id ASC');
         $q = $s->query();
 
-        fb("datas", $datas['seourl_stu']);
-
         while ($r = $q->fetch()) {
             if ($r->titre == '') {
                 continue;
@@ -100,21 +144,6 @@ class Bootstrap extends CubeIT_Bootstrap {
             $p->setLabel($r->titre);
             $page->addPage($p);
         }
-
-        /* foreach ($datas['studies'] as $k => $studie) {
-          if ($studie['titre'] == '') {
-          continue;
-          }
-          $p = new CubeIT_Navigation_Page_Locale();
-          $p->setController('Studies');
-          $p->setId($page->getId() . '/' . $k);
-          $p->setAutoUri($studie, $datas['seourl_stu'], $page->getLocale());
-          $p->setSitemap(true);
-          $p->setEditable(false);
-          $p->setDomain($page->getDomain());
-          $p->setLabel($studie['titre']);
-          $page->addPage($p);
-          } */
     }
 
     /**
@@ -124,7 +153,7 @@ class Bootstrap extends CubeIT_Bootstrap {
     public function getCMSTemplates() {
         $templates = parent::getCMSTemplates();
 
-        $templates['Agence'] = array('agence' => 'L\'agence');
+        $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)');
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 9f715db..7a2706f 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -35,9 +35,9 @@ database.params.dbname = cubev6
 
 ;former.home =
 
-seo.universalAnalytics =
-seo.google =
-seo.bing =
+seo.universalAnalytics = UA-4339912-1
+seo.google = google93c0129ef18a399d.html
+seo.bing = 8986457D1D126C38A815027C839372DC
 
 navigation.containers[]=0;
 ;navigation.containers[]=-1;
diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index 24e8354..1cd01f4 100644
--- a/framework/application/controllers/MaintenanceController.php
+++ b/framework/application/controllers/MaintenanceController.php
@@ -1,6 +1,33 @@
 <?php
 
 class MaintenanceController extends CubeIT_Controller_MaintenanceController {
+
+    public function import() {
+        /* set_time_limit(300);
+
+          $utilisateurs = $this->getFormerDb()->select()->from('utilisateurs')
+          ->query()->fetchAll();
+
+          $this->getDb()->truncate('user');
+          $binds = array();
+          foreach ($utilisateurs as $u) {
+          $role = $u->rights == 4 ? 'admin' : 'member';
+          if (stristr($u->email, '@cubedesigners.com')) {
+          $role = 'superadmin';
+          }
+
+
+          $bind = array(
+          'id' => $u->utilisateur_id,
+          'username' => $u->email,
+          'password' => CubeIT_Auth_Adapter::hash($u->password),
+          'role' => $role,
+          'code' => $u->code);
+
+          $this->getDb()->insert('user', $bind);
+          } */
+    }
+
 }
 
 ?>
diff --git a/framework/application/controllers/RealisationsController.php b/framework/application/controllers/RealisationsController.php
new file mode 100644
index 0000000..0cb34ad
--- /dev/null
+++ b/framework/application/controllers/RealisationsController.php
@@ -0,0 +1,40 @@
+<?php
+
+class RealisationsController extends CubeIT_Controller_PageController {
+
+    public function indexAction() {
+        $parent = $this->view->currentPage->getParent();
+
+        $datas = $this->getBootstrap()->getCMSDatasOfNavigationPage($parent);
+        $this->view->datas = $datas;
+
+        $url = $this->getRequest()->getParam('page');
+
+        $ok = false;
+
+        $db = Zend_Db_Table::getDefaultAdapter();
+        $s = $db->select()->from('realisations')
+                ->order('id ASC');
+        $q = $s->query();
+
+        while ($r = $q->fetch()) {
+            if (CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea'], null) == $url) {
+
+                $this->view->casestudies_titre = $datas["titre"];
+                $this->view->titre = $r->titre;
+                $this->view->studie = $r;
+
+                $ok = true;
+                break;
+            }
+        }
+
+        if (!$ok) {
+            $this->_404();
+            return;
+        }
+    }
+
+}
+
+?>
diff --git a/framework/application/controllers/StudiesController.php b/framework/application/controllers/StudiesController.php
index ef7732a..98cf324 100644
--- a/framework/application/controllers/StudiesController.php
+++ b/framework/application/controllers/StudiesController.php
@@ -20,7 +20,8 @@ class StudiesController extends CubeIT_Controller_PageController {
         while ($r = $q->fetch()) {
             if (CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_stu'], null) == $url) {
 
-                $this->view->casestudies_titre = $datas["titre"];
+                $this->view->
+                        $this->view->casestudies_titre = $datas["titre"];
                 $this->view->titre = $r->titre;
                 $this->view->studie = $r;
 
diff --git a/framework/application/forms/CMS/Agence.php b/framework/application/forms/CMS/Agence.php
index a1cd504..f7faf94 100644
--- a/framework/application/forms/CMS/Agence.php
+++ b/framework/application/forms/CMS/Agence.php
@@ -27,7 +27,7 @@ class Cubedesigners_Form_CMS_Agence extends Cubedesigners_Form_CMS {
         $this->addElement($photo);
 
         $equipe = new Cubedesigners_Form_CMS_Sub_Agence_Persons();
-        $equipe->setLabel('Bloc L\'équipe');
+        $equipe->setLabel("Bloc L'équipe");
         $this->addSubForm($equipe, 'equipe');
     }
 
diff --git a/framework/application/forms/CMS/Casestudies.php b/framework/application/forms/CMS/Casestudies.php
index b722215..5df14e1 100644
--- a/framework/application/forms/CMS/Casestudies.php
+++ b/framework/application/forms/CMS/Casestudies.php
@@ -10,7 +10,7 @@ class Cubedesigners_Form_CMS_Casestudies extends Cubedesigners_Form_CMS {
         $this->addElement($titre);
 
         $stuurl = new Zend_Form_Element_Text('seourl_stu');
-        $stuurl->setLabel('Modèle d\'URL des études de cas');
+        $stuurl->setLabel("Modèle d'URL des études de cas");
         $this->addElement($stuurl);
 
         $studies = new Cubedesigners_Form_CMS_Element_Casestudies('studies');
diff --git a/framework/application/forms/CMS/Element/Realisations.php b/framework/application/forms/CMS/Element/Realisations.php
new file mode 100644
index 0000000..b48b855
--- /dev/null
+++ b/framework/application/forms/CMS/Element/Realisations.php
@@ -0,0 +1,12 @@
+<?php
+
+class Cubedesigners_Form_CMS_Element_Realisations extends CubeIT_Form_Element_List {
+
+    public function init() {
+        parent::init();
+
+        $this->setBaseForm(new Cubedesigners_Form_CMS_Sub_Realisations_Realisations());
+        $this->clearDecorators();
+    }
+
+}
diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php
index 301e6f0..b255b89 100644
--- a/framework/application/forms/CMS/Home.php
+++ b/framework/application/forms/CMS/Home.php
@@ -14,7 +14,7 @@ class Cubedesigners_Form_CMS_Home extends Cubedesigners_Form_CMS {
         $this->addSubForm($slideshow, 'slideshow');
 
         $agence = new Cubedesigners_Form_CMS_Sub_Home_Agence();
-        $agence->setLabel('Bloc L\'agence');
+        $agence->setLabel("Bloc L'agence");
         $this->addSubForm($agence, 'agence');
 
         $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
diff --git a/framework/application/forms/CMS/Realisations.php b/framework/application/forms/CMS/Realisations.php
index 18bdf95..5acb4f5 100644
--- a/framework/application/forms/CMS/Realisations.php
+++ b/framework/application/forms/CMS/Realisations.php
@@ -8,6 +8,14 @@ class Cubedesigners_Form_CMS_Realisations extends Cubedesigners_Form_CMS {
         $titre = new CubeIT_Form_Element_Markitup('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
+
+        $reaurl = new Zend_Form_Element_Text('seourl_rea');
+        $reaurl->setLabel("Modèle d'URL des réalisations");
+        $this->addElement($reaurl);
+
+        $realisations = new Cubedesigners_Form_CMS_Element_Realisations('realisations');
+        $realisations->setLabel('Gestion des réalisations');
+        $this->addElement($realisations);
     }
 
 }
diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studies.php b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
index 2e61ac9..91a5fa8 100644
--- a/framework/application/forms/CMS/Sub/Casestudies/Studies.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
@@ -50,7 +50,7 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
 
         $this->setListTitle('Etudes de cas')
                 ->setNewTitle('Créer une étude de cas')
-                ->setEditTitle('Edition de l\'éétude de cas « $titre »')
+                ->setEditTitle("Edition de l'étude de cas « $titre »")
                 ->setBaseTable('casestudies')
                 ->setIdColumn('id')
                 ->setTitleColumn('titre');
diff --git a/framework/application/forms/CMS/Sub/Contact/Office.php b/framework/application/forms/CMS/Sub/Contact/Office.php
index 7dadfeb..78ef353 100644
--- a/framework/application/forms/CMS/Sub/Contact/Office.php
+++ b/framework/application/forms/CMS/Sub/Contact/Office.php
@@ -15,7 +15,7 @@ class Cubedesigners_Form_CMS_Sub_Contact_Office extends CubeIT_Form_SubForm {
         $this->addSubForm($map, 'map');
 
         $marqueurs = new Cubedesigners_Form_CMS_Sub_ContactMarkers('markers');
-        $marqueurs->setLegend('Points d\'intérêts');
+        $marqueurs->setLegend("Points d'intérêts");
         $this->addSubForm($marqueurs, 'markers');
     }
 
diff --git a/framework/application/forms/CMS/Sub/News/News.php b/framework/application/forms/CMS/Sub/News/News.php
index 29366c1..8ac4e85 100644
--- a/framework/application/forms/CMS/Sub/News/News.php
+++ b/framework/application/forms/CMS/Sub/News/News.php
@@ -7,7 +7,7 @@ class Cubedesigners_Form_CMS_Sub_News_News extends CubeIT_Form_Multi_SubForm {
 
         $actu = new Cubedesigners_Form_CMS_Sub_News_New();
         $this->setBaseSubForm($actu);
-        $this->setBaseLegend('Edition de l\'actualité du « $date »');
+        $this->setBaseLegend("Edition de l'actualité du « $date »");
         $this->setNewLegend('Nouvelle actualité');
     }
 
diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
new file mode 100644
index 0000000..ee31169
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
@@ -0,0 +1,56 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List {
+
+    public function init() {
+        parent::init();
+        $id = new CubeIT_Form_Element_Id();
+        $this->addElement($id);
+
+        $titre = new Zend_Form_Element_Text('titre');
+        $titre->setLabel('Titre');
+        $this->addElement($titre);
+
+        $legende = new Zend_Form_Element_Text('legende');
+        $legende->setLabel('Legende');
+        $this->addElement($legende);
+
+        $agence = new Zend_Form_Element_Text('agence');
+        $agence->setLabel('Agence');
+        $this->addElement($agence);
+
+        $description = new CubeIT_Form_Element_Markitup_Basic('description');
+        $description->setLabel('Description');
+        $this->addElement($description);
+
+        $url = new CubeIT_Form_Element_Url('url');
+        $url->setLabel('URL du site');
+        $this->addElement($url);
+
+        $visuel = new CubeIT_Form_Element_File_Image('visuel');
+        $visuel->setLabel('Visuel principal');
+        $visuel->setMaxItems(1);
+        $this->addElement($visuel);
+
+        $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
+        $visuel_detail->setLabel('Visuels du détail');
+        $this->addElement($visuel_detail);
+
+        $tags = new Cubedesigners_Form_Element_Tags('tags');
+        $tags->setLabel('Tags');
+        $this->addElement($tags);
+
+        $bootstrap = Bootstrap::getInstance();
+        $view = $bootstrap->getView();
+
+        $this->setListTitle('Réalisations')
+                ->setNewTitle('Créer une réalisation')
+                ->setEditTitle('Edition de la réalisation « $titre »')
+                ->setBaseTable('realisations')
+                ->setIdColumn('id')
+                ->setTitleColumn('titre');
+    }
+
+}
+
+?>
diff --git a/framework/application/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php
index 39598e0..75f4fb1 100644
--- a/framework/application/views/helpers/CasestudiesDetail.php
+++ b/framework/application/views/helpers/CasestudiesDetail.php
@@ -24,6 +24,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
         if ($studie->couleur != '') {
             $style = 'background-color:' . $studie->couleur;
         }
+
         $res .= '<div id="casestudies-detail-content" style="' . $style . ';">';
 
         $blocs = json_decode($studie->blocs, true);
@@ -31,7 +32,6 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
         foreach ($blocs as $bloc) {
 
             // fb($bloc);
-
             $margin = '';
             if ($bloc["margin"] != '') {
                 $margin = 'margin-top:' . $bloc["margin"] . 'px;';
@@ -77,7 +77,9 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
                     $width = -1;
                     $height = -1;
                     CubeIT_Image::getDimensions($background, $width, $height);
-                    $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;">';
+                    $top = ($height - 550) / 2;
+                    //fb($height);
+                    $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;top:' . $top . 'px;">';
                 }
                 if ($addVideoBackground) {
                     $res.= "</div>";
diff --git a/framework/application/views/helpers/FooterActualites.php b/framework/application/views/helpers/FooterActualites.php
index e891680..94f782d 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 = '<div class="actus">';
         foreach ($actus as $id => $actu) {
-            $res.='<div class="actu"><p class="date">' . $actu['date'] . '</p><span class="texte">' . $this->view->markupDotclear($actu['texte']) . '<span></div>';
+            $res.='<div class="actu"><p class="date">' . $this->view->dateTime($actu['date'], "dd-MM-y") . '</p><span class="texte">' . $this->view->markupDotclear($actu['texte']) . '<span></div>';
         }
         $res.= '</div>';
 
diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php
index d710033..fc1b054 100644
--- a/framework/application/views/helpers/FooterContact.php
+++ b/framework/application/views/helpers/FooterContact.php
@@ -17,8 +17,8 @@ class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract
             $res.='<p class="titre">' . $bureau['coordonnees']['nom'] . '<p>';
 
             $res.='<div class="numeros">';
-            $res.='<p>' . __('Tel') . ' ' . $bureau['coordonnees']['tel'] . '</p>';
-            $res.='<p>' . __('Fax') . ' ' . $bureau['coordonnees']['fax'] . '</p>';
+            $res.='<p>' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel']) . '</p>';
+            $res.='<p>' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';
             $res.='</div>';
 
             $res.='<div class="adresse">';
diff --git a/framework/application/views/helpers/HomeAgence.php b/framework/application/views/helpers/HomeAgence.php
index a0bcd47..5c41fce 100644
--- a/framework/application/views/helpers/HomeAgence.php
+++ b/framework/application/views/helpers/HomeAgence.php
@@ -9,27 +9,6 @@ class Cubedesigners_View_Helper_HomeAgence extends Zend_View_Helper_Abstract {
         $res = '<div class="blocs">';
         foreach ($blocs as $id => $bloc) {
 
-            /* $res.='<div class="bureau">';
-
-              $res.='<p class="titre">' . $bureau['titre'] . '<p>';
-
-              $res.='<div class="numeros">';
-              $res.='<p>' . __('Tel') . ' ' . $bureau['telephone'] . '</p>';
-              $res.='<p>' . __('Fax') . ' ' . $bureau['fax'] . '</p>';
-              $res.='</div>';
-
-              $res.='<div class="adresse">';
-              $res.='<p>' . __('Cubedesigners') . '</p>';
-              $res.='<p>' . $bureau['adresse']['adresse'] . '</p>';
-              $res.='<p>' . $bureau['adresse']['code_postal'] . ' ' . $bureau['adresse']['ville'] . '</p>';
-              $res.='<p>' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory') . '<p>';
-              $res.='</div>';
-
-              $res.='<div class="geoloc">';
-              $res.=$this->view->linkGeo(__('Plan d\'accès'), $bureau['adresse']['adresse'] . ',' . $bureau['adresse']['ville'] . ',' . Zend_Locale::getTranslation($bureau['adresse']['pays'], 'territory'));
-              $res.='</div>';
-
-              $res.='</div>'; */
             $image = $this->view->imageProcess($bloc['picto'], $bloc['titre'], 120, 120);
 
             $res.='<div class="sousbloc">';
diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php
new file mode 100644
index 0000000..27be614
--- /dev/null
+++ b/framework/application/views/helpers/RealisationsList.php
@@ -0,0 +1,50 @@
+<?php
+
+class Cubedesigners_View_Helper_RealisationsList extends Zend_View_Helper_Abstract {
+
+    public function RealisationsList($datas) {
+
+        $db = Zend_Db_Table::getDefaultAdapter();
+        $s = $db->select()->from('realisations')
+                ->order('id ASC');
+        $q = $s->query();
+
+        $count = 1;
+
+        $res = '';
+
+
+
+        while ($r = $q->fetch()) {
+            $addSpacer = false;
+
+            if ($count == 6) {
+                $count = 1;
+                $addClass = '';
+                //   $addSpacer = true;
+            } else {
+                $addClass = ' blocmargin';
+                $count++;
+            }
+
+
+            $image = $this->view->imageProcess($r->visuel, $r->titre, 130, 130);
+            $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']);
+            //$res .= '<a href="' . $url . '">';
+            $res .= '<a href="#" onclick="return false;" data-url="' . $url . '">';
+            $res .= '<div class="bloc' . $addClass . '" data-tags="' . $r->tags . '">';
+            $res .= '<div class="project-photo">' . $image . '</div>';
+            $res .= '<div class="project-title">' . $r->titre . '</div>';
+            $res .= '</div>';
+            $res .= '</a>';
+            // if ($addSpacer) {
+            //    $res .= '<div class="spacer"></div>';
+            // }
+        }
+
+        return $res;
+    }
+
+}
+
+?>
diff --git a/framework/application/views/scripts/realisations/index.phtml b/framework/application/views/scripts/realisations/index.phtml
new file mode 100644
index 0000000..069c716
--- /dev/null
+++ b/framework/application/views/scripts/realisations/index.phtml
@@ -0,0 +1,15 @@
+<?php
+$this->headScript()->addScriptAndStyle('realisations');
+?>
+
+<div class="casestudies-detail-title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+<?php
+echo $this->CasestudiesDetail($this->studie);
+?>
+
+<div class="title"><?php echo $this->markupDotclear($this->casestudies_titre); ?></div>
+
+<div id="casestudies-list">
+    <?php echo $this->CasestudiesList($this->datas); ?>
+</div>
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml
index d260ae5..67a5986 100644
--- a/framework/application/views/scripts/templates/realisations.phtml
+++ b/framework/application/views/scripts/templates/realisations.phtml
@@ -2,4 +2,17 @@
 $this->headScript()->addScriptAndStyle('realisations');
 ?>
 
-<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
\ No newline at end of file
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+<div id="realisations-tagslist">
+    <?php echo $this->CasestudiesTagsList($this->studies); ?>
+</div>
+
+
+<div id="realisations-list">
+    <?php
+    $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);
+    echo $this->RealisationsList($datas);
+    ?>
+</div>
+
diff --git a/js/home.js b/js/home.js
index 5d637eb..2fffa33 100644
--- a/js/home.js
+++ b/js/home.js
@@ -15,7 +15,7 @@ function slideShow() {
     nbSlides = $('.slide').length;
     
     currentSlideId = 0;
-    
+
     currentSlide=$('.slide:first');
     
     if(currentSlide.length>0){
diff --git a/js/realisations.js b/js/realisations.js
new file mode 100644
index 0000000..4ef57ed
--- /dev/null
+++ b/js/realisations.js
@@ -0,0 +1,42 @@
+TO_LOAD_ONCE[TO_LOAD_ONCE.length]='load_realisations();';
+
+var showIds = new Array();
+
+function load_realisations() {
+	//initTagsLink();
+}
+
+function initTagsLink() {
+    
+    $(".tag").click(function() {
+       
+        $(this).toggleClass('active');
+        
+        if( $(this).hasClass('active') ) {
+            showIds.push( $(this).attr("data-id") );
+        } else {
+            var index = $.inArray( $(this).attr("data-id"), showIds );
+            showIds.splice(index, 1);
+        }
+        
+        if( showIds.length > 0 ) {
+            $(".tag:first").removeClass('active');
+        }else{
+            $(".tag:first").addClass('active');
+        }
+        
+        displayStudies();
+        //alert(showIds);
+    });
+    
+}
+
+function displayRealisation( rea ) {
+    
+    //$(rea);
+    
+    var url = $(rea).attr("data-url");
+    
+    
+}
+
diff --git a/less/admin.less b/less/admin.less
index c5c983d..77882c7 100644
--- a/less/admin.less
+++ b/less/admin.less
@@ -26,6 +26,12 @@
 	margin:0 5px;
 }
 
+#adminBar .bar {
+    width: 1200px;
+    margin:auto;
+    text-align: center;
+}
+
 #adminBar .content{
 	padding:0 15px;
 }
diff --git a/less/agence.less b/less/agence.less
index 433a8c4..d5adfa5 100644
--- a/less/agence.less
+++ b/less/agence.less
@@ -5,18 +5,20 @@
     margin: 0 auto;
     overflow: hidden;
     padding: 0 0 50px 0;
-}
+    
+    .col {
+        float:left;
+        //width:50%;
+        margin-right: 20px;
+        width: 47%;
+    }
 
-.agency-description .col {
-    float:left;
-    //width:50%;
-    margin-right: 20px;
-    width: 47%;
+    .col .dotclear {
+        width:95%;
+    }
 }
 
-.agency-description .col .dotclear {
-    width:95%;
-}
+
 
 /* Agence pictos */
 .agency-pictos .bloc-holder {
@@ -61,62 +63,65 @@
 .agency-photo {
     overflow:hidden;
     text-align: center;
+    
+    img {
+        vertical-align: bottom;
+    }
 }
 
-.agency-photo img {
-    vertical-align: bottom;
-}
+
 
 /* Agence equipe */
 .agency-persons {
     background-color:#3885e0;
     color:#fff;
+    
+    .bloc-holder {
+        min-width: 980px;
+        max-width: 980px;
+        width:100%;
+        margin: 0 auto;
+        padding: 50px 0;
+        overflow:hidden;
+    }
+
+    .bloc-holder h1  {
+        font-size:56px;
+    }
+
+    .bloc-holder h2{
+        font-size:32px;
+        padding: 0 0 20px 0;
+    }
+
+    .bloc-holder .blocs {
+        padding: 40px 0;
+    }
+
+    .bloc-holder .blocs .spacer {
+        clear:left;
+        padding:25px 0;
+    }
+
+    .bloc-holder .sousbloc {
+        float:left;
+        //width:50%;
+        width: 47.5%;
+        margin-right: 20px;
+    }
+
+    .bloc-holder .sousbloc .texte {
+        width: 60%;
+        float:left;
+    }
+
+    .bloc-holder .sousbloc .photo {
+        width:120px;
+        height:120px;
+        float:left;
+        margin: 10px 25px 0 0;
+        border-radius: 60px;
+    }
 }
 
-.agency-persons .bloc-holder {
-    min-width: 980px;
-    max-width: 980px;
-    width:100%;
-    margin: 0 auto;
-    padding: 50px 0;
-    overflow:hidden;
-}
-
-.agency-persons .bloc-holder h1  {
-    font-size:56px;
-}
-
-.agency-persons .bloc-holder h2{
-    font-size:32px;
-    padding: 0 0 20px 0;
-}
-
-.agency-persons .bloc-holder .blocs {
-    padding: 40px 0;
-}
-
-.agency-persons .bloc-holder .blocs .spacer {
-    clear:left;
-    padding:25px 0;
-}
-
-.agency-persons .bloc-holder .sousbloc {
-    float:left;
-    //width:50%;
-    width: 47.5%;
-    margin-right: 20px;
-}
-
-.agency-persons .bloc-holder .sousbloc .texte {
-    width: 60%;
-    float:left;
-}
-
-.agency-persons .bloc-holder .sousbloc .photo {
-    width:120px;
-    height:120px;
-    float:left;
-    margin: 10px 50px 0 0;
-    border-radius: 60px;
-}
 
diff --git a/less/casestudies.less b/less/casestudies.less
index 1c1dcb1..2015e03 100644
--- a/less/casestudies.less
+++ b/less/casestudies.less
@@ -3,33 +3,34 @@
     max-width: 980px;
     margin: 0 auto;
     padding: 0 0 20px 0;
-}
+    
+    
+    ul {
+       list-style: none;
+    }
 
-#casestudies-tagslist ul {
-    list-style: none;
-}
+    li {
+        font-size: 14px;
+        color: #6f6f6f;
+        padding: 3px 6px;
+        border-radius: 2px;
+        background-color: #ededed;
+        margin:0 6px 6px 0;
+        display: inline-block;
+    }
 
-#casestudies-tagslist li {
-    font-size: 14px;
-    color: #6f6f6f;
-    padding: 3px 6px;
-    border-radius: 2px;
-    background-color: #ededed;
-    margin:0 6px 6px 0;
-    display: inline-block;
-}
+    li:hover, li:active {
+        cursor: pointer;
+        color: #fff;
+        background-color: #84ae1e;
+    }
 
-#casestudies-tagslist li:hover,
-#casestudies-tagslist li:active {
-    cursor: pointer;
-    color: #fff;
-    background-color: #84ae1e;
+    .active {
+        color: #fff;
+        background-color: #84ae1e;
+    }
 }
 
-#casestudies-tagslist .active {
-    color: #fff;
-    background-color: #84ae1e;
-}
 
 #casestudies-list {
     min-width: 980px;
@@ -39,45 +40,38 @@
     overflow: hidden;
     
     .bloc {    
-    width:300px;
-    float:left;
-}
-
-a,a:hover {    
-    color:#000;
-}
-
-.bloc .project-photo {
-    width:300px;
-    height:225px;
-    background-color: #ccc;
-    margin:0 0 20px 0;
-}
+        width:300px;
+        float:left;
+    }
 
-.bloc .project-title {
-    font-size: 32px;
-}
- .bloc .project-description {
-    font-size: 14px;
-    margin-bottom: 20px;
-}
+    a,a:hover {    
+        color:#000;
+    }
 
-.blocmargin {
-    margin-right:40px;
-}
-.spacer {
-    clear: left;
-    height:20px;
-}
+    .bloc .project-photo {
+        width:300px;
+        height:225px;
+        background-color: #ccc;
+        margin:0 0 20px 0;
+    }
 
-}
+    .bloc .project-title {
+        font-size: 32px;
+    }
+     .bloc .project-description {
+        font-size: 14px;
+        margin-bottom: 20px;
+    }
 
+    .blocmargin {
+        margin-right:40px;
+    }
+    .spacer {
+        clear: left;
+        height:20px;
+    }
 
-/*.casestudies-detail-visuel {
-    width: 1200px;
-    margin: auto;
 }
-*/
 #casestudies-detail-content {
     background-color: #3885E0;
 }
\ No newline at end of file
diff --git a/less/casestudies_detail.less b/less/casestudies_detail.less
index 4dbe6ed..e68b199 100644
--- a/less/casestudies_detail.less
+++ b/less/casestudies_detail.less
@@ -11,92 +11,94 @@
 /* Case studies detail visuel */
 #casestudies-detail-visuel {
     padding-bottom:50px;
+    
+    a {
+        background-color: #3885e0;
+        border-radius: 2px;
+        padding: 5px 20px;
+        color:#fff;
+    }
+
+    a:hover, a:active {
+        background-color: #65a8f6;
+        color:#fff;
+    }
+
+    .visuel-holder {
+        min-width: 980px;
+        max-width: 980px;
+        width:100%;
+        margin: 0 auto;
+        overflow:hidden;
+    }
+
+    .visuel-holder .visuel {
+        width:980px;
+        height:400px;
+        padding-bottom: 20px;
+    }
+
+
+    .visuel-holder .legende {
+        font-size: 18px;
+        float:left;
+    }
+    
 }
 
-#casestudies-detail-visuel a {
-    background-color: #3885e0;
-    border-radius: 2px;
-    padding: 5px 20px;
-    color:#fff;
-}
-
-#casestudies-detail-visuel a:hover,
-#casestudies-detail-visuel a:active {
-    background-color: #65a8f6;
-    color:#fff;
-}
 
-#casestudies-detail-visuel .visuel-holder {
-    min-width: 980px;
-    max-width: 980px;
-    width:100%;
-    margin: 0 auto;
-    overflow:hidden;
-}
-
-#casestudies-detail-visuel .visuel-holder .visuel {
-    width:980px;
-    height:400px;
-    padding-bottom: 20px;
-}
-
-
-#casestudies-detail-visuel .visuel-holder .legende {
-    font-size: 18px;
-    float:left;
-}
 
 #casestudies-detail-content {
     text-align: center;
     background-color: #0194d5;
     padding: 50px 0 0px 0;
+    
+    
+    .detail-text {
+        color: #fff;
+        width:640px;
+        margin:auto;
+        //padding: 0px 0 50px 0;
+        position: relative;
+        z-index: 10;
+    }
+
+    .detail-text .titre {
+        font-size:32px;
+        padding-bottom: 20px;
+    }
+
+    .detail-text .texte {
+        font-size:18px;
+    }
+
+    .detail-visuel {
+        padding: 0px 0 50px 0;
+        z-index: 1;
+    }
+
+    .detail-video-background {
+        /*display: table;*/
+        position: absolute;
+        top: -325px;
+        //left: 110px;
+        width:1280xp;
+        height:1280px;
+        z-index: 2;
+    }
+
+   .detail-video {
+        padding: 0px 0 50px 0;
+        position: relative;
+        z-index: 5;
+        text-align: center;
+       /* vertical-align: middle;
+        display: table-cell; */
+    }
+
+    .detail-visuel {
+        width:100%;
+        background-position: 50%;
+        position: relative;
+    }
 }
-
-#casestudies-detail-content .detail-text {
-    color: #fff;
-    width:640px;
-    margin:auto;
-    //padding: 0px 0 50px 0;
-    position: relative;
-    z-index: 10;
-}
-
-#casestudies-detail-content .detail-text .titre {
-    font-size:32px;
-    padding-bottom: 20px;
-}
-
-#casestudies-detail-content .detail-text .texte {
-    font-size:18px;
-}
-
-#casestudies-detail-content .detail-visuel {
-    padding: 0px 0 50px 0;
-    z-index: 1;
-}
-
-#casestudies-detail-content .detail-video-background {
-    /*display: table;*/
-    position: absolute;
-    top: -325px;
-    //left: 110px;
-    width:1280px;
-    height:1280px;
-    z-index: 2;
-}
-
-
-#casestudies-detail-content .detail-video {
-    padding: 0px 0 50px 0;
-    position: relative;
-    z-index: 5;
-    text-align: center;
-   /* vertical-align: middle;
-    display: table-cell; */
-}
-
-#casestudies-detail-content .detail-visuel {
-    width:100%;
-    background-position: 50%;
-    position: relative;
-}
\ No newline at end of file
diff --git a/less/footer.less b/less/footer.less
index ce5697f..eeb40c7 100644
--- a/less/footer.less
+++ b/less/footer.less
@@ -60,16 +60,20 @@
     padding-top : 30px;
 }
 
-#footer .bureau a {
+#footer .bureau .geoloc a {
     background-color: #191919;
     border-radius: 2px;
     padding: 5px 20px;
     color:#6c6c6c;
 }
 
-#footer .bureau a:hover,
-#footer .bureau a:active {
-    background-color: #2874ce;
+#footer .bureau .numeros a {
+    color:#6c6c6c;
+}
+
+#footer .bureau .geoloc a:hover,
+#footer .bureau .geoloc a:active {
+    background-color: #84ae1e;
     color:#fff;
 }
 
diff --git a/less/header.less b/less/header.less
index b37679b..fff4bb4 100644
--- a/less/header.less
+++ b/less/header.less
@@ -4,50 +4,51 @@
     max-width: 1200px;
     width:100%;
     height:130px;
-}
-
-#header ul{
+    
+    ul{
 	text-transform: uppercase;
 	font-size:15px;
 	color:#3885e0;
 	list-style: none;
-}
+    }
 
-#header ul a{
-        text-decoration: none;
-	color:#282828;
-        
-        padding: 10px;
-}
+    ul a{
+            text-decoration: none;
+            color:#282828;
 
-#header ul a:hover,
-#header ul .active a{
-        border-radius: 2px;
-        background-color: #84ae1e;
-	color:#fff;
-}
+            padding: 10px;
+    }
 
-#header ul li{
-	float:left;
-}
+    ul a:hover, ul .active a{
+            border-radius: 2px;
+            background-color: #84ae1e;
+            color:#fff;
+    }
 
-#header .logo { 
-        background: url('../images/logo.png') no-repeat;
-        width:317px;
-        height:130px;
-	float:left;
-}
+    ul li{
+            float:left;
+    }
 
-#header .navigation{
-        margin: 50px 0;
-	float:right;
-}
+    .logo { 
+            background: url('../images/logo.png') no-repeat;
+            width:317px;
+            height:130px;
+            float:left;
+    }
 
-#header .navigation li{
-	margin:0 20px 0 0;
+    .navigation{
+            margin: 50px 0;
+            float:right;
+    }
+
+    .navigation li{
+            margin:0 20px 0 0;
+    }
 }
 
 
+
+
 /* max-width pour faibles résolutions */
 @media screen and (max-width: 1009px) {
 	
diff --git a/less/home.less b/less/home.less
index 16325ca..32f29d6 100644
--- a/less/home.less
+++ b/less/home.less
@@ -16,49 +16,51 @@
 /* Home Slideshow */
 #home-slideshow {
     padding-bottom:50px;
+    
+    .slides-holder {
+        min-width: 980px;
+        max-width: 980px;
+        width:100%;
+        margin: 0 auto;
+        overflow:hidden;
+    }
+
+    .slides-holder .slides {
+        width:980px;
+        height:400px;
+    }
+
+    .slides-holder .slides .slide {
+        position:absolute;
+        display:none;
+    }
+
+    .slides-holder .slides .slide a {
+        margin:0;
+        padding: 0;
+    }
+
+    .slides-holder a {
+        margin: 25px 0 0 0;
+        width: 12px;
+        height: 22px;
+        float: right;
+        padding: 0 0 25px;
+    }
+
+    .slides-holder .prev {
+        background: url('../images/prev.png') no-repeat;
+        background-position: center top;
+        margin-right: 30px;
+    }
+
+    .slides-holder .next {
+        background: url('../images/next.png') no-repeat;
+        background-position: center top;
+    }
 }
 
-#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;
@@ -125,5 +127,5 @@
 #home-agency .bloc-holder .sousbloc img,
 #home-expertise .bloc-holder .sousbloc img {
     float:left;
-    padding: 0 50px 0 0;
+    padding: 0 25px 0 0;
 }
\ No newline at end of file
diff --git a/less/realisations.less b/less/realisations.less
new file mode 100644
index 0000000..8ad133b
--- /dev/null
+++ b/less/realisations.less
@@ -0,0 +1,76 @@
+#realisations-tagslist {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 0 0 20px 0;
+    
+    
+    ul {
+    list-style: none;
+    }
+
+    li {
+        font-size: 14px;
+        color: #6f6f6f;
+        padding: 3px 6px;
+        border-radius: 2px;
+        background-color: #ededed;
+        margin:0 6px 6px 0;
+        display: inline-block;
+    }
+
+    li:hover, li:active {
+        cursor: pointer;
+        color: #fff;
+        background-color: #84ae1e;
+    }
+
+    .active {
+        color: #fff;
+        background-color: #84ae1e;
+    }
+    
+    
+}
+
+
+
+#realisations-list {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 0 0 50px 0;
+    overflow: hidden;
+    
+    .bloc {    
+        width:130px;
+        float:left;
+    }
+
+    a,a:hover {    
+        color:#000;
+    }
+
+    .bloc .project-photo {
+        width:130px;
+        height:130px;
+        background-color: #ccc;
+        margin:0 0 5px 0;
+    }
+
+    .bloc .project-title {
+        font-size: 14px;
+        padding: 0 0 20px 0;
+        color: #545454;
+    }
+
+    .blocmargin {
+        margin-right:40px;
+    }
+    
+    .spacer {
+        clear: left;
+        height:20px;
+    }
+
+}
\ No newline at end of file