From d4dd490cc0603d54691252dbfa2c9813be603308 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 18 Nov 2014 13:25:15 +0000 Subject: [PATCH] --- framework/application/Bootstrap.php | 6 +- framework/application/configs/application.ini | 5 +- framework/application/models/User.php | 2 - .../views/helpers/HomeSlideshow.php | 24 ++- images/next.png | Bin 315 -> 0 bytes images/next_over.png | Bin 408 -> 0 bytes images/prev.png | Bin 314 -> 0 bytes images/prev_over.png | Bin 399 -> 0 bytes images/slideshow/arrows.png | Bin 0 -> 1181 bytes index.php | 8 +- js/carrousel.js | 11 ++ js/common.coffee | 4 - js/common.js | 11 +- js/home.js | 168 ------------------ js/test.coffee | 28 --- js/test.js | 62 ------- less/carrousel.less | 89 ++++++++++ less/common.less | 5 + less/header.less | 68 +++---- less/home.less | 93 ---------- less/realisations.less | 9 +- less/twocols.less | 2 - 22 files changed, 164 insertions(+), 431 deletions(-) delete mode 100644 images/next.png delete mode 100644 images/next_over.png delete mode 100644 images/prev.png delete mode 100644 images/prev_over.png create mode 100644 images/slideshow/arrows.png create mode 100644 js/carrousel.js delete mode 100644 js/common.coffee delete mode 100644 js/home.js delete mode 100644 js/test.coffee delete mode 100644 js/test.js create mode 100644 less/carrousel.less diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index eff8e84..f738e2c 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -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); diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index 90baee3..e402a3e 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -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 diff --git a/framework/application/models/User.php b/framework/application/models/User.php index c3c84ac..d85377b 100644 --- a/framework/application/models/User.php +++ b/framework/application/models/User.php @@ -3,5 +3,3 @@ class Cubedesigners_Model_User extends CubeIT_Model_User { } - -?> diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php index 71250be..4f4b97f 100644 --- a/framework/application/views/helpers/HomeSlideshow.php +++ b/framework/application/views/helpers/HomeSlideshow.php @@ -1,14 +1,18 @@ headScript()->addSlideshow(); + $this->addScriptAndStyle('carrousel'); + $slides = $slides['slides']; $res = '
'; $res.='
'; $res.='
'; - $res .= '
'; + + $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 .= '
'; - $res.='
'; - $res .= ''; - $res .= ''; - $res.='
'; + + $options = array('arrows' => true, + 'arrowspermanent' => true, + 'autoMode' => true, + 'transitionType' => 'slide'); + $res.=$this->htmlElement($s, 'div', array('class' => 'slides slideshow', 'data-options' => $options)); + $res.='
'; $res.='
'; $res.=''; diff --git a/images/next.png b/images/next.png deleted file mode 100644 index c70d48e9f0dc58ebb058f3dfe7100852aaadb1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)_XBaa)BHl@^9T%E?~a+t&Z z7S<~{D1`9ZEYTj_KJ6c4{Ms2?pfx(6zNJgKLq{}H;Ywk5G*#kiZhk4Q_NkQN7~?{M zW6d!-jyYhdIQHbH;S{f=H|~^i8%yuXF&dx;T3Lb3@>%MlIoeu)QBZ6c4aI~}Q7jl8 z#ehjrwJ;f~1~yTmYG7w{QK5=IMzF4Em?yhrwfF?04C)?9ra|N=7y!G6iD8g}QHPB>Ojj<5ft{6ia5+p{)}O)8 zxSt`)dI`-ON0!5GKHJIg;Po*EDM168IgTuc{rUTYVde2enmUf`G)8O3QIsob={Smu z3tBmjD&-h097nYRmfDV^YROMc$5FjXf;sNx$7^861)EJDJawg#m@R_{uPVd;|9=_I zKUg+69Hu7e$`Aw$B_>8DhV`d&7_L9vHt-IkmZPZZFlsuAY7V2eqp0FAS~!YghtbMW z6giBRjw0J(%Hj?*brcA&kfZ6tZ1Q-BxDXCz@B$kT+0000tJyhvZI`V`0`+I z7}Xp_O@~p{QPgr6)g46*htb4Qlsb%Nj-te2G<6iY4$FZ$>KCmXMXtj(0r4XsW`jC% z&{X0eN7+K@G$5Wim|7P!cN`_TlBSNMv>cosOmUsx5v;O zH+e9%U}28C1H`-O))^teaT-AUms|rFM+a3#9X9H)QHKq2hXDi_0OvnODS37IhX4Qo M07*qoM6N<$g5ueHy#N3J diff --git a/images/prev_over.png b/images/prev_over.png deleted file mode 100644 index c04cf3144fd69703787b344f94ae5a3e3bf9119c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmV;A0dW3_P)F?04C)?9ra|N=7y!G6iD8g}QHPB>j1Vx84`*Ou<``TKbJQ+p z@HXmV@HOfgJPrdn%1SMZ;oHx*3`cKH85|BncGS`%Q4Fs>-57X>QPWXWa~QQ9MHPq9 z!ci1Ej8=}K$YHc}6xj}=wWG*#n2Az6*inD~{id0t$a2`N7rPlgeS5~h%*4uIq8vYX z>PnEK79I`;(}oIB3|@xqgQpUwhvUf3m9%yoMdcVR9Y=A=Pb8U}fi7AzZCsS=07?{;ELn2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09sGdR=~G{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SeZDRnHsrTSem&Rm>L?onmD-_S-QFz z89BNdm^&F6JHzz4&oJDP~DOksPpU*M{@6^hK)|12QO%NN^q(2PVSu4;pysmRAtejZsp>KZLgXP0u5@@U#)X$(u~K=`Wjq^nj%ot~VSef7rC1@r%kBrt6J(_4J;2^+Y?@O1TaS?83{1OPL{nIHfF literal 0 HcmV?d00001 diff --git a/index.php b/index.php index f859f1a..21eeb09 100644 --- 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 index 0000000..b070873 --- /dev/null +++ b/js/carrousel.js @@ -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 index c00a107..0000000 --- a/js/common.coffee +++ /dev/null @@ -1,4 +0,0 @@ -load_commons = -> - - -registerLoader load_commons \ No newline at end of file diff --git a/js/common.js b/js/common.js index 187f13e..19e8595 100644 --- a/js/common.js +++ b/js/common.js @@ -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 index 291ad7f..0000000 --- a/js/home.js +++ /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(""); - } - - $(image).load(function() { - currentSlide.html(""); - }); - - 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(""); - } - - $(image).load(function() { - $(slide).html(""); - }); - - 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 index e6bb9bc..0000000 --- a/js/test.coffee +++ /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 index 72751d7..0000000 --- a/js/test.js +++ /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 index 0000000..2fdabd0 --- /dev/null +++ b/less/carrousel.less @@ -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; +} diff --git a/less/common.less b/less/common.less index 78f1942..5e838c4 100644 --- a/less/common.less +++ b/less/common.less @@ -16,6 +16,11 @@ body { transition:opacity 0.25s linear; } +#wrapper{ + overflow:hidden; + max-width: 100%; +} + .wf-active body{ opacity:1; } diff --git a/less/header.less b/less/header.less index 93f44d9..fe67e8f 100644 --- a/less/header.less +++ b/less/header.less @@ -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; @@ -43,43 +45,21 @@ } } } - } + } - .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; - } - } diff --git a/less/home.less b/less/home.less index 6d834a1..99a5edf 100644 --- a/less/home.less +++ b/less/home.less @@ -12,96 +12,3 @@ 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 diff --git a/less/realisations.less b/less/realisations.less index e84aac4..d553ba1 100644 --- a/less/realisations.less +++ b/less/realisations.less @@ -213,11 +213,4 @@ -} - - -/* max-width pour faibles résolutions */ -@media screen and (max-width: 1009px) { - - -} +} \ No newline at end of file diff --git a/less/twocols.less b/less/twocols.less index 36e5be8..baf6677 100644 --- a/less/twocols.less +++ b/less/twocols.less @@ -32,6 +32,4 @@ } } } - - } \ No newline at end of file -- 2.39.5