(no commit message)

diff --git a/framework/application/forms/CMS/Casestudies.php b/framework/application/forms/CMS/Casestudies.php
index 4705ad62208ea63df29a91f454f074de204050c3..b7d51790902360d40189db00cc4059398d6df04f 100644 (file)
--- 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() {\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

diff --git a/framework/application/forms/CMS/Expertises.php b/framework/application/forms/CMS/Expertises.php
index 207b873102865caed297b67685bfc8cb6fd59169..ee1553615b75bc1c5988937b1b24782bc355f30a 100644 (file)
--- 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() {\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

diff --git a/framework/application/forms/CMS/Realisations.php b/framework/application/forms/CMS/Realisations.php
index a387744783cdfc79479b807f0b0fab22be226262..18bdf959aa2813a05010c9436720d7f6cd0079c3 100644 (file)
--- 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() {\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

diff --git a/framework/application/views/scripts/admin/index.phtml b/framework/application/views/scripts/admin/index.phtml
new file mode 100644 (file)
index 0000000..411af7b
--- /dev/null
+++ b/framework/application/views/scripts/admin/index.phtml
@@ -0,0 +1,8 @@
+<?php\r
+\r
+echo '<div id="adminlogin" class="adminlogin cubeit-content">';\r
+$this->headLink()->appendStylesheet('/CubeIT/less/admin/common.less', 'all');\r
+$this->headScript()->addScriptAndStyle('admin');\r
+echo '<div id="message"></div>';\r
+echo $this->form;\r
+echo '</div>';\r

diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml
index 646c151c1d6017c22adfb38df8226324f7fc9230..372d9973db7b24f13f12fd12222add0c9c695d48 100644 (file)
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -2,7 +2,7 @@
 $this->headScript()->addScriptAndStyle('agence');\r
 ?>\r
 \r
-<div class="agency-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\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

diff --git a/framework/application/views/scripts/templates/casestudies.phtml b/framework/application/views/scripts/templates/casestudies.phtml
new file mode 100644 (file)
index 0000000..ce70e86
--- /dev/null
+++ b/framework/application/views/scripts/templates/casestudies.phtml
@@ -0,0 +1,31 @@
+<?php\r
+$this->headScript()->addScriptAndStyle('casestudies');\r
+?>\r
+\r
+<div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
+\r
+<div id="casestudies-tagslist"><span class="tag">TOUT VOIR</span><span class="tag">Sites internet</span><span class="tag">Logotypes</span></div>\r
+\r
+<div id="casestudies-list">\r
+    <?php\r
+    $count = 1;\r
+    for ($i = 0; $i < 6; $i++) {\r
+\r
+        $addSpacer = false;\r
+\r
+        if ($count == 3) {\r
+            $count = 1;\r
+            $addClass = '';\r
+            $addSpacer = true;\r
+        } else {\r
+            $addClass = ' blocmargin';\r
+            $count++;\r
+        }\r
+        echo '<div class="bloc' . $addClass . '"></div>';\r
+\r
+        if ($addSpacer)\r
+            echo '<div class="spacer"></div>';\r
+    }\r
+    ?>\r
+</div>\r
+\r

diff --git a/framework/application/views/scripts/templates/expertises.phtml b/framework/application/views/scripts/templates/expertises.phtml
new file mode 100644 (file)
index 0000000..4936303
--- /dev/null
+++ b/framework/application/views/scripts/templates/expertises.phtml
@@ -0,0 +1,5 @@
+<?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

diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 5312dca49333544d7ed256ee31b21023720e59fc..6e10e7feacd4fecf9ba82d58f6e1e275790ac3bb 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -4,7 +4,7 @@ $this->headScript()->addScriptAndStyle('home');
 \r
 <div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
 \r
-<div class="home-slideshow">\r
+<div id="home-slideshow">\r
     <div class="slides-holder">\r
         <?php\r
         echo $this->homeSlideshow($this->slideshow);\r
@@ -12,7 +12,7 @@ $this->headScript()->addScriptAndStyle('home');
     </div>\r
 </div>\r
 \r
-<div class="home-agency">\r
+<div id="home-agency">\r
     <div class="bloc-holder">\r
 \r
         <h1><?php echo ucfirst($this->agence['titre']); ?></h1>\r
@@ -22,7 +22,7 @@ $this->headScript()->addScriptAndStyle('home');
     </div>\r
 </div>\r
 \r
-<div class="home-expertise">\r
+<div id="home-expertise">\r
     <div class="bloc-holder">\r
 \r
         <h1><?php echo ucfirst($this->expertises['titre']); ?></h1>\r

diff --git a/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml
new file mode 100644 (file)
index 0000000..d260ae5
--- /dev/null
+++ b/framework/application/views/scripts/templates/realisations.phtml
@@ -0,0 +1,5 @@
+<?php\r
+$this->headScript()->addScriptAndStyle('realisations');\r
+?>\r
+\r
+<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 e48e24122b327a663369bddb3bb4d109b6cac16d..dc1bb6f3a0f75ed5e60848468aa9a2e83cad3145 100644 (file)
--- 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 01e2d750c760d22e71246ced5f9dae8ba6e59f92..c5c983df99b828bdc13c0109c17b361bf66ca4da 100644 (file)
--- a/less/admin.less
+++ b/less/admin.less
@@ -1,3 +1,11 @@
+.cubeit-content,\r
+#adminlogin {\r
+    min-width: 980px;\r
+    max-width: 980px;\r
+    margin: 0 auto;\r
+    padding: 50px 0 50px 0;\r
+}\r
+\r
 #adminBar{\r
        background:rgb(56,133,224);\r
        background:rgba(56,133,224,0.7);\r
@@ -24,4 +32,4 @@
 \r
 #adminBar a.right{\r
        float:right;\r
-}
\ No newline at end of file
+}\r

diff --git a/less/agence.less b/less/agence.less
index f5fb6d182d1bf81f094c54c8ea7a22b601513299..433a8c4b8584c71061e1173b9df8e4ea2f60d873 100644 (file)
--- 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 (file)
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 f39db4aaa1a1339540fc2945b9e90ea1f67b9341..5cff343b8a190f0b263cf4310adb471c2c654a51 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -36,4 +36,23 @@ a:active {
 \r
 #wrapper {\r
     \r
+}\r
+\r
+.title {\r
+    min-width: 980px;\r
+    max-width: 980px;\r
+    margin: 0 auto;\r
+    padding: 50px 0 50px 0;\r
+}\r
+\r
+.title h1 {\r
+    text-align: left;\r
+    font-weight: normal;\r
+    font-size: 56px;\r
+}\r
+\r
+.title h2 {\r
+    text-align: left;\r
+    font-weight: normal;\r
+    font-size: 22px;\r
 }
\ No newline at end of file

diff --git a/less/home.less b/less/home.less
index 3a362ca81268e57b646a6906da1020f9935479d0..16325ca99751d4fb0874c22925a06219911ae3fa 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -14,11 +14,11 @@
 }\r
 \r
 /* Home Slideshow */\r
-.home-slideshow {\r
+#home-slideshow {\r
     padding-bottom:50px;\r
 }\r
 \r
-.home-slideshow .slides-holder {\r
+#home-slideshow .slides-holder {\r
     min-width: 980px;\r
     max-width: 980px;\r
     width:100%;\r
@@ -26,22 +26,22 @@
     overflow:hidden;\r
 }\r
 \r
-.home-slideshow .slides-holder .slides {\r
+#home-slideshow .slides-holder .slides {\r
     width:980px;\r
     height:400px;\r
 }\r
 \r
-.home-slideshow .slides-holder .slides .slide {\r
+#home-slideshow .slides-holder .slides .slide {\r
     position:absolute;\r
     display:none;\r
 }\r
 \r
-.home-slideshow .slides-holder .slides .slide a {\r
+#home-slideshow .slides-holder .slides .slide a {\r
     margin:0;\r
     padding: 0;\r
 }\r
 \r
-.home-slideshow .slides-holder a {\r
+#home-slideshow .slides-holder a {\r
     margin: 25px 0 0 0;\r
     width: 12px;\r
     height: 22px;\r
@@ -49,13 +49,13 @@
     padding: 0 0 25px;\r
 }\r
 \r
-.home-slideshow .slides-holder .prev {\r
+#home-slideshow .slides-holder .prev {\r
     background: url('../images/prev.png') no-repeat;\r
     background-position: center top;\r
     margin-right: 30px;\r
 }\r
 \r
-.home-slideshow .slides-holder .next {\r
+#home-slideshow .slides-holder .next {\r
     background: url('../images/next.png') no-repeat;\r
     background-position: center top;\r
 }\r
@@ -68,18 +68,18 @@
 }\r
 \r
 /* Home Agency and Expertises */\r
-.home-agency {\r
+#home-agency {\r
     background-color:#3885e0;\r
     color:#fff;\r
 }\r
 \r
-.home-expertise {\r
+#home-expertise {\r
     background-color:#fff;\r
     color:#1b1b1b;\r
 }\r
 \r
-.home-agency .bloc-holder,\r
-.home-expertise .bloc-holder {\r
+#home-agency .bloc-holder,\r
+#home-expertise .bloc-holder {\r
     min-width: 980px;\r
     max-width: 980px;\r
     width:100%;\r
@@ -93,37 +93,37 @@
     font-size:56px;\r
 }\r
 \r
-.home-agency .bloc-holder h2,\r
-.home-expertise .bloc-holder h2 {\r
+#home-agency .bloc-holder h2,\r
+#home-expertise .bloc-holder h2 {\r
     font-size:32px;\r
     padding: 0 0 20px 0;\r
 }\r
 \r
-.home-agency .bloc-holder .blocs,\r
-.home-expertise .bloc-holder .blocs {\r
+#home-agency .bloc-holder .blocs,\r
+#home-expertise .bloc-holder .blocs {\r
     padding: 40px 0;\r
 }\r
 \r
-.home-agency .bloc-holder .blocs .spacer,\r
-.home-expertise .bloc-holder .blocs .spacer {\r
+#home-agency .bloc-holder .blocs .spacer,\r
+#home-expertise .bloc-holder .blocs .spacer {\r
     clear:left;\r
     padding:25px 0;\r
 }\r
 \r
-.home-agency .bloc-holder .sousbloc,\r
-.home-expertise .bloc-holder .sousbloc {\r
+#home-agency .bloc-holder .sousbloc,\r
+#home-expertise .bloc-holder .sousbloc {\r
     float:left;\r
     width:50%;\r
 }\r
 \r
-.home-agency .bloc-holder .sousbloc .texte,\r
-.home-expertise .bloc-holder .sousbloc .texte {\r
+#home-agency .bloc-holder .sousbloc .texte,\r
+#home-expertise .bloc-holder .sousbloc .texte {\r
     width: 60%;\r
     float:left;\r
 }\r
 \r
-.home-agency .bloc-holder .sousbloc img,\r
-.home-expertise .bloc-holder .sousbloc img {\r
+#home-agency .bloc-holder .sousbloc img,\r
+#home-expertise .bloc-holder .sousbloc img {\r
     float:left;\r
     padding: 0 50px 0 0;\r
 }
\ No newline at end of file