(no commit message)

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studie.php b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
index 0a505c8f4f0c6519232aab26abe25804b405d9c9..4b4ee0c6b32a047804cd30c90cf0d99e1d0e35c7 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studie.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studie.php
@@ -3,32 +3,32 @@
 class Cubedesigners_Form_CMS_Sub_Casestudies_Studie extends CubeIT_Form_SubForm {
 
     public function init() {
-        parent::init();
+       parent::init();
 
-        $online = new Zend_Form_Element_Checkbox('online');
-        $online->setLabel('En ligne');
-        $this->addElement($online);
+       $online = new Zend_Form_Element_Checkbox('online');
+       $online->setLabel('En ligne');
+       $this->addElement($online);
 
-        $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);
 
-        $description = new Zend_Form_Element_Text('description');
-        $description->setLabel('Description');
-        $this->addElement($description);
+       $description = new Zend_Form_Element_Text('description');
+       $description->setLabel('Description');
+       $this->addElement($description);
 
-        $visuel = new CubeIT_Form_Element_File_Image('visuel');
-        $visuel->setLabel('Visuel de la page Case Studies');
-        $visuel->setMaxItems(1);
-        $this->addElement($visuel);
+       $visuel = new CubeIT_Form_Element_File_Image('visuel');
+       $visuel->setLabel('Visuel de la page Case Studies');
+       $visuel->setMaxItems(1);
+       $this->addElement($visuel);
 
-        $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
-        $blocs->setLegend('Contenu');
-        $this->addSubForm($blocs, 'blocs');
+       $blocs = new Cubedesigners_Form_CMS_Sub_Casestudies_Content_Blocs('blocs');
+       $blocs->setLegend('Contenu');
+       $this->addSubForm($blocs, 'blocs');
 
-        $tags = new Cubedesigners_Form_Element_Tags('tags');
-        $tags->setLabel('Tags');
-        $this->addElement($tags);
+       $tags = new Cubedesigners_Form_Element_Tags('tags');
+       $tags->setLabel('Tags');
+       $this->addElement($tags);
     }
 
 }

diff --git a/framework/application/views/scripts/templates/casestudies.phtml b/framework/application/views/scripts/templates/casestudies.phtml
index a6611892a2252b9be33292181d57bb993ebfcb4f..242c41450b65413092dd3096e8701270d015ad71 100644 (file)
--- a/framework/application/views/scripts/templates/casestudies.phtml
+++ b/framework/application/views/scripts/templates/casestudies.phtml
@@ -8,12 +8,10 @@ $this->headScript()->addScriptAndStyle('casestudies');
     <?php echo $this->CasestudiesTagsList($this->studies); ?>\r
 </div>\r
 \r
-\r
 <div id="casestudies-list">\r
     <?php\r
     $datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
     echo $this->CasestudiesList($datas);\r
-    fb($datas);\r
+    //fb($datas);\r
     ?>\r
 </div>\r
-\r

diff --git a/images/logo.svg b/images/logo.svg
index e7aebfef3108c87e9e9ed0d8fa2e0e3c5a2ed30e..4baf79cfdd933dd0d7efe316c0b60c13b97309e9 100644 (file)
--- a/images/logo.svg
+++ b/images/logo.svg
@@ -2,7 +2,7 @@
 <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="GroupLogo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="317.94px" height="132px" viewBox="0 0 317.94 132" enable-background="new 0 0 317.94 132" xml:space="preserve">\r
+        width="317.94px" height="132px" viewBox="0 0 317.94 132" enable-background="new 0 0 317.94 132" xml:space="preserve" class="svglogo">\r
 <path id="Background" fill-rule="evenodd" clip-rule="evenodd" fill="#3885E0" d="M17.715,123.41\r
        c0.464,3.398,2.586,6.161,5.437,7.59h12.988l272.152-36.653c5.473-0.748,9.303-5.789,8.556-11.261L305.639,1H0.999L17.715,123.41z"\r
        />\r

diff --git a/js/casestudies.js b/js/casestudies.js
index 1d47c9acdbba50acd6d3791354cb3cd380160d2d..600ac49f51e2446ef63ab549b3f18555f56c707c 100644 (file)
--- a/js/casestudies.js
+++ b/js/casestudies.js
@@ -27,6 +27,7 @@ function initTagsLink() {
         }\r
         \r
         displayStudies();\r
+        \r
         //alert(showIds);\r
     });\r
     \r

diff --git a/js/common.js b/js/common.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3c068e0867e18e7197b0472093abfb56a054ce2b 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -0,0 +1,13 @@
+//global radomized color pallette\r
+var colors = ["#6F216C", "#F34B0D", "#C50102", "#5DA537", "#F1D81B"];\r
+\r
+//turn an icon a random color\r
+$(function() {\r
+    $("#header").hover(function() {\r
+        var color = colors[Math.floor(Math.random()*5)];\r
+        $(this).css('fill',color);       \r
+        },\r
+        function() {\r
+            $(this).css('fill','black');\r
+            })\r
+});\r