From 74e798eea6453c6c14513acbfe8353c176fb0489 Mon Sep 17 00:00:00 2001
From: "bruno@cubedesigners.com"
 <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 22 Jan 2014 16:34:38 +0000
Subject: [PATCH]

---
 .../application/forms/CMS/Casestudies.php     |  2 +-
 .../application/forms/CMS/Expertises.php      |  2 +-
 .../application/forms/CMS/Realisations.php    |  2 +-
 .../views/scripts/admin/index.phtml           |  8 +++
 .../views/scripts/templates/agence.phtml      |  2 +-
 .../views/scripts/templates/casestudies.phtml | 31 ++++++++++
 .../views/scripts/templates/expertises.phtml  |  5 ++
 .../views/scripts/templates/home.phtml        |  6 +-
 .../scripts/templates/realisations.phtml      |  5 ++
 js/contact.js                                 | 62 +++++++++++--------
 less/admin.less                               | 10 ++-
 less/agence.less                              | 20 ------
 less/casestudies.less                         | 45 ++++++++++++++
 less/common.less                              | 19 ++++++
 less/home.less                                | 48 +++++++-------
 15 files changed, 189 insertions(+), 78 deletions(-)
 create mode 100644 framework/application/views/scripts/admin/index.phtml
 create mode 100644 framework/application/views/scripts/templates/casestudies.phtml
 create mode 100644 framework/application/views/scripts/templates/expertises.phtml
 create mode 100644 framework/application/views/scripts/templates/realisations.phtml
 create mode 100644 less/casestudies.less

diff --git a/framework/application/forms/CMS/Casestudies.php b/framework/application/forms/CMS/Casestudies.php
index 4705ad6..b7d5179 100644
--- a/framework/application/forms/CMS/Casestudies.php
+++ b/framework/application/forms/CMS/Casestudies.php
@@ -5,7 +5,7 @@ class Cubedesigners_Form_CMS_Casestudies extends Cubedesigners_Form_CMS {
     public function init() {
         parent::init();
 
-        $titre = new Zend_Form_Element_Text('titre');
+        $titre = new CubeIT_Form_Element_Markitup('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
     }
diff --git a/framework/application/forms/CMS/Expertises.php b/framework/application/forms/CMS/Expertises.php
index 207b873..ee15536 100644
--- a/framework/application/forms/CMS/Expertises.php
+++ b/framework/application/forms/CMS/Expertises.php
@@ -5,7 +5,7 @@ class Cubedesigners_Form_CMS_Expertises extends Cubedesigners_Form_CMS {
     public function init() {
         parent::init();
 
-        $titre = new Zend_Form_Element_Text('titre');
+        $titre = new CubeIT_Form_Element_Markitup('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
     }
diff --git a/framework/application/forms/CMS/Realisations.php b/framework/application/forms/CMS/Realisations.php
index a387744..18bdf95 100644
--- a/framework/application/forms/CMS/Realisations.php
+++ b/framework/application/forms/CMS/Realisations.php
@@ -5,7 +5,7 @@ class Cubedesigners_Form_CMS_Realisations extends Cubedesigners_Form_CMS {
     public function init() {
         parent::init();
 
-        $titre = new Zend_Form_Element_Text('titre');
+        $titre = new CubeIT_Form_Element_Markitup('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
     }
diff --git a/framework/application/views/scripts/admin/index.phtml b/framework/application/views/scripts/admin/index.phtml
new file mode 100644
index 0000000..411af7b
--- /dev/null
+++ b/framework/application/views/scripts/admin/index.phtml
@@ -0,0 +1,8 @@
+<?php
+
+echo '<div id="adminlogin" class="adminlogin cubeit-content">';
+$this->headLink()->appendStylesheet('/CubeIT/less/admin/common.less', 'all');
+$this->headScript()->addScriptAndStyle('admin');
+echo '<div id="message"></div>';
+echo $this->form;
+echo '</div>';
diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml
index 646c151..372d997 100644
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -2,7 +2,7 @@
 $this->headScript()->addScriptAndStyle('agence');
 ?>
 
-<div class="agency-title"><?php echo $this->markupDotclear($this->titre); ?></div>
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
 <div class="agency-description">
     <div class="col"><?php echo $this->markupDotclear($this->colonnegauche); ?></div>
     <div class="col"><?php echo $this->markupDotclear($this->colonnedroite); ?></div>
diff --git a/framework/application/views/scripts/templates/casestudies.phtml b/framework/application/views/scripts/templates/casestudies.phtml
new file mode 100644
index 0000000..ce70e86
--- /dev/null
+++ b/framework/application/views/scripts/templates/casestudies.phtml
@@ -0,0 +1,31 @@
+<?php
+$this->headScript()->addScriptAndStyle('casestudies');
+?>
+
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+<div id="casestudies-tagslist"><span class="tag">TOUT VOIR</span><span class="tag">Sites internet</span><span class="tag">Logotypes</span></div>
+
+<div id="casestudies-list">
+    <?php
+    $count = 1;
+    for ($i = 0; $i < 6; $i++) {
+
+        $addSpacer = false;
+
+        if ($count == 3) {
+            $count = 1;
+            $addClass = '';
+            $addSpacer = true;
+        } else {
+            $addClass = ' blocmargin';
+            $count++;
+        }
+        echo '<div class="bloc' . $addClass . '"></div>';
+
+        if ($addSpacer)
+            echo '<div class="spacer"></div>';
+    }
+    ?>
+</div>
+
diff --git a/framework/application/views/scripts/templates/expertises.phtml b/framework/application/views/scripts/templates/expertises.phtml
new file mode 100644
index 0000000..4936303
--- /dev/null
+++ b/framework/application/views/scripts/templates/expertises.phtml
@@ -0,0 +1,5 @@
+<?php
+$this->headScript()->addScriptAndStyle('expertises');
+?>
+
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 5312dca..6e10e7f 100644
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -4,7 +4,7 @@ $this->headScript()->addScriptAndStyle('home');
 
 <div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>
 
-<div class="home-slideshow">
+<div id="home-slideshow">
     <div class="slides-holder">
         <?php
         echo $this->homeSlideshow($this->slideshow);
@@ -12,7 +12,7 @@ $this->headScript()->addScriptAndStyle('home');
     </div>
 </div>
 
-<div class="home-agency">
+<div id="home-agency">
     <div class="bloc-holder">
 
         <h1><?php echo ucfirst($this->agence['titre']); ?></h1>
@@ -22,7 +22,7 @@ $this->headScript()->addScriptAndStyle('home');
     </div>
 </div>
 
-<div class="home-expertise">
+<div id="home-expertise">
     <div class="bloc-holder">
 
         <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>
diff --git a/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml
new file mode 100644
index 0000000..d260ae5
--- /dev/null
+++ b/framework/application/views/scripts/templates/realisations.phtml
@@ -0,0 +1,5 @@
+<?php
+$this->headScript()->addScriptAndStyle('realisations');
+?>
+
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>
\ No newline at end of file
diff --git a/js/contact.js b/js/contact.js
index e48e241..dc1bb6f 100644
--- a/js/contact.js
+++ b/js/contact.js
@@ -1,31 +1,41 @@
 var markers=[];
 
-var mapStyles =[
-                    {
-                    stylers: [
-                      { 
-                          saturation: -100
-                      }
-                    ]
-                  },
-		{ 
-			featureType: "road",
-			elementType: "labels.text.fill",
-			stylers: [
-			{
-				color: "#000000"
-			}
-			]
-		},
-                { 
-			featureType: "landscape.natural",
-			stylers: [
-			{
-				color: "#000000"
-			}
-			]
-		}
-		];
+var mapStyles =
+    [
+        {
+        stylers: [
+          { 
+              saturation: -100
+          }
+        ]
+      },
+      {
+            featureType: "poi",
+            elementType: "labels",
+            stylers: [
+            {
+                    visibility: "off"
+            }
+            ]
+      },
+    { 
+            featureType: "road",
+            elementType: "labels.text.fill",
+            stylers: [
+            {
+                    color: "#000000"
+            }
+            ]
+    },
+    { 
+            featureType: "landscape.natural",
+            stylers: [
+            {
+                    color: "#f0eff0"
+            }
+            ]
+    }
+    ];
 
 function initMaps(){
     
diff --git a/less/admin.less b/less/admin.less
index 01e2d75..c5c983d 100644
--- a/less/admin.less
+++ b/less/admin.less
@@ -1,3 +1,11 @@
+.cubeit-content,
+#adminlogin {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 50px 0 50px 0;
+}
+
 #adminBar{
 	background:rgb(56,133,224);
 	background:rgba(56,133,224,0.7);
@@ -24,4 +32,4 @@
 
 #adminBar a.right{
 	float:right;
-}
\ No newline at end of file
+}
diff --git a/less/agence.less b/less/agence.less
index f5fb6d1..433a8c4 100644
--- a/less/agence.less
+++ b/less/agence.less
@@ -1,23 +1,3 @@
-/* Agence Title */
-.agency-title {
-    min-width: 980px;
-    max-width: 980px;
-    margin: 0 auto;
-    padding: 50px 0 50px 0;
-}
-
-.agency-title h1 {
-    text-align: left;
-    font-weight: normal;
-    font-size: 56px;
-}
-
-.agency-title h2 {
-    text-align: left;
-    font-weight: normal;
-    font-size: 22px;
-}
-
 /* Agence description */
 .agency-description {
     min-width: 980px;
diff --git a/less/casestudies.less b/less/casestudies.less
new file mode 100644
index 0000000..e747f79
--- /dev/null
+++ b/less/casestudies.less
@@ -0,0 +1,45 @@
+#casestudies-tagslist {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 0 0 20px 0;
+}
+
+#casestudies-tagslist span {
+    font-size: 14px;
+    color: #6f6f6f;
+    padding: 3px;
+    border-radius: 2px;
+    background-color: #ededed;
+    margin:0 6px 0 0;
+}
+
+#casestudies-tagslist span:hover,
+#casestudies-tagslist span:active {
+    cursor: pointer;
+    color: #fff;
+    background-color: #84ae1e;
+}
+
+#casestudies-list {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 0 0 50px 0;
+    overflow: hidden;
+}
+
+#casestudies-list .bloc {
+    float:left;
+    width:300px;
+    height:225px;
+    background-color: #ccc;
+}
+
+#casestudies-list .blocmargin {
+    margin-right:40px;
+}
+#casestudies-list .spacer {
+    clear: left;
+    height:20px;
+}
\ No newline at end of file
diff --git a/less/common.less b/less/common.less
index f39db4a..5cff343 100644
--- a/less/common.less
+++ b/less/common.less
@@ -36,4 +36,23 @@ a:active {
 
 #wrapper {
     
+}
+
+.title {
+    min-width: 980px;
+    max-width: 980px;
+    margin: 0 auto;
+    padding: 50px 0 50px 0;
+}
+
+.title h1 {
+    text-align: left;
+    font-weight: normal;
+    font-size: 56px;
+}
+
+.title h2 {
+    text-align: left;
+    font-weight: normal;
+    font-size: 22px;
 }
\ No newline at end of file
diff --git a/less/home.less b/less/home.less
index 3a362ca..16325ca 100644
--- a/less/home.less
+++ b/less/home.less
@@ -14,11 +14,11 @@
 }
 
 /* Home Slideshow */
-.home-slideshow {
+#home-slideshow {
     padding-bottom:50px;
 }
 
-.home-slideshow .slides-holder {
+#home-slideshow .slides-holder {
     min-width: 980px;
     max-width: 980px;
     width:100%;
@@ -26,22 +26,22 @@
     overflow:hidden;
 }
 
-.home-slideshow .slides-holder .slides {
+#home-slideshow .slides-holder .slides {
     width:980px;
     height:400px;
 }
 
-.home-slideshow .slides-holder .slides .slide {
+#home-slideshow .slides-holder .slides .slide {
     position:absolute;
     display:none;
 }
 
-.home-slideshow .slides-holder .slides .slide a {
+#home-slideshow .slides-holder .slides .slide a {
     margin:0;
     padding: 0;
 }
 
-.home-slideshow .slides-holder a {
+#home-slideshow .slides-holder a {
     margin: 25px 0 0 0;
     width: 12px;
     height: 22px;
@@ -49,13 +49,13 @@
     padding: 0 0 25px;
 }
 
-.home-slideshow .slides-holder .prev {
+#home-slideshow .slides-holder .prev {
     background: url('../images/prev.png') no-repeat;
     background-position: center top;
     margin-right: 30px;
 }
 
-.home-slideshow .slides-holder .next {
+#home-slideshow .slides-holder .next {
     background: url('../images/next.png') no-repeat;
     background-position: center top;
 }
@@ -68,18 +68,18 @@
 }
 
 /* Home Agency and Expertises */
-.home-agency {
+#home-agency {
     background-color:#3885e0;
     color:#fff;
 }
 
-.home-expertise {
+#home-expertise {
     background-color:#fff;
     color:#1b1b1b;
 }
 
-.home-agency .bloc-holder,
-.home-expertise .bloc-holder {
+#home-agency .bloc-holder,
+#home-expertise .bloc-holder {
     min-width: 980px;
     max-width: 980px;
     width:100%;
@@ -93,37 +93,37 @@
     font-size:56px;
 }
 
-.home-agency .bloc-holder h2,
-.home-expertise .bloc-holder h2 {
+#home-agency .bloc-holder h2,
+#home-expertise .bloc-holder h2 {
     font-size:32px;
     padding: 0 0 20px 0;
 }
 
-.home-agency .bloc-holder .blocs,
-.home-expertise .bloc-holder .blocs {
+#home-agency .bloc-holder .blocs,
+#home-expertise .bloc-holder .blocs {
     padding: 40px 0;
 }
 
-.home-agency .bloc-holder .blocs .spacer,
-.home-expertise .bloc-holder .blocs .spacer {
+#home-agency .bloc-holder .blocs .spacer,
+#home-expertise .bloc-holder .blocs .spacer {
     clear:left;
     padding:25px 0;
 }
 
-.home-agency .bloc-holder .sousbloc,
-.home-expertise .bloc-holder .sousbloc {
+#home-agency .bloc-holder .sousbloc,
+#home-expertise .bloc-holder .sousbloc {
     float:left;
     width:50%;
 }
 
-.home-agency .bloc-holder .sousbloc .texte,
-.home-expertise .bloc-holder .sousbloc .texte {
+#home-agency .bloc-holder .sousbloc .texte,
+#home-expertise .bloc-holder .sousbloc .texte {
     width: 60%;
     float:left;
 }
 
-.home-agency .bloc-holder .sousbloc img,
-.home-expertise .bloc-holder .sousbloc img {
+#home-agency .bloc-holder .sousbloc img,
+#home-expertise .bloc-holder .sousbloc img {
     float:left;
     padding: 0 50px 0 0;
 }
\ No newline at end of file
-- 
2.39.5