(no commit message)

diff --git a/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php b/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php
index e6b85a8d73a67220812047422911973edc200434..cbcdd6af7f8508f5ea043f1a33bee200b046456d 100644 (file)
--- a/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php
+++ b/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php
@@ -2,22 +2,26 @@
 
 class Cubedesigners_Form_CMS_Sub_Followus_SocialNetwork extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
-
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre du réseau social');
-        $this->addElement($titre);
-
-        $url = new CubeIT_Form_Element_Url('url');
-        $url->setLabel('Url');
-        $this->addElement($url);
-
-        $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 réseau social');
+               $this->addElement($titre);
+
+               $url = new CubeIT_Form_Element_Url('url');
+               $url->setLabel('Url');
+               $this->addElement($url);
+
+               $couleur = new CubeIT_Form_Element_Color('color');
+               $couleur->setLabel('Couleur');
+               $this->addElement($couleur);
+
+               $picto = new CubeIT_Form_Element_File_Image('picto');
+               $picto->setLabel('Pictogramme');
+               $picto->setMaxItems(1);
+               $this->addElement($picto);
+       }
 
 }
 

diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php
index a14c4188c5a7f3a3b5f995193bd7b554171207f9..2275cd46a47cb011d208a357ea09f1f8da39eee9 100644 (file)
--- a/framework/application/forms/Settings.php
+++ b/framework/application/forms/Settings.php
@@ -2,44 +2,47 @@
 
 class Cubedesigners_Form_Settings extends CubeIT_Form_Settings {
 
-    public function init() {
-        parent::init();
-
-        $this->setTitle('Edition des paramètres du site');
-
-        $longTitle = new Zend_Form_Element_Text('longTitle');
-        $longTitle->setLabel('Titre long par défaut');
-        $this->addElementLocalized($longTitle);
-
-        $description = new CubeIT_Form_Element_Textarea('description');
-        $description->setLabel('Description de la page par défaut');
-        $this->addElementLocalized($description);
-
-        /* BLOC CONTACT */
-        $contact = new Cubedesigners_Form_CMS_Sub_Contact();
-        $contact->setLabel('Informations de contact');
-        $this->addSubFormLocalized($contact, 'contact');
-
-
-        /* BLOC ACTUALITES */
-        $actus = new Cubedesigners_Form_CMS_Sub_News();
-        $actus->setLabel('Bloc Actualités');
-        $this->addSubFormLocalized($actus, 'actus');
-
-        /* BLOC SUIVEZ-NOUS */
-        $followus = new Cubedesigners_Form_CMS_Sub_Followus();
-        $followus->setLabel('Bloc Suivez-nous');
-        $this->addSubFormLocalized($followus, 'followus');
-
-        /* COPYRIGHT */
-        $copyright = new Zend_Form_Element_Text('copyright');
-        $copyright->setLabel('Copyright du bas de page');
-        $this->addElementLocalized($copyright);
-
-        $tags = new Cubedesigners_Form_Element_Tags('tags');
-        $tags->setLabel(__('Tags'));
-        $this->addElement($tags);
-    }
+       public function init() {
+               parent::init();
+
+               $this->setTitle('Edition des paramètres du site');
+
+               $longTitle = new Zend_Form_Element_Text('longTitle');
+               $longTitle->setLabel('Titre long par défaut (limité à 65 caractères)');
+               $longTitle->setAttrib('maxlength', 65);
+               $this->addElementLocalized($longTitle);
+
+               $description = new CubeIT_Form_Element_Textarea('description');
+               $description->setLabel('Description de la page par défaut (limité à 160 caractères)');
+               $description->setAttrib('maxlength', 160);
+               $description->setAttrib('rows', 2);
+               $this->addElementLocalized($description);
+
+               /* BLOC CONTACT */
+               $contact = new Cubedesigners_Form_CMS_Sub_Contact();
+               $contact->setLabel('Informations de contact');
+               $this->addSubFormLocalized($contact, 'contact');
+
+
+               /* BLOC ACTUALITES */
+               $actus = new Cubedesigners_Form_CMS_Sub_News();
+               $actus->setLabel('Bloc Actualités');
+               $this->addSubFormLocalized($actus, 'actus');
+
+               /* BLOC SUIVEZ-NOUS */
+               $followus = new Cubedesigners_Form_CMS_Sub_Followus();
+               $followus->setLabel('Bloc Suivez-nous');
+               $this->addSubFormLocalized($followus, 'followus');
+
+               /* COPYRIGHT */
+               $copyright = new Zend_Form_Element_Text('copyright');
+               $copyright->setLabel('Copyright du bas de page');
+               $this->addElementLocalized($copyright);
+
+               $tags = new Cubedesigners_Form_Element_Tags('tags');
+               $tags->setLabel(__('Tags'));
+               $this->addElement($tags);
+       }
 
 }
 

diff --git a/framework/application/views/helpers/CasestudiesTagsList.php b/framework/application/views/helpers/CasestudiesTagsList.php
index 7f4c3d1501812a048c852c131d76e1f051945f04..64ff070e5ac80665fcae25a23275dbc717e18552 100644 (file)
--- a/framework/application/views/helpers/CasestudiesTagsList.php
+++ b/framework/application/views/helpers/CasestudiesTagsList.php
@@ -1,6 +1,6 @@
 <?php
 
-class Cubedesigners_View_Helper_CasestudiesTagsList extends Zend_View_Helper_Abstract {
+class Cubedesigners_View_Helper_CasestudiesTagsList extends CubeIT_View_Helper_Abstract {
 
        public function CasestudiesTagsList($studies) {
 

diff --git a/framework/application/views/helpers/FooterSocials.php b/framework/application/views/helpers/FooterSocials.php
index 61692319dd8b40b42b0f18f1398ebfaa31445e16..0bfad05b61a2c58c96ba2d24947876576f2a2250 100644 (file)
--- a/framework/application/views/helpers/FooterSocials.php
+++ b/framework/application/views/helpers/FooterSocials.php
@@ -1,23 +1,23 @@
-<?php\r
-\r
-class Cubedesigners_View_Helper_FooterSocials extends Zend_View_Helper_Abstract {\r
-\r
-    public function footerSocials($socials) {\r
-\r
-        $socials = $socials["reseauxsociaux"];\r
-\r
-        $nbSocials = count($socials);\r
-\r
-        $res = '<div class="reseaux">';\r
-        foreach ($socials as $id => $social) {\r
-            $image = $this->view->imageCms($social['picto'], $social['titre'], 25, 25);\r
-            $res.='<a href="' . $social['url'] . '"><div class="social ' . $social['titre'] . '">' . $image . '</div></a>';\r
-        }\r
-        $res.= '</div>';\r
-\r
-        return $res;\r
-    }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_View_Helper_FooterSocials extends CubeIT_View_Helper_Abstract {
+
+       public function footerSocials($socials) {
+
+               $socials = $socials["reseauxsociaux"];
+
+               $nbSocials = count($socials);
+
+               $res = '<div class="reseaux">';
+               foreach ($socials as $id => $social) {
+                       $image = $this->view->imageCms($social['picto'], $social['titre'], 25, 25);
+                       $res.=$this->link($image, $social['url'], array('class' => 'social', 'data-color' => $social['color']));
+               }
+               $res.= '</div>';
+
+               return $res;
+       }
+
+}
+
+?>

diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php
index 42e9fad5c5869ca41980dade9f8700feb04564a8..66a63213e1965d4679fa076f4b4e6f693064a045 100644 (file)
--- a/framework/application/views/helpers/RealisationsList.php
+++ b/framework/application/views/helpers/RealisationsList.php
@@ -1,59 +1,55 @@
-<?php\r
-\r
-class Cubedesigners_View_Helper_RealisationsList extends Zend_View_Helper_Abstract {\r
-\r
-        public function RealisationsList($datas) {\r
-\r
-                $acl = Bootstrap::getInstance()->isAllowed("edition");\r
-\r
-                $db = Zend_Db_Table::getDefaultAdapter();\r
-                $s = $db->select()->from('realisations')\r
-                        ->order('id ASC');\r
-                if (!$acl) {\r
-                        $s->where('online = ?', 1);\r
-                }\r
-\r
-                $q = $s->query();\r
-\r
-                $count = 1;\r
-\r
-                $res = '';\r
-\r
-                $test = 0;\r
-                while ($r = $q->fetch()) {\r
-\r
-                        $r = CubeIT_Util_Cms::unserialize($r);\r
-\r
-                        $addSpacer = false;\r
-\r
-                        $addClass = ' blocmargin';\r
-\r
-\r
-                        $addOffline = '';\r
-                        if ($acl && $r->online == 0) {\r
-                                $addOffline = 'data-offline="1"';\r
-                        }\r
-\r
-\r
-                        $visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);\r
-\r
-\r
-                        $image = $this->view->imageProcess($r->visuel, $r->titre, 230, 230);\r
-                        $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']);\r
-\r
-                        $res .= '<a href="#" onclick="return false;" data-url="' . $url . '" data-id="' . $r->id . '">';\r
-                        $res .= '<div class=" bloc' . $addClass . '" data-categories="' . $r->categories . '" data-pos="' . $count . '">';\r
-                        $res .= '<div class="project-photo">' . $image . '</div>';\r
-                        $res .= '</div>';\r
-                        $res .= '</a>';\r
-                        $test++;\r
-\r
-                        $count++;\r
-                }\r
-\r
-                return $res;\r
-        }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abstract {
+
+       public function RealisationsList($datas) {
+
+               $acl = Bootstrap::getInstance()->isAllowed("edition");
+
+               $db = Zend_Db_Table::getDefaultAdapter();
+               $s = $db->select()->from('realisations')
+                               ->order('date DESC');
+               if (!$acl) {
+                       $s->where('online = ?', 1);
+               }
+
+               $q = $s->query();
+
+               $count = 1;
+
+               $res = '';
+
+               $test = 0;
+               while ($r = $q->fetch()) {
+
+                       $r = CubeIT_Util_Cms::unserialize($r);
+
+                       $addSpacer = false;
+
+                       $addClass = ' blocmargin';
+
+
+                       $addOffline = '';
+                       if ($acl && $r->online == 0) {
+                               $addOffline = 'data-offline="1"';
+                       }
+
+
+                       $visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);
+
+
+                       $image = $this->view->imageProcess($r->visuel, $r->titre, 127, 127);
+                       $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']);
+
+                       $res .= $this->link($image, $url, array('data-id' => $r->id, 'data-categorie' => $r->categories));
+                       $test++;
+
+                       $count++;
+               }
+
+               return $res;
+       }
+
+}
+
+?>

diff --git a/framework/application/views/helpers/TagList.php b/framework/application/views/helpers/TagList.php
new file mode 100644 (file)
index 0000000..ecd9886
--- /dev/null
+++ b/framework/application/views/helpers/TagList.php
@@ -0,0 +1,11 @@
+<?php
+
+class Cubedesigners_View_Helper_TagList extends CubeIT_View_Helper_Abstract {
+
+       public function tagList() {
+               $res = '';
+
+               return $res;
+       }
+
+}

diff --git a/framework/application/views/helpers/Tags.php b/framework/application/views/helpers/Tags.php
index 8d58825fc9bc23eaf07a8d74cc38beeaaca9103c..16d5016f5496aacdd3beb739d5926336b55799b1 100644 (file)
--- a/framework/application/views/helpers/Tags.php
+++ b/framework/application/views/helpers/Tags.php
@@ -3,6 +3,8 @@
 class Cubedesigners_View_Helper_Tags extends CubeIT_View_Helper_ListUnordered {
 
        function tags($tags, $attrs = array()) {
+               $tags = CubeIT_Util_Cms::unserialize($tags);
+
                $this->view->headLink()->appendStylesheet('/less/taglist.less');
                if (isset($attrs['class'])) {
                        $attrs['class'].=" tags";
@@ -12,6 +14,8 @@ class Cubedesigners_View_Helper_Tags extends CubeIT_View_Helper_ListUnordered {
                $items[] = array('content' => __('TOUT VOIR'), 'class' => 'active', 'data-id' => 0);
 
                foreach ($tags as $id => $name) {
+
+
                        $items[] = array('content' => $name, 'data-id' => $id);
                }
                return $this->listUnordered($items, $attrs);

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index d6162c92d874cf9ecae5f4163dd6ce8712a794ea..d0532a8c76896bb21f8a1f6ff743c91b09428ecd 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -1,5 +1,5 @@
 <?php
-$this->headLink()->appendStylesheet('/less/footer.less');
+$this->headScript()->addScriptAndStyle('footer');
 
 $mentions_page = $this->navigation()->getContainer()->findOneById($this->localeDefault() . '/7');
 $mentions = '/';

diff --git a/js/footer.js b/js/footer.js
new file mode 100644 (file)
index 0000000..fcf09ff
--- /dev/null
+++ b/js/footer.js
@@ -0,0 +1,9 @@
+registerLoader(load_footer);
+
+function load_footer() {
+       $('a.social').on('mouseenter', function () {
+               $(this).css('background-color', $(this).data('color'));
+       }).on('mouseleave', function () {
+               $(this).css('background-color', '');
+       });
+}
\ No newline at end of file

diff --git a/js/realisations.js b/js/realisations.js
index a68320ee91cd76a61fc40228c163aee7a0c058c1..fd14ecb310cf994289547624249fba852031d56a 100644 (file)
--- a/js/realisations.js
+++ b/js/realisations.js
@@ -1,303 +1,304 @@
-TO_LOAD_ONCE[TO_LOAD_ONCE.length]='load_realisations();';\r
-\r
-var showIds = new Array();\r
-var isAnim = false;\r
-var currentOpen = 0;\r
-var currentOpenValues;\r
-var detail = "";\r
-var currentSlide = 1;\r
-var autoSlide = false;\r
-var totalWidth;\r
-var lastWidth;\r
-var showIds = new Array();\r
-\r
-function load_realisations() {\r
-    initTagsLink();\r
-    \r
-    $("#main").css('height', 1500);\r
-    \r
-     $(".bloc").click( function () {\r
-        \r
-        var currentRea = $(this).attr("data-pos");\r
-           \r
-        if( !isAnim && currentRea != currentOpen ) {\r
-\r
-           isAnim = true;\r
-\r
-           var reaWidth = $(this).width() + parseInt($(this).css("margin-right").split("px")[0]);\r
-           var reaId = $(this).parent().attr("data-id");\r
-           var reaPerRow = $(this).parent().parent().width() / reaWidth;\r
-\r
-           var nbReas = $('.project-photo').length;\r
-\r
-           var nbRow = Math.ceil(nbReas / reaPerRow ); \r
-           \r
-           var reaPos = 1;\r
-           var count = 0;\r
-\r
-           var cible = $("#realisations-list").find("[data-pos='1']");\r
-\r
-           while( count < currentRea) {\r
-               count++;\r
-               if( (count % (reaPerRow+1)) == 0 ) {\r
-                   reaPos++;\r
-                   cible = $("#realisations-list").find("[data-pos='" + count + "']");\r
-               }\r
-           }\r
-\r
-           detail = "";\r
-          \r
-            $.ajax({\r
-               url             : '/ajax/displayrealisation',\r
-               type    : 'GET',\r
-                data: 'realisation_id=' + reaId,\r
-               complete: function(ret) {\r
-                   \r
-                   var response = JSON.parse(ret.responseText);\r
-                   var rea = response.vars.rea;\r
-                   \r
-                   currentOpenValues = rea;\r
-                   \r
-                   detail += '<div id="detailContent"><div id="detail">';\r
-                   detail += '<div class="detailLeft">';\r
-                   detail += '<div class="titre">'+rea.titre+'</div>';\r
-                    \r
-                    if( rea.legende != '') {\r
-                         detail += '<div class="legende">'+rea.legende+'</div>';\r
-                    }\r
-                    \r
-                    if( rea.agence != '') {\r
-                         detail += '<div class="agence">Agence : '+rea.agence+'</div>';\r
-                    }\r
-                    \r
-                    \r
-                    detail += '<ul class="taglist">';\r
-                    detail += '<li>' + rea.annee +'</li>';\r
-                    \r
-                     for( var i=0; i<rea.tags_secondaires.length; i++) {\r
-                         detail += '<li>' + rea.tags_secondaires[i] +'</li>';\r
-                     }\r
-                    \r
-                    detail += '</ul>';\r
-                    \r
-                    \r
-                   detail += '<div class="description">'+rea.description+'</div>';\r
-                   detail += '<a class="link" href="'+rea.url+'">Voir le site</a>';\r
-                   detail += '</div>';\r
-                   detail += '<div class="detailRight"><div class="slides"><ul>';\r
-                   \r
-                   totalWidth = 0;\r
-                   for( var i=0; i<rea.visuel_detail.length; i++) {\r
-                       \r
-                       var image=new Image();\r
-                       image.src=rea.visuel_detail[i];\r
-                       totalWidth += image.width;\r
-                       \r
-                       if( i == ( rea.visuel_detail.length-1 ) ) {\r
-                           lastWidth = image.width;\r
-                       }\r
-                       \r
-                       detail += '<li><img id="visuel_detail" src="'+rea.visuel_detail[i]+'" /></li>';\r
-                   }\r
-                   \r
-                   detail += '</ul></div></div>';\r
-                   detail += '</div><div class="close"></div></div>';\r
-                   \r
-                   if( $( "#detail" ).length > 0) {\r
-                       $( "#detail" ).slideUp( 500, function() {\r
-                                \r
-                           $('#detailContent').remove();\r
-                            \r
-                           $(cible.parent()).before(detail);\r
-                           \r
-                           $("html, body").animate({ scrollTop: $('#detailContent').offset().top-100 }, 1000);\r
-                           $('.close').css("top", $('#detailContent').offset().top);\r
-                            \r
-                           $( "#detail" ).slideDown( "slow", function() {\r
-                               isAnim = false;\r
-                               addCloseAction();\r
-                               currentSlide = 1;\r
-                               autoSlide = true;\r
-                                initSlideShow();\r
-                         \r
-                           }).animate(\r
-                               { opacity: 1  },\r
-                               { queue: true, duration: 'slow' }\r
-                             );\r
-                      \r
-                       }).animate(\r
-                           { opacity: 1 },\r
-                           { queue: true, duration: 'slow' }\r
-                         );\r
-                   }else{\r
-                       $(cible.parent()).before(detail);\r
-                       \r
-                       $("html, body").animate({ scrollTop: $('#detailContent').offset().top-100 }, 1000);\r
-                       $('.close').css("top", $('#detailContent').offset().top);\r
-                        /*\r
-                       $( "#detail" ).slideDown( "slow", function() {\r
-                          \r
-                           isAnim = false;\r
-                           addCloseAction();\r
-                           currentSlide = 1;\r
-                           autoSlide = true;\r
-                           initSlideShow();\r
-                            \r
-                       }).animate(\r
-                           { opacity: 1 },\r
-                           { queue: true, duration: 'slow' }\r
-                         );*/\r
-                  \r
-                  \r
-                         $( "#detail" ).addClass("showDown");\r
-                        $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {\r
-                                isAnim = false;\r
-                           addCloseAction();\r
-                           currentSlide = 1;\r
-                           autoSlide = true;\r
-                           initSlideShow();\r
-                        });  \r
-                  \r
-                   }\r
-\r
-                   /*$(".project-photo").each( function() {\r
-                       var id = $(this).parent().attr("data-pos");\r
-                       if( id != currentRea ) {\r
-                           $(this).addClass("gray");\r
-                       }else{\r
-                            $(this).removeClass("gray");\r
-                        }\r
-                   });*/\r
-                       }\r
-                       \r
-               });\r
-\r
-           \r
-        }\r
-        \r
-        currentOpen = currentRea;\r
-    }); \r
-}\r
-\r
-function addCloseAction() {\r
-    $(".close").click(function() {\r
-        $("html, body").animate({ scrollTop: 0 }, 1000);\r
-       \r
-       /* $( "#detail" ).slideUp( "slow", function() {\r
-              $('#detailContent').remove();\r
-              currentOpen = 0;\r
-              $(".project-photo").each( function() {\r
-                  $(this).removeClass("gray");\r
-              });\r
-          }).animate(\r
-           { opacity: 1 },\r
-           { queue: false, duration: 'slow' }\r
-         );*/\r
-            \r
-        $( "#detail" ).addClass("showUp");\r
-        $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {\r
-                currentOpen = 0;\r
-                $(".project-photo").each( function() {\r
-                  $(this).removeClass("gray");\r
-                });\r
-        });\r
-  \r
-    });\r
-}\r
-\r
-function initTagsLink() {\r
-        \r
-    $(".tag").click(function() {\r
-       \r
-        $(".close").click();\r
-       \r
-        $(this).toggleClass('active');\r
-        \r
-        if( $(this).hasClass('active') ) {\r
-            if(  $(this).attr("data-id") != 0) {\r
-                showIds.push( $(this).attr("data-id") );\r
-            }else{\r
-                showIds = new Array();  \r
-                $(".tag").removeClass('active');\r
-            }\r
-        } else {\r
-            var index = $.inArray( $(this).attr("data-id"), showIds );\r
-            showIds.splice(index, 1);\r
-        }\r
-       \r
-        if( showIds.length > 0 ) {\r
-            $(".tag:first").removeClass('active');\r
-        }else{\r
-            $(".tag:first").addClass('active');\r
-        }\r
-        \r
-        displayRealisations();\r
-    });\r
-    \r
-}\r
-\r
-function displayRealisations() {\r
-    \r
-    if( showIds.length ) {\r
-        $('#realisations-list .bloc').each(function(){\r
-            var categories = $(this).attr("data-categories");\r
-            if( $.inArray( categories, showIds ) == -1 ) {\r
-               $(this).parent().fadeOut( 500, function() {}); \r
-            }else{\r
-               $(this).parent().fadeIn( 500, function() {});  \r
-            }\r
-        });\r
-    }else{\r
-       $( '#realisations-list .bloc' ).parent().fadeIn( 500, function() {});\r
-    }\r
-    \r
-}\r
-\r
-function initSlideShow() {\r
-    \r
-    var mouse_move=false;\r
-    function move(e) {\r
-       if(mouse_move) {\r
-           if(document.documentElement.clientWidth>0) {\r
-\r
-                     position = e.pageX-document.documentElement.scrollLeft;\r
-            } else {\r
-                     position = e.pageX-document.body.scrollLeft;\r
-            }\r
-       }\r
-    }\r
-    document.onmousemove=move;\r
-\r
-    $(".slides").mouseover(function(e){\r
-\r
-       mouse_move = true;\r
-       le_div = '.' + 'slides';\r
-\r
-       if($(le_div + " ul li").length > 1){\r
-\r
-           var total_lenght = totalWidth;\r
-\r
-           var t= setInterval(function(){\r
-\r
-               var offset = $(le_div).offset();\r
-\r
-               if((position - offset.left) < ($("#detailContent").width()/2) ){\r
-                       if($(le_div + " ul").css('marginLeft').replace("px", "") > - (total_lenght - lastWidth)){\r
-                               $(le_div + " ul").animate({marginLeft:"-=2px"},0);\r
-                       }\r
-               }else{\r
-                       if($(le_div + " ul").css('marginLeft').replace("px", "") <= 0){\r
-                               $(le_div + " ul").animate({marginLeft:"+=2px"},0);\r
-                       }\r
-               }\r
-                \r
-           },5);\r
-\r
-           $(le_div).mouseout(function(){\r
-                   clearInterval(t);\r
-                   mouse_move=false;\r
-           });\r
-       }\r
-    });\r
-       \r
+TO_LOAD_ONCE[TO_LOAD_ONCE.length] = 'load_realisations();';
+
+var showIds = new Array();
+var isAnim = false;
+var currentOpen = 0;
+var currentOpenValues;
+var detail = "";
+var currentSlide = 1;
+var autoSlide = false;
+var totalWidth;
+var lastWidth;
+var showIds = new Array();
+
+function load_realisations() {
+       initTagsLink();
+
+       $(".bloc").click(function () {
+
+               var currentRea = $(this).attr("data-pos");
+
+               if (!isAnim && currentRea != currentOpen) {
+
+                       isAnim = true;
+
+                       var reaWidth = $(this).width() + parseInt($(this).css("margin-right").split("px")[0]);
+                       var reaId = $(this).parent().attr("data-id");
+                       var reaPerRow = $(this).parent().parent().width() / reaWidth;
+
+                       var nbReas = $('.project-photo').length;
+
+                       var nbRow = Math.ceil(nbReas / reaPerRow);
+
+                       var reaPos = 1;
+                       var count = 0;
+
+                       var cible = $("#realisations-list").find("[data-pos='1']");
+
+                       while (count < currentRea) {
+                               count++;
+                               if ((count % (reaPerRow + 1)) == 0) {
+                                       reaPos++;
+                                       cible = $("#realisations-list").find("[data-pos='" + count + "']");
+                               }
+                       }
+
+                       detail = "";
+
+                       $.ajax({
+                               url: '/ajax/displayrealisation',
+                               type: 'GET',
+                               data: 'realisation_id=' + reaId,
+                               complete: function (ret) {
+
+                                       var response = JSON.parse(ret.responseText);
+                                       var rea = response.vars.rea;
+
+                                       currentOpenValues = rea;
+
+                                       detail += '<div id="detailContent"><div id="detail">';
+                                       detail += '<div class="detailLeft">';
+                                       detail += '<div class="titre">' + rea.titre + '</div>';
+
+                                       if (rea.legende != '') {
+                                               detail += '<div class="legende">' + rea.legende + '</div>';
+                                       }
+
+                                       if (rea.agence != '') {
+                                               detail += '<div class="agence">Agence : ' + rea.agence + '</div>';
+                                       }
+
+
+                                       detail += '<ul class="taglist">';
+                                       detail += '<li>' + rea.annee + '</li>';
+
+                                       for (var i = 0; i < rea.tags_secondaires.length; i++) {
+                                               detail += '<li>' + rea.tags_secondaires[i] + '</li>';
+                                       }
+
+                                       detail += '</ul>';
+
+
+                                       detail += '<div class="description">' + rea.description + '</div>';
+                                       detail += '<a class="link" href="' + rea.url + '">Voir le site</a>';
+                                       detail += '</div>';
+                                       detail += '<div class="detailRight"><div class="slides"><ul>';
+
+                                       totalWidth = 0;
+                                       for (var i = 0; i < rea.visuel_detail.length; i++) {
+
+                                               var image = new Image();
+                                               image.src = rea.visuel_detail[i];
+                                               totalWidth += image.width;
+
+                                               if (i == (rea.visuel_detail.length - 1)) {
+                                                       lastWidth = image.width;
+                                               }
+
+                                               detail += '<li><img id="visuel_detail" src="' + rea.visuel_detail[i] + '" /></li>';
+                                       }
+
+                                       detail += '</ul></div></div>';
+                                       detail += '</div><div class="close"></div></div>';
+
+                                       if ($("#detail").length > 0) {
+                                               $("#detail").slideUp(500, function () {
+
+                                                       $('#detailContent').remove();
+
+                                                       $(cible.parent()).before(detail);
+
+                                                       $("html, body").animate({scrollTop: $('#detailContent').offset().top - 100}, 1000);
+                                                       $('.close').css("top", $('#detailContent').offset().top);
+
+                                                       $("#detail").slideDown("slow", function () {
+                                                               isAnim = false;
+                                                               addCloseAction();
+                                                               currentSlide = 1;
+                                                               autoSlide = true;
+                                                               initSlideShow();
+
+                                                       }).animate(
+                                                                       {opacity: 1},
+                                                       {queue: true, duration: 'slow'}
+                                                       );
+
+                                               }).animate(
+                                                               {opacity: 1},
+                                               {queue: true, duration: 'slow'}
+                                               );
+                                       } else {
+                                               $(cible.parent()).before(detail);
+
+                                               $("html, body").animate({scrollTop: $('#detailContent').offset().top - 100}, 1000);
+                                               $('.close').css("top", $('#detailContent').offset().top);
+                                               /*
+                                                $( "#detail" ).slideDown( "slow", function() {
+
+                                                isAnim = false;
+                                                addCloseAction();
+                                                currentSlide = 1;
+                                                autoSlide = true;
+                                                initSlideShow();
+
+                                                }).animate(
+                                                { opacity: 1 },
+                                                { queue: true, duration: 'slow' }
+                                                );*/
+
+
+                                               $("#detail").addClass("showDown");
+                                               $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function (e) {
+                                                       isAnim = false;
+                                                       addCloseAction();
+                                                       currentSlide = 1;
+                                                       autoSlide = true;
+                                                       initSlideShow();
+                                               });
+
+                                       }
+
+                                       /*$(".project-photo").each( function() {
+                                        var id = $(this).parent().attr("data-pos");
+                                        if( id != currentRea ) {
+                                        $(this).addClass("gray");
+                                        }else{
+                                        $(this).removeClass("gray");
+                                        }
+                                        });*/
+                               }
+
+                       });
+
+
+               }
+
+               currentOpen = currentRea;
+       });
+}
+
+function addCloseAction() {
+       $(".close").click(function () {
+               $("html, body").animate({scrollTop: 0}, 1000);
+
+               /* $( "#detail" ).slideUp( "slow", function() {
+                $('#detailContent').remove();
+                currentOpen = 0;
+                $(".project-photo").each( function() {
+                $(this).removeClass("gray");
+                });
+                }).animate(
+                { opacity: 1 },
+                { queue: false, duration: 'slow' }
+                );*/
+
+               $("#detail").addClass("showUp");
+               $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function (e) {
+                       currentOpen = 0;
+                       $(".project-photo").each(function () {
+                               $(this).removeClass("gray");
+                       });
+               });
+
+       });
+}
+
+function initTagsLink() {
+
+       $(".tag").click(function () {
+
+               $(".close").click();
+
+               $(this).toggleClass('active');
+
+               if ($(this).hasClass('active')) {
+                       if ($(this).attr("data-id") != 0) {
+                               showIds.push($(this).attr("data-id"));
+                       } else {
+                               showIds = new Array();
+                               $(".tag").removeClass('active');
+                       }
+               } 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');
+               }
+
+               displayRealisations();
+       });
+
+}
+
+function displayRealisations() {
+
+       if (showIds.length) {
+               $('#realisations-list .bloc').each(function () {
+                       var categories = $(this).attr("data-categories");
+                       if ($.inArray(categories, showIds) == -1) {
+                               $(this).parent().fadeOut(500, function () {
+                               });
+                       } else {
+                               $(this).parent().fadeIn(500, function () {
+                               });
+                       }
+               });
+       } else {
+               $('#realisations-list .bloc').parent().fadeIn(500, function () {
+               });
+       }
+
+}
+
+function initSlideShow() {
+
+       var mouse_move = false;
+       function move(e) {
+               if (mouse_move) {
+                       if (document.documentElement.clientWidth > 0) {
+
+                               position = e.pageX - document.documentElement.scrollLeft;
+                       } else {
+                               position = e.pageX - document.body.scrollLeft;
+                       }
+               }
+       }
+       document.onmousemove = move;
+
+       $(".slides").mouseover(function (e) {
+
+               mouse_move = true;
+               le_div = '.' + 'slides';
+
+               if ($(le_div + " ul li").length > 1) {
+
+                       var total_lenght = totalWidth;
+
+                       var t = setInterval(function () {
+
+                               var offset = $(le_div).offset();
+
+                               if ((position - offset.left) < ($("#detailContent").width() / 2)) {
+                                       if ($(le_div + " ul").css('marginLeft').replace("px", "") > -(total_lenght - lastWidth)) {
+                                               $(le_div + " ul").animate({marginLeft: "-=2px"}, 0);
+                                       }
+                               } else {
+                                       if ($(le_div + " ul").css('marginLeft').replace("px", "") <= 0) {
+                                               $(le_div + " ul").animate({marginLeft: "+=2px"}, 0);
+                                       }
+                               }
+
+                       }, 5);
+
+                       $(le_div).mouseout(function () {
+                               clearInterval(t);
+                               mouse_move = false;
+                       });
+               }
+       });
+
 }
\ No newline at end of file

diff --git a/less/casestudies.less b/less/casestudies.less
index a260a41bbd8ee9e26a1ef2843ceba9de7bb1d295..5559e136835d61b89a88630858c4104785af90c9 100644 (file)
--- a/less/casestudies.less
+++ b/less/casestudies.less
@@ -8,26 +8,30 @@
     .bloc {
         width:300px;
         float:left;
+               .project-photo {
+                       width:300px;
+                       height:225px;
+                       background-color: #ccc;
+                       margin:0 0 10px 0;
+               }
+               .project-title {
+                       font-size: 32px;
+                       line-height: 35px;
+                       color:#1b1b1b;
+               }
+               .project-description {
+                       font-size: 14px;
+                       line-height: 16px;
+                       color:#545454;
+                       margin-bottom: 20px;
+               }
+
     }
 
     a,a:hover {
         color:#000;
     }
 
-    .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;
@@ -40,10 +44,4 @@
 }
 #casestudies-detail-content {
     background-color: #3885E0;
-}
-
-/* max-width pour faibles résolutions */
-@media screen and (max-width: 1009px) {
-
-
 }
\ No newline at end of file

diff --git a/less/common.less b/less/common.less
index 5e838c420370777651d1022d5a76bccb0d8c8c20..ddc930825e50b6f00b6f11e3e749755c36484824 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -78,19 +78,16 @@ a.but {
 }
 
 .title {
-       width: 980px;
        margin: 0 auto;
        padding: 40px 0 0 0;
        h1 {
                text-align: left;
-               font-weight: 300;
                font-size: 56px;
-               margin:0 0 10px 0;
+               line-height: 61px;
        }
        h2 {
                text-align: left;
-               font-weight: 300;
                font-size: 22px;
-               padding:0 0 20px 0;
+               line-height: 25px;
        }
 }

diff --git a/less/footer.less b/less/footer.less
index 61deea9f9e7ce1593883070dfc311a4054d4c7ca..23c821106c0a5d7c0f1d600a7fa70b392ae1ddeb 100644 (file)
--- a/less/footer.less
+++ b/less/footer.less
@@ -96,16 +96,15 @@
 
        .reseaux {
                .social {
-                       float: left;
+                       display:inline-block;
                        width: 42px;
                        height: 42px;
+                       box-sizing: border-box;
                        text-align: center;
                        margin-right: 20px;
                        background-color: #191919;
                        border-radius: 25px;
-                       img {
-                               margin-top: 8px;
-                       }
+                       padding:8px 0 0 0;
                }
 
                .Facebook:hover {

diff --git a/less/header.less b/less/header.less
index fe67e8fa7e7f3cc830c24dbf0c72d0205c4c9f9f..f6a872305f894ecd950b6a4d5d36710623e7c4fe 100644 (file)
--- a/less/header.less
+++ b/less/header.less
@@ -1,5 +1,5 @@
 #header {
-    height:168px;
+    height:130px;
 
     ul{
                text-transform: uppercase;

diff --git a/less/home.less b/less/home.less
index 99a5edf1d5a1086d22ab72ae5a5777ba10f45871..2e93768d9052d56507b19f569902823269e1c755 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -12,3 +12,7 @@
                font-size: 32px;
        }
 }
+
+#header{
+       height:168px !important;
+}
\ No newline at end of file

diff --git a/less/realisations.less b/less/realisations.less
index d553ba185c1a3c2d114a889e42134c5223512a44..7f3c85717ea731e66fe552284b5c1176ffaff632 100644 (file)
--- a/less/realisations.less
+++ b/less/realisations.less
@@ -1,31 +1,26 @@
-#realisations-tagslist {
-    width: 980px;
-    margin: 0 auto;
-    padding: 0 0 20px 0;
-}
-
-
-
 #realisations-list {
     min-width: 980px;
     max-width: 980px;
     margin: 0 auto;
     padding: 0 0 50px 0;
-       // overflow: hidden;
-
-    .bloc {
-        width:230px;
-        //float:left;
-               display:inline-block;
-    }
 
     a,a:hover {
         color:#000;
+               display:inline-block;
+               margin:0 15px 10px 0;
+               width:127px;
+               height:127px;
+               img{
+                       display: block;
+                       width:127px;
+                       height:127px;
+               }
+               &:nth-child(7n){
+                       margin-right: 0px;
+               }
     }
 
     .bloc .project-photo {
-        width:230px;
-        height:230px;
         background-color: #ccc;
         margin:0;
     }
@@ -182,35 +177,22 @@
                //position: absolute;
                //right: 0;
 
-
-
-
                .slides {
                        overflow: hidden;
                        width: 10000px;
+                       ul{
+                               position:relative;
+                               list-style-type:none;
+                               margin: 0px;
+                               padding: 0px;
+                               width:9999px;
+                               li{
+                                       padding:0px;
+                                       margin:0px;
+                                       list-style:none;
+                                       display: inline-block;
+                               }
+                       }
                }
-
-
-               .slides ul{
-                       position:relative;
-                       list-style-type:none;
-                       margin: 0px;
-                       padding: 0px;
-                       width:9999px;
-               }
-
-               .slides li{
-                       padding:0px;
-                       margin:0px;
-                       list-style:none;
-                       display: inline-block;
-               }
-
-
-
-
-    }
-
-
-
+       }
 }
\ No newline at end of file

diff --git a/less/taglist.less b/less/taglist.less
index 6c5de08180ce8986cc8df202fb01bbd70ba12500..c36a7d3273bcfe6846b74998cfd94cc17e91ef42 100644 (file)
--- a/less/taglist.less
+++ b/less/taglist.less
@@ -1,5 +1,5 @@
 ul.tags {
-       margin:0 0 20px;
+       margin:50px 0 20px;
        list-style: none;
        li {
                font-size: 14px;