]> _ Git - cubedesigners-v7.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 18 Nov 2014 13:25:15 +0000 (13:25 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 18 Nov 2014 13:25:15 +0000 (13:25 +0000)
22 files changed:
framework/application/Bootstrap.php
framework/application/configs/application.ini
framework/application/models/User.php
framework/application/views/helpers/HomeSlideshow.php
images/next.png [deleted file]
images/next_over.png [deleted file]
images/prev.png [deleted file]
images/prev_over.png [deleted file]
images/slideshow/arrows.png [new file with mode: 0644]
index.php
js/carrousel.js [new file with mode: 0644]
js/common.coffee [deleted file]
js/common.js
js/home.js [deleted file]
js/test.coffee [deleted file]
js/test.js [deleted file]
less/carrousel.less [new file with mode: 0644]
less/common.less
less/header.less
less/home.less
less/realisations.less
less/twocols.less

index eff8e843d1a6e08dd769d8fe548f6f5657b7b84c..f738e2ccb31e2494999863c3fa4fe8a9be2b46c1 100644 (file)
@@ -64,8 +64,9 @@ class Bootstrap extends CubeIT_Bootstrap {
                        $p->setSitemap(true);
                        $p->setEditable(false);
 
-                       if ($r->online != 1)
+                       if ($r->online != 1) {
                                $p->setOnline(false);
+                       }
 
                        $p->setDomain($page->getDomain());
                        $p->setLabel($r->titre);
@@ -98,8 +99,9 @@ class Bootstrap extends CubeIT_Bootstrap {
                        $p->setEditable(false);
                        $p->setParams(array('casestudy_id' => $r->id));
 
-                       if ($r->online != 1)
+                       if ($r->online != 1) {
                                $p->setOnline(false);
+                       }
 
                        $p->setDomain($page->getDomain());
                        $p->setLabel($r->titre);
index 90baee314951b98d0f50efbe65e7e312ffb60599..e402a3ed39960386a1a1aa141407b3d3d1b1b2d4 100644 (file)
@@ -1,7 +1,7 @@
 [production]
 dev = false
 
-minify.js = true
+minify.js = false
 minify.css = true
 
 bin.mysqldump = /usr/bin/mysqldump
@@ -55,9 +55,10 @@ acl.roles[] = admin
 mail.test = APPLICATION_PATH "/../data/email/test"
 
 [testing : production]
-
 dev = true
 
+firephp = true
+
 locales.fr = dev.cubedesigners.fr
 locales.en = cubev6.dev.cubedesigners.com
 
index c3c84ac98831d4f83cda91b4f5c1e111bc52daac..d85377bc90d3e24033a9f906d29bf6701d1ff19e 100644 (file)
@@ -3,5 +3,3 @@
 class Cubedesigners_Model_User extends CubeIT_Model_User {
 
 }
-
-?>
index 71250bebd5e3f6e2f90ee30a56136ae7b7ff15f3..4f4b97f560b2bea15e1605b5885ed49e6c8a800c 100644 (file)
@@ -1,14 +1,18 @@
 <?php
 
-class Cubedesigners_View_Helper_HomeSlideshow extends Zend_View_Helper_Abstract {
+class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstract {
 
        public function homeSlideshow($slides) {
+               $this->headScript()->addSlideshow();
+               $this->addScriptAndStyle('carrousel');
+
                $slides = $slides['slides'];
 
                $res = '<section>';
                $res.='<div id="home-slideshow">';
                $res.='<div class="slides-holder">';
-               $res .= '<div class="slides">';
+
+               $s = '';
 
                foreach ($slides as $id => $slide) {
                        if (null !== $slide['mask']) {
@@ -28,13 +32,17 @@ class Cubedesigners_View_Helper_HomeSlideshow extends Zend_View_Helper_Abstract
                        $attributes['data-time'] = $time;
                        $attributes['class'] = 'slide';
                        $attributes['style'] = 'background-image:url(' . CubeIT_View_Helper_ImageCms::getPath($slide['background']) . ');';
-                       $res.=$this->view->htmlElement($this->view->htmlElement($image, 'div', array('class' => 'imgholder', 'style' => 'top:-' . $offset . 'px;')), 'div', $attributes);
+                       $imgHolder = $this->view->htmlElement($image, 'div', array('class' => 'imgholder'));
+                       $mask = $this->htmlElement($imgHolder, 'div', array('class' => 'masque', 'style' => 'top:-' . $offset . 'px;height:' . (572 + $offset) . 'px;'));
+                       $s.=$this->view->htmlElement($mask, 'div', $attributes);
                }
-               $res .= '</div>';
-               $res.='<div class="controls">';
-               $res .= '<a href="#" class="next"></a>';
-               $res .= '<a href="#" class="prev"></a>';
-               $res.='</div>';
+
+               $options = array('arrows' => true,
+                       'arrowspermanent' => true,
+                       'autoMode' => true,
+                       'transitionType' => 'slide');
+               $res.=$this->htmlElement($s, 'div', array('class' => 'slides slideshow', 'data-options' => $options));
+
                $res.='</div>';
                $res.='</div>';
                $res.='</div>';
diff --git a/images/next.png b/images/next.png
deleted file mode 100644 (file)
index c70d48e..0000000
Binary files a/images/next.png and /dev/null differ
diff --git a/images/next_over.png b/images/next_over.png
deleted file mode 100644 (file)
index 33e3cd8..0000000
Binary files a/images/next_over.png and /dev/null differ
diff --git a/images/prev.png b/images/prev.png
deleted file mode 100644 (file)
index 9414ceb..0000000
Binary files a/images/prev.png and /dev/null differ
diff --git a/images/prev_over.png b/images/prev_over.png
deleted file mode 100644 (file)
index c04cf31..0000000
Binary files a/images/prev_over.png and /dev/null differ
diff --git a/images/slideshow/arrows.png b/images/slideshow/arrows.png
new file mode 100644 (file)
index 0000000..451c46c
Binary files /dev/null and b/images/slideshow/arrows.png differ
index f859f1a4b9f5969b794a8af5174134e631d12d18..21eeb09a7a14037484fabd12ac6e47abb0db5481 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,10 +4,10 @@ $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
 
-if ($_SERVER['HTTP_HOST'] == 'cubev6.dev.cubedesigners.com') {
-    define('APPLICATION_ENV', 'testing');
-} else if ($_SERVER['HTTP_HOST'] == 'www.') {
-    define('APPLICATION_ENV', 'production');
+if ($_SERVER['HTTP_HOST'] == 'cubev6.dev.cubedesigners.com' || $_SERVER['HTTP_HOST'] == 'dev.cubedesigners.fr') {
+       define('APPLICATION_ENV', 'testing');
+} else if ($_SERVER['HTTP_HOST'] == 'www.cubedesigners.com' || $_SERVER['HTTP_HOST'] == 'www.cubedesigners.fr') {
+       define('APPLICATION_ENV', 'production');
 }
 
 include dirname(__FILE__) . '/CubeIT/common.php';
diff --git a/js/carrousel.js b/js/carrousel.js
new file mode 100644 (file)
index 0000000..b070873
--- /dev/null
@@ -0,0 +1,11 @@
+registerLoader(loadCarrousel);
+
+function loadCarrousel() {
+       $(window).on('cubeitresize', function () {
+               var ww = $(window).width();
+               var m = (ww - 1600) / 2;
+               $(".slideshow .imgholder").css({marginLeft: m});
+               $(".slideshow .arrows").css({left: 960 + ((ww - 960) / 2) - 77 - 10});
+       });
+}
+
diff --git a/js/common.coffee b/js/common.coffee
deleted file mode 100644 (file)
index c00a107..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-load_commons = ->
-       
-
-registerLoader load_commons
\ No newline at end of file
index 187f13ed245c8edb686f039ff5a9ec28fb5978cc..19e8595c8ef5060aee66919d1526aea368b0ebf6 100644 (file)
@@ -1,6 +1,9 @@
-// Generated by CoffeeScript 1.8.0
-var load_commons;
+registerLoader(load_commons);
 
-load_commons = function() {};
+function load_commons() {
 
-registerLoader(load_commons);
+}
+
+function resize() {
+
+}
\ No newline at end of file
diff --git a/js/home.js b/js/home.js
deleted file mode 100644 (file)
index 291ad7f..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-TO_LOAD_ONCE[TO_LOAD_ONCE.length] = 'load_home();';
-
-var nbSlides;
-var currentSlide;
-var currentSlideId;
-var isAnim = false;
-var animDuration = 500;
-var autoSlide = true;
-var switchTimer;
-var time;
-
-function load_home() {
-       slideShow();
-       preloadSlides();
-}
-
-function slideShow() {
-       nbSlides = $('.slide').length;
-
-       currentSlideId = 0;
-
-       currentSlide = $('.slide:first');
-
-       if (currentSlide.length > 0) {
-
-               var image = new Image();
-               image.src = currentSlide.attr('data-image');
-
-               if (image.complete) {
-                       currentSlide.html("<a href='" + $(currentSlide).attr('data-link') + "'><img src='" + currentSlide.attr('data-image') + "' /></a>");
-               }
-
-               $(image).load(function() {
-                       currentSlide.html("<a href='" + $(currentSlide).attr('data-link') + "'><img src='" + currentSlide.attr('data-image') + "' /></a>");
-               });
-
-               var legend = currentSlide.attr('data-legend');
-               $('#slide-legend').html(legend);
-
-               $('.slide:first').fadeIn();
-
-               if (autoSlide) {
-                       time = currentSlide.attr('data-time');
-                       switchTimer = window.setTimeout(nextSlide, time);
-               }
-
-       }
-
-       initLinks();
-       //checkPages();
-
-
-
-}
-
-function nextSlide() {
-
-       if (autoSlide) {
-               if (currentSlideId < nbSlides - 1 && !isAnim)
-               {
-                       currentSlideId++;
-               } else {
-                       currentSlideId = 0;
-               }
-               animSlide();
-       }
-
-}
-
-function preloadSlides() {
-
-       var i = 0;
-
-       $('.slide[data-image]').each(function() {
-               var slide = this;
-               var image = new Image();
-               image.src = $(this).attr('data-image');
-
-               if (image.complete) {
-                       $(this).html("<a href='" + $(this).attr('data-link') + "'><img src='" + $(this).attr('data-image') + "' /></a>");
-               }
-
-               $(image).load(function() {
-                       $(slide).html("<a href='" + $(slide).attr('data-link') + "'><img src='" + $(slide).attr('data-image') + "' /></a>");
-               });
-
-               i++;
-       });
-}
-
-function initLinks() {
-
-       $('.next').click(function() {
-
-               autoSlide = false;
-
-               if (currentSlideId < nbSlides - 1 && !isAnim)
-               {
-                       currentSlideId++;
-               } else {
-                       currentSlideId = 0;
-               }
-
-               animSlide();
-
-               return false;
-       });
-
-       $('.prev').click(function() {
-
-               autoSlide = false;
-
-               if (currentSlideId > 0 && !isAnim)
-               {
-                       currentSlideId--;
-               } else {
-                       currentSlideId = nbSlides - 1;
-               }
-
-               animSlide();
-
-               return false;
-       });
-
-}
-
-function animSlide() {
-       isAnim = true;
-       $('#slide-legend').fadeOut();
-
-       $(currentSlide).fadeOut(animDuration, function() {
-
-               currentSlide = $('#slide-' + currentSlideId);
-
-               var legende = currentSlide.attr('data-legend');
-
-               $('#slide-legend').html(legende);
-
-               $('#slide-' + currentSlideId).fadeIn();
-
-               $('#slide-legend').fadeIn();
-
-               isAnim = false;
-
-               if (autoSlide) {
-                       time = $('#slide-' + currentSlideId).attr('data-time');
-                       fb(time);
-                       switchTimer = window.setTimeout(nextSlide, time);
-               }
-
-
-       });
-}
-
-function checkPages() {
-       if (currentSlideId >= nbSlides - 1) {
-               $('.next').css("visibility", "hidden");
-       }
-       if (currentSlideId == 0) {
-               if (nbSlides - 1 > 0) {
-                       $('.next').css("visibility", "visible");
-               }
-               $('.prev').css("visibility", "hidden");
-       } else {
-               $('.prev').css("visibility", "visible");
-       }
-
-}
\ No newline at end of file
diff --git a/js/test.coffee b/js/test.coffee
deleted file mode 100644 (file)
index e6bb9bc..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-$ ->
-       yearsOld = max: 10, ida: 9, tim: 11
-
-       ages = for child, age of yearsOld
-               "#{child} is #{age}"
-
-       range = (x)=>x+parseFloat "5.5"
-
-       interval = setInterval =>
-               parseFloat 5.5
-               , 1000
-
-
-class Animal
-       constructor: ()->
-               @papates=2
-
-class Nutria extends Animal
-       constructor:()->
-               @papates=4
-       $(".pate").click ()=>
-               fb @papates
-
-
-((w,d) ->
-       $ ->
-               parseFloat '5.5'
-)(window,document)
\ No newline at end of file
diff --git a/js/test.js b/js/test.js
deleted file mode 100644 (file)
index 72751d7..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by CoffeeScript 1.8.0
-var Animal, Nutria,
-  __hasProp = {}.hasOwnProperty,
-  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-$(function() {
-  var age, ages, child, interval, range, yearsOld;
-  yearsOld = {
-    max: 10,
-    ida: 9,
-    tim: 11
-  };
-  ages = (function() {
-    var _results;
-    _results = [];
-    for (child in yearsOld) {
-      age = yearsOld[child];
-      _results.push("" + child + " is " + age);
-    }
-    return _results;
-  })();
-  range = (function(_this) {
-    return function(x) {
-      return x + parseFloat("5.5");
-    };
-  })(this);
-  return interval = setInterval((function(_this) {
-    return function() {
-      return parseFloat(5.5, 1000);
-    };
-  })(this));
-});
-
-Animal = (function() {
-  function Animal() {
-    this.papates = 2;
-  }
-
-  return Animal;
-
-})();
-
-Nutria = (function(_super) {
-  __extends(Nutria, _super);
-
-  function Nutria() {
-    this.papates = 4;
-  }
-
-  $(".pate").click(function() {
-    return fb(Nutria.papates);
-  });
-
-  return Nutria;
-
-})(Animal);
-
-(function(w, d) {
-  return $(function() {
-    return parseFloat('5.5');
-  });
-})(window, document);
diff --git a/less/carrousel.less b/less/carrousel.less
new file mode 100644 (file)
index 0000000..2fdabd0
--- /dev/null
@@ -0,0 +1,89 @@
+
+/* Home Slideshow */
+#home-slideshow {
+       height:572px;
+       overflow:visible;
+    .slides-holder {
+               height:572px;
+               overflow:visible;
+
+               .slides {
+                       height:572px;
+                       position:relative;
+                       width:100%;
+                       overflow:visible;
+
+                       .slide {
+                               position:absolute;
+                               display:none;
+                               background-repeat: repeat-x;
+                               background-position: 0 100%;
+                               width:100%;
+                               height:572px;
+                               overflow:visible;
+                               .masque{
+                                       width:100%;
+                                       position: relative;
+                                       overflow:hidden;
+                                       .imgholder{
+                                               width:1600px;
+                                               height:572px;
+                                               position: relative;
+                                               margin:0 auto;
+                                               overflow:visible;
+
+                                               img,canvas{
+
+                                               }
+                                       }
+                               }
+                       }
+                       a {
+                               margin:0;
+                               padding: 0;
+                       }
+
+
+                       .arrows{
+                               position:absolute;
+                               bottom:48px;
+                               display:block;
+                               width:77px;
+                               height:38px;
+                               white-space:nowrap;
+                               z-index:3;
+                               a {
+                                       background-color: transparent;
+                                       width: 37px;
+                                       height: 38px;
+                                       top:auto !important;
+                                       display:inline-block;
+                                       position:static;
+                                       border-radius:3px;
+
+                                       //padding: 0 0 25px;
+                                       &:hover {
+                                               background-color: #3885e0;
+                                       }
+
+                                       &.prev {
+                                               background-image: url('../images/slideshow/arrows.png');
+                                               background-position: 10px 8px;
+                                               margin-right: 10px;
+                                       }
+
+                                       &.next {
+                                               background-image: url('../images/slideshow/arrows.png');
+                                               background-position: -26px 8px;
+                                       }
+                               }
+                       }
+               }
+       }
+}
+#slide-legend {
+       padding: 25px 0 0 0;
+       margin-right: 30px;
+       font-size: 18px;
+       float:right;
+}
index 78f1942be370f0e9d610ca823336850bffe794cf..5e838c420370777651d1022d5a76bccb0d8c8c20 100644 (file)
@@ -16,6 +16,11 @@ body {
        transition:opacity 0.25s linear;
 }
 
+#wrapper{
+       overflow:hidden;
+       max-width: 100%;
+}
+
 .wf-active body{
        opacity:1;
 }
index 93f44d90873817b8e92e23bfecd92188e099d062..fe67e8fa7e7f3cc830c24dbf0c72d0205c4c9f9f 100644 (file)
@@ -6,27 +6,29 @@
                font-size:15px;
                color:#3885e0;
                list-style: none;
-    }
 
-    ul a{
-               //text-decoration: none;
-               color:#282828;
+               li{
+                       float:left;
 
-               padding: 10px;
-    }
+                       a{
+                               color:#282828;
+                               padding: 10px;
 
-    ul a:hover, ul .active a{
-               border-radius: 2px;
-               background-color: #84ae1e;
-               color:#fff;
-    }
+                               &:hover{
+                                       border-radius: 2px;
+                                       background-color: #84ae1e;
+                                       color:#fff !important;
+                               }
+                       }
+
+                       &.active a{
+                               color:#3885e0;
+                       }
+               }
 
-    ul li{
-               float:left;
     }
 
-    .logo {
-               //background: url('../images/logo.svg') no-repeat;
+       .logo {
                width:318px;
                height:132px;
                position:absolute;
                                }
                        }
                }
-    }
+       }
 
-    .sublogo {
-        display:none;
-    }
+       .sublogo {
+               display:none;
+       }
 
-    .navigation{
+       .navigation{
                margin: 50px 0;
                float:right;
-    }
+       }
 
-    .navigation li{
+       .navigation li{
                margin:0 20px 0 0;
                &:last-child{
                        margin-right: 0;
                }
-    }
-}
-
-
-
-
-/* max-width pour faibles rĂ©solutions */
-@media screen and (max-width: 1009px) {
-
-    #header {
-               margin: 0 auto;
-               max-width: 1024px;
-               width:100%;
-               height:97px;
        }
-
-    #header .logo {
-               //background: url('../images/logo-mobile.png') no-repeat;
-               width:212px;
-               height:97px;
-               float:left;
-    }
-
 }
index 6d834a1a92fceb00526695fb1caa5cea52b69380..99a5edf1d5a1086d22ab72ae5a5777ba10f45871 100644 (file)
                font-size: 32px;
        }
 }
-
-
-/* Home Slideshow */
-#home-slideshow {
-       height:572px;
-       overflow:visible;
-    .slides-holder {
-               height:572px;
-               overflow:visible;
-
-               .slides {
-                       height:572px;
-                       position:relative;
-                       width:100%;
-                       overflow:visible;
-
-                       .slide {
-                               position:absolute;
-                               display:none;
-                               background-repeat: repeat-x;
-                               background-position: 0 100%;
-                               width:100%;
-                               height:572px;
-                               overflow:visible;
-                               .imgholder{
-                                       width:1600px;
-                                       height:572px;
-                                       position: relative;
-                                       margin:0 auto;
-                                       overflow:visible;
-
-                                       img,canvas{
-
-                                       }
-                               }
-                       }
-                       a {
-                               margin:0;
-                               padding: 0;
-                       }
-               }
-
-               .controls{
-                       position:absolute;
-                       right:10px;
-                       bottom:10px;
-                       a {
-                               margin: 20px 0 0 0;
-                               width: 37px;
-                               height: 38px;
-                               float: right;
-
-                               //padding: 0 0 25px;
-                               &:hover {
-                                       // background-color: #84ae1e;
-                               }
-
-                               &.prev {
-                                       background: url('../images/prev.png') no-repeat;
-                                       background-position: center top;
-                                       margin-right: 10px;
-                                       &:hover {
-                                               background: url('../images/prev_over.png') no-repeat;
-                                       }
-                               }
-
-                               &.next {
-                                       background: url('../images/next.png') no-repeat;
-                                       background-position: center top;
-                                       :hover {
-                                               background: url('../images/next_over.png') no-repeat;
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
-
-
-#slide-legend {
-       padding: 25px 0 0 0;
-       margin-right: 30px;
-       font-size: 18px;
-       float:right;
-}
-
-
-/* max-width pour faibles rĂ©solutions */
-@media screen and (max-width: 1009px) {
-
-
-}
\ No newline at end of file
index e84aac4a27ad756ad7f00a43ed05dd4705609cca..d553ba185c1a3c2d114a889e42134c5223512a44 100644 (file)
 
 
 
-}
-
-
-/* max-width pour faibles rĂ©solutions */
-@media screen and (max-width: 1009px) {
-
-
-}
+}
\ No newline at end of file
index 36e5be85fa174544379797494b7ea3d934d50769..baf66775d9b366e68541bf05e55ea280e89cbd1f 100644 (file)
@@ -32,6 +32,4 @@
                        }
                }
        }
-
-
 }
\ No newline at end of file