From 570d31ea3b72b843bb8c364673d3d8f9bac9a06a Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Fri, 6 Mar 2015 19:52:51 +0100 Subject: [PATCH] refactoring finished AND lines developed --- .gitignore | 1 + .../jee.scssc | Bin 109951 -> 115513 bytes .../misc.scssc | Bin 10760 -> 10763 bytes sites/all/themes/gui/jee/css/jee.css | 117 ++++-- sites/all/themes/gui/jee/css/jee.scss | 56 ++- sites/all/themes/gui/jee/css/misc.scss | 2 +- sites/all/themes/gui/jee/js/jee.js | 396 +++++++++++------- .../all/themes/gui/jee/templates/html.tpl.php | 6 +- 8 files changed, 356 insertions(+), 222 deletions(-) diff --git a/.gitignore b/.gitignore index 832e742..c7ac499 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ sites/*/files sites/*/private *.sublime* +.sass-cache diff --git a/sites/all/themes/gui/jee/.sass-cache/06dcbe1fa5b03937e94c01bbbc1f20c6e165e878/jee.scssc b/sites/all/themes/gui/jee/.sass-cache/06dcbe1fa5b03937e94c01bbbc1f20c6e165e878/jee.scssc index 5d14eb097e263179c157f261caf7a9c6377016c7..9ca2d7c0d824a32457788bdbbc7cbfb070c73a69 100644 GIT binary patch delta 17266 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 HxXuUw@F^>F delta 164 zcmeAU=?Ix1sgaasnrM(}X= .field-type-text { opacity: 0; - -webkit-transition: 1s ease-out; - transition: 1s ease-out; + -webkit-transition: 1s ease-out 1s; + transition: 1s ease-out 1s; -webkit-transition-property: opacity; transition-property: opacity; } @@ -4100,7 +4100,7 @@ div.messages { clear: both; padding-top: 1em; } -/* line 250, jee.scss */ +/* line 252, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-vignette { position: relative; float: left; @@ -4113,39 +4113,39 @@ div.messages { background-repeat: no-repeat; background-origin: center center; } -/* line 264, jee.scss */ +/* line 265, jee.scss */ #main .node-chapitre.node-teaser .field-type-text { min-width: 14em; } -/* line 268, jee.scss */ +/* line 266, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-titre { font-family: "epflul"; font-size: 1.6em; line-height: 1.1; } -/* line 274, jee.scss */ +/* line 271, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-sous-titre { font-family: "epflul"; font-size: 1.4em; line-height: 1.2; } -/* line 280, jee.scss */ +/* line 276, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-description { font-size: 0.88em; line-height: 1.2; } -/* line 286, jee.scss */ +/* line 282, jee.scss */ #main .node-chapitre.node-teaser ul.links { margin: 0; text-align: right; z-index: 5; position: relative; } -/* line 288, jee.scss */ +/* line 284, jee.scss */ #main .node-chapitre.node-teaser ul.links li.node-readmore { padding: 0; } -/* line 290, jee.scss */ +/* line 286, jee.scss */ #main .node-chapitre.node-teaser ul.links li.node-readmore a { display: inline-block; height: 25px; @@ -4156,70 +4156,99 @@ div.messages { text-align: left; background: transparent url(../assets/img/readmore-btn.svg) no-repeat right center; } -/* line 308, jee.scss */ +/* line 298, jee.scss */ +#main .node-chapitre.node-teaser .line { + z-index: -1; + position: absolute; + top: 3em; + left: 6em; + -webkit-transform-origin: top left; + -ms-transform-origin: top left; + transform-origin: top left; + width: 2px; + background-color: red; + opacity: 0.4; +} +/* line 316, jee.scss */ #main #node-2::after { background-image: url(../assets/img/bgd-sol.svg); } -/* line 311, jee.scss */ +/* line 319, jee.scss */ #main #node-2, #main #node-2 a { color: #b24c14; } -/* line 312, jee.scss */ +/* line 320, jee.scss */ #main #node-2 h2.node-title, #main #node-2 h2.node-title a { color: #d85509; } -/* line 313, jee.scss */ +/* line 321, jee.scss */ #main #node-2 .field-name-field-vignette { background-image: url(../assets/img/shadow-sol.svg); } -/* line 323, jee.scss */ +/* line 325, jee.scss */ +#main #node-2 .line { + background-color: #ea5b0c; +} +/* line 329, jee.scss */ #main #node-3::after { background-image: url(../assets/img/bgd-dph.svg); } -/* line 326, jee.scss */ +/* line 332, jee.scss */ #main #node-3, #main #node-3 a { color: #686b00; } -/* line 327, jee.scss */ +/* line 333, jee.scss */ #main #node-3 h2.node-title, #main #node-3 h2.node-title a { color: #afaf00; } -/* line 328, jee.scss */ +/* line 334, jee.scss */ #main #node-3 .field-name-field-vignette { background-image: url(../assets/img/shadow-dph.svg); } /* line 338, jee.scss */ +#main #node-3 .line { + background-color: #cecd00; +} +/* line 342, jee.scss */ #main #node-4::after { background-image: url(../assets/img/bgd-sub.svg); } -/* line 341, jee.scss */ +/* line 345, jee.scss */ #main #node-4, #main #node-4 a { color: #b71330; } -/* line 342, jee.scss */ +/* line 346, jee.scss */ #main #node-4 h2.node-title, #main #node-4 h2.node-title a { color: #cd0734; } -/* line 343, jee.scss */ +/* line 347, jee.scss */ #main #node-4 .field-name-field-vignette { background-image: url(../assets/img/shadow-sub.svg); } -/* line 353, jee.scss */ +/* line 351, jee.scss */ +#main #node-4 .line { + background-color: #de003a; +} +/* line 355, jee.scss */ #main #node-5::after { background-image: url(../assets/img/bgd-bc.svg); } -/* line 356, jee.scss */ +/* line 358, jee.scss */ #main #node-5, #main #node-5 a { color: #033d6f; } -/* line 357, jee.scss */ +/* line 359, jee.scss */ #main #node-5 h2.node-title, #main #node-5 h2.node-title a { color: #024b87; } -/* line 358, jee.scss */ +/* line 360, jee.scss */ #main #node-5 .field-name-field-vignette { background-image: url(../assets/img/shadow-bc.svg); } +/* line 364, jee.scss */ +#main #node-5 .line { + background-color: #0066b1; +} /* line 368, jee.scss */ #main #node-6::after { background-image: url(../assets/img/bgd-opp.svg); @@ -4236,39 +4265,51 @@ div.messages { #main #node-6 .field-name-field-vignette { background-image: url(../assets/img/shadow-opp.svg); } -/* line 383, jee.scss */ +/* line 377, jee.scss */ +#main #node-6 .line { + background-color: #af1380; +} +/* line 381, jee.scss */ #main #node-7::after { background-image: url(../assets/img/bgd-dub.svg); } -/* line 386, jee.scss */ +/* line 384, jee.scss */ #main #node-7, #main #node-7 a { color: #22742c; } -/* line 387, jee.scss */ +/* line 385, jee.scss */ #main #node-7 h2.node-title, #main #node-7 h2.node-title a { color: #288d80; } -/* line 388, jee.scss */ +/* line 386, jee.scss */ #main #node-7 .field-name-field-vignette { background-image: url(../assets/img/shadow-dub.svg); } -/* line 398, jee.scss */ +/* line 390, jee.scss */ +#main #node-7 .line { + background-color: #62a530; +} +/* line 394, jee.scss */ #main #node-8::after { background-image: url(../assets/img/bgd-juso.svg); } -/* line 401, jee.scss */ +/* line 397, jee.scss */ #main #node-8, #main #node-8 a { color: #0b7f8a; } -/* line 402, jee.scss */ +/* line 398, jee.scss */ #main #node-8 h2.node-title, #main #node-8 h2.node-title a { color: #009aa8; } -/* line 403, jee.scss */ +/* line 399, jee.scss */ #main #node-8 .field-name-field-vignette { background-image: url(../assets/img/shadow-juso.svg); } -/* line 412, jee.scss */ +/* line 403, jee.scss */ +#main #node-8 .line { + background-color: #33b4b5; +} +/* line 406, jee.scss */ #main .chapter-wrapper { position: absolute; top: 0; @@ -4277,13 +4318,13 @@ div.messages { right: 0; } -/* line 419, jee.scss */ +/* line 413, jee.scss */ #footer { position: fixed; bottom: 0; right: 0; } -/* line 422, jee.scss */ +/* line 416, jee.scss */ #footer .block { display: inline-block; vertical-align: top; diff --git a/sites/all/themes/gui/jee/css/jee.scss b/sites/all/themes/gui/jee/css/jee.scss index bcbcf87..533f092 100755 --- a/sites/all/themes/gui/jee/css/jee.scss +++ b/sites/all/themes/gui/jee/css/jee.scss @@ -167,7 +167,7 @@ div.messages{ opacity:0; position:absolute; transition:1s ease-out 1s; - transition-property: transform opacity; + transition-property: opacity transform; // just let see the field vignette of first partie &:nth-child(3){ z-index:2; @@ -175,7 +175,7 @@ div.messages{ transition-delay:0; >.field-type-text{ opacity:0; - transition:1s ease-out; + transition:1s ease-out 1s; transition-property: opacity; } >.field-name-field-vignette{cursor:pointer;z-index:2;} @@ -204,7 +204,7 @@ div.messages{ .field-name-field-partie{ opacity:1; z-index:0; // display all fields inside each parties - >.field{opacity:1;z-index:-1; cursor:default;} + >.field{opacity:1; z-index:-1; cursor:default;} } } @@ -247,6 +247,8 @@ div.messages{ .field-name-field-partie{clear:both; padding-top:1em;} + + $shadow-size:3.5em; .field-name-field-vignette{ position:relative; float:left; @@ -260,23 +262,17 @@ div.messages{ background-repeat: no-repeat; background-origin: center center; } - - .field-type-text{ - min-width:14em; - } - + .field-type-text{ min-width:14em; } .field-name-field-titre{ font-family: "epflul"; font-size:1.6em; line-height:1.1; } - .field-name-field-sous-titre{ font-family: "epflul"; font-size:1.4em; line-height:1.2; } - .field-name-field-description{ // font-family: "epf-lul"; font-size:0.88em; @@ -298,6 +294,18 @@ div.messages{ } } } + + .line{ + z-index:-1; + position:absolute; + top:$shadow-size - 0.5em; left:$shadow-size+2.5em; + transform-origin:top left; + width:2px; background-color:red; + opacity:0.4; + // transition: 3s ease-out; + // transition-property:height; + } + } // node-chapitre // COLORS BY NODE - - - - - - - - - - - - - - - - - - - - - @@ -314,9 +322,7 @@ div.messages{ // background-image:url(../assets/img/shadow-sol.svg); background-image:url(../assets/img/shadow-sol.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $SOL-color; - // } + .line{background-color:$SOL-col-active;} } //DPH #node-3{ @@ -329,9 +335,7 @@ div.messages{ // background-image:url(../assets/img/shadow-dph.png); background-image:url(../assets/img/shadow-dph.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $DPH-color; - // } + .line{background-color:$DPH-col-active;} } // SUB #node-4{ @@ -344,9 +348,7 @@ div.messages{ // background-image:url(../assets/img/shadow-sub.png); background-image:url(../assets/img/shadow-sub.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $SUB-color; - // } + .line{background-color:$SUB-col-active;} } // BC #node-5{ @@ -359,9 +361,7 @@ div.messages{ // background-image:url(../assets/img/shadow-bc.png); background-image:url(../assets/img/shadow-bc.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $BC-color; - // } + .line{background-color:$BC-col-active;} } //OPP #node-6{ @@ -374,9 +374,7 @@ div.messages{ // background-image:url(../assets/img/shadow-opp.png); background-image:url(../assets/img/shadow-opp.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $OPP-color; - // } + .line{background-color:$OPP-col-active;} } //DUB #node-7{ @@ -389,9 +387,7 @@ div.messages{ // background-image:url(../assets/img/shadow-dub.png); background-image:url(../assets/img/shadow-dub.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $DUB-color; - // } + .line{background-color:$DUB-col-active;} } // JUSO #node-8{ @@ -404,9 +400,7 @@ div.messages{ // background-image:url(../assets/img/shadow-juso.png); background-image:url(../assets/img/shadow-juso.svg); } - // .field-name-field-vignette::before{ - // box-shadow: 0 0 $bs-blur $bs-size $JUSO-color; - // } + .line{background-color:$JUSO-col-active;} } .chapter-wrapper{ diff --git a/sites/all/themes/gui/jee/css/misc.scss b/sites/all/themes/gui/jee/css/misc.scss index ea161f0..1c0a538 100644 --- a/sites/all/themes/gui/jee/css/misc.scss +++ b/sites/all/themes/gui/jee/css/misc.scss @@ -8,7 +8,7 @@ $BC-col-active:rgb(0,102,177); $BC-col-txt:rgb(3,61,111); $SUB-color:rgb(205,7,52); -$SUB-col-active:rgb(22,0,58); +$SUB-col-active:rgb(222,0,58); $SUB-col-txt:rgb(183,19,48); $SOL-color:rgb(216,85,9); diff --git a/sites/all/themes/gui/jee/js/jee.js b/sites/all/themes/gui/jee/js/jee.js index 448694a..9bf7261 100755 --- a/sites/all/themes/gui/jee/js/jee.js +++ b/sites/all/themes/gui/jee/js/jee.js @@ -1,27 +1,7 @@ - -Drupal.behaviors.init_theme = function (context) { - // Growl-style system messages - $('#messages-and-help > div.messages:not(.processed)') - .addClass('processed') - .each(function() { - // If a message meets these criteria, we don't autoclose - // - contains a link - // - is an error or warning - // - contains a lenghthy amount of text - if ($('a', this).size() || $(this).is('.error') || $(this).is('.warning') || $(this).text().length > 100) { - $(this).prepend("X"); - $('span.close', this).click(function() { - $(this).parent().slideUp('fast'); - }); - } - else { - // This essentially adds a 3 second pause before hiding the message. - $(this).animate({opacity:1}, 5000, 'linear', function() { - $(this).slideUp('fast'); - }); - } - }); -}; +// +// by Bachir Soussi Chiadmi +// 2015 +// jQuery(document).ready(function($) { console.log('Hello Jee'); @@ -37,7 +17,10 @@ jQuery(document).ready(function($) { }, _center = {x:_container.w/2,y:_container.h/2}, _nav_pos = {x:0, y:0}, - _nav_timer; + _nav_timer, + _last_client = {x:0,y:0}, + _fps = 1000/12, + _dragging = false; function init(){ initChapters(); @@ -46,187 +29,141 @@ jQuery(document).ready(function($) { function initChapters(){ // Place each chapters on the ellipse contained on the screen - var angle, a = Math.random() *360; + var base_a = Math.random() *360; _$chapitres.each(function(i, e) { - // distribute elements arround the center - angle = (360/_chapitres_len*i+a)*Math.PI/180; - // Lets create the chapter object and place him self - _chapters.push(new Chapter($(e), angle)); + _chapters.push(new Chapter(i, $(e), base_a)); }); }; function launchNav(){ - var last_clientX, - last_clientY, - td; - $(document) + _$container // DESKTOP EVENTS .bind('mousedown', function(e){ - last_clientX = e.clientX; - last_clientY = e.clientY; + if(_dragging) return false; + _dragging = true; + + console.log('mousedown'); + _last_client.x=e.clientX; + _last_client.y=e.clientY; _$chapitres.each(function(i, e) { - td = randB(0.1, 0.3);//Math.random() * (0.3 - 0.1) + 0.1; - $(e).css({"transitionDuration":td+"s"}); + $(e).css({"transitionDuration":randB(0.1, 0.3)+"s"}); }); - _nav_timer = setInterval(moveNav, 1000/24); + _nav_timer = setInterval(moveNav, _fps); $(this).bind('mousemove', function(e){ - _nav_pos.x += e.clientX - last_clientX; - _nav_pos.y += e.clientY - last_clientY; - last_clientX = e.clientX; - last_clientY = e.clientY; + console.log('mousemove'); + _nav_pos.x += e.clientX - _last_client.x; + _nav_pos.y += e.clientY - _last_client.y; + _last_client.x = e.clientX; + _last_client.y = e.clientY; + // moveNav(); }); }) .bind('mouseup', function(e){ - clearInterval(_nav_timer); + console.log('mouseup'); + _dragging = false; + // clearInterval(_nav_timer); $(this).unbind('mousemove'); }) // // TOUCH EVENTS - - - - - - - - - - - - - - // .bind('touchstart', function(e){ - // console.log('touchstart', e); - last_clientX = e.originalEvent.touches[0].clientX; - last_clientY = e.originalEvent.touches[0].clientY; + if(_dragging) return false; + _dragging = true; + console.log('touchstart'); - _$chapitres.each(function(i, e) { - td = randB(0.1, 0.3); //Math.random() * (0.3 - 0.1) + 0.1; - $(e).css({"transitionDuration":td+"s"}); - }); + _last_client.x = e.originalEvent.touches[0].clientX; + _last_client.y = e.originalEvent.touches[0].clientY; - _nav_timer = setInterval(moveNav, 1000/12); + _$chapitres.each(function(i, e) { + $(e).css({"transitionDuration":randB(0.1, 0.3)+"s"}); + }); + + _nav_timer = setInterval(moveNav, _fps); }) .bind('touchmove', function(e){ - // console.log('touchmove', e); - _nav_pos.x += e.originalEvent.touches[0].clientX - last_clientX; - _nav_pos.y += e.originalEvent.touches[0].clientY - last_clientY; - last_clientX = e.originalEvent.touches[0].clientX; - last_clientY = e.originalEvent.touches[0].clientY; + console.log('touchmove'); + _nav_pos.x += e.originalEvent.touches[0].clientX - _last_client.x; + _nav_pos.y += e.originalEvent.touches[0].clientY - _last_client.y; + _last_client.x = e.originalEvent.touches[0].clientX; + _last_client.y = e.originalEvent.touches[0].clientY; + // moveNav(); }) .bind('touchend', function(e){ - // console.log("touchend", e); - clearInterval(_nav_timer); + console.log("touchend"); + _dragging = false; + // clearInterval(_nav_timer); }); // click to preview chapter - $('h2.node-title, .field-name-field-partie:first>.field-name-field-vignette', _$chapitres).bind('click', previewChapter); + // $('h2.node-title, .field-name-field-partie:first>.field-name-field-vignette', _$chapitres).bind('click', previewChapter); - $('.links a', _$chapitres).on('click', openChapter); + // $('.links a', _$chapitres).on('click', openChapter); }; function moveNav(){ // console.log("moveNav"); - _$chapitres.each(function(i, e){ - $(e).stop(true, false).css({ - translate:[_nav_pos.x, _nav_pos.y] - }); - // $(e).transition({translate:[_nav_pos.x, _nav_pos.y]}, 200, 'out'); - }); + // move chapters + for (var i = _chapitres_len - 1; i >= 0; i--) { + _chapters[i].move(); + }; + + // move header _$header.stop(true, false).css({ translate:[_nav_pos.x*0.2, _nav_pos.y*0.2] - // WebkitTransform:'translate('+_nav_pos.x*0.2+', '+_nav_pos.y*0.2+')' }); }; - var $chapt, $parties, px, py; - function previewChapter(e){ - e.preventDefault(); - // console.log('hello', this); - - $chapt = $(this).parents('.node-chapitre'); - - closePreview($chapt); - - $parties = $('.field-name-field-partie', $chapt); - $parties.each(function(i, e) { - switch(i){ - case 0: - px=randB(-40, 40); py=randB(40, 60); - break; - case 1: - px=randB(100, 200); py=randB(120,220); - break; - case 2: - px=randB(-200, -100); py=randB(250,320); - break; - case 3: - px=randB(-100, 100); py=randB(320,350)+100; - break; - } - setTimeout( - (function($chapt, $part, px, py){ - $part - .css({ - translate:[px, py], - // opacity:1 - }); - - // console.log('part', $part); - // console.log('part left', $part.height()); - - })($chapt, $(e), px, py),10); - }); // each $parties - - $chapt.addClass('previewed'); - return false; - }; // previewChapter - - function closePreview($active){ - _$chapitres - .filter('.previewed').not($active) - .removeClass('previewed') - .find('.field-name-field-partie') - .css({transform:"none"}); - }; // closePreview - - var nid; - function openChapter(e){ - e.preventDefault(); - nid = $(this).attr("href").match(/^\/node\/(\d+)/); - console.log(nid); - $.getJSON( - '/jee/chapter/'+nid[1], - {}, - displayChapter - ); - - return false; - }; // openChapter - - var $chapterwrapper; - function displayChapter(json, textStatus) { - $chapterwrapper = $('
').addClass('chapter-wrapper').append(json.node).appendTo(_$container); - // $chapterwrapper.append(json.node); - - console.log('displayChapter :: json', json); - - console.log('displayChapter :: chapterwrapper', $chapterwrapper); - }; //displayChapter - /* * Chapter * */ - function Chapter($e, angle){ + function Chapter(i, $e, base_a){ + $e.obj = this; + this.i = i; this.$e = $e; + this.nid = $e.attr("id").match(/^node-(\d+)/)[1]; this.geom = { - a:angle, + base_a:base_a, + a:0, r:0 } this.pos = {x:0,y:0}; this.translation = {x:0, y:0}; + //parties + this.$parties = $('.field-name-field-partie', $e); + this.lines = new Array(); + this.linesAnimeInterval = null; + this.linesAnimeCounter = 0; + this.linesAnimeTime = 5; // sec + // prototypes if (typeof Chapter.initialized == "undefined") { + Chapter.prototype.init = function(){ + // var _this = this; + // this.$parties.each(function(i, e){ + // _this.partie.push({$partie:$(this)}); + // }); + + this.setInitPos(); + this.drawLines(); + this.setEvents(); + }; + Chapter.prototype.setInitPos = function(){ + // distribute elements arround the center + this.geom.a = (360/_chapitres_len*this.i+this.geom.base_a)*Math.PI/180; + // console.log("Chapter :: setInitPos", this.$e); this.geom.c = Math.cos(this.geom.a); this.geom.s = Math.sin(this.geom.a); @@ -254,26 +191,154 @@ jQuery(document).ready(function($) { }); };// setIniPos() - Chapter.prototype.move = function(){ + Chapter.prototype.setEvents = function(){ + //http://technify.me/user-experience/javascript/jquery/trigger-custom-events-with-jquery/ + // click to preview chapter + $('h2.node-title, .field-name-field-partie:first>.field-name-field-vignette', this.$e) + .on('click', this, function(e){ + e.stopPropagation(); + e.preventDefault(); + e.data.preview(e); + return false; + }); + $('.links a', this.$e) + .on('click', this, function(e){ + e.stopPropagation(); + e.preventDefault(); + e.data.loadNode(); + return false; + }); }; - Chapter.prototype.preview = function(){ + Chapter.prototype.move = function(){ + this.$e.css({ //.stop(true, false) + translate:[_nav_pos.x, _nav_pos.y] + }); + // $(e).transition({translate:[_nav_pos.x, _nav_pos.y]}, 200, 'out'); + }; + Chapter.prototype.preview = function(e){ + console.log('preview', this.i); + + for (var i = _chapitres_len - 1; i >= 0; i--) { + if(i !== this.i) + _chapters[i].closePreview(); + }; + + var px, py; + this.$parties.each(function(i, e) { + switch(i){ + case 0: + px=randB(-40, 40); py=randB(40, 60); + break; + case 1: + px=randB(100, 200); py=randB(120,220); + break; + case 2: + px=randB(-200, -100); py=randB(250,320); + break; + } + + setTimeout( + (function(e, px, py){ + return function(){ + $(e) + .css({ + translate:[px, py], + // opacity:1 + }); + } + }(e, px, py)), + 10); + + }); // each $parties + + this.$e.addClass('previewed'); + this.animeLines(); }; Chapter.prototype.closePreview = function(){ + this.$e.removeClass('previewed') + .find('.field-name-field-partie') + .css({transform:"none"}); + }; + + Chapter.prototype.drawLines = function(){ + for (var i = 0; i < 2; i++) { + this.lines.push({ + $line:$("
").addClass('line', 'line-'+i).prependTo(this.$parties[i]) + }); + }; + }; + + + Chapter.prototype.animeLines = function(){ + this.linesAnimeCounter = 0; + this.linesAnimeInterval = setInterval( + (function(_this){ + return function(){ + // console.log("partie pos : ", _this.$parties.eq(2).position()); + + // get the lines length + var l, a, pos1, pos2; + for (var i = 0; i < _this.lines.length; i++) { + pos1 = _this.$parties.eq(i).position(); + pos2 = _this.$parties.eq(i+1).position(); + + l = Math.sqrt( + Math.pow( + pos2.left - pos1.left + ,2 + ) + + + Math.pow( + pos2.top - pos1.top + ,2 + ) + ); + + // get the rotation + a = 180 / 3.14 * Math.acos((pos2.top - pos1.top) / l); + if(pos2.left > pos1.left) + a *= -1; + + // console.log("a = "+a); + _this.lines[i].$line.css({ + 'height':l, + rotate:a+"deg" + }); + + }; + + + // limit the naimation time + _this.linesAnimeCounter ++; + if(_this.linesAnimeCounter > (1000/_fps)*_this.linesAnimeTime) + clearInterval(_this.linesAnimeInterval); + }; + }(this)), + _fps); }; - Chapter.prototype.open = function(){ + Chapter.prototype.loadNode = function(e){ + // console.log("Chapter :: open : nid", this.nid); + $.getJSON( + '/jee/chapter/'+this.nid, + {}, + this.displayNode + ); + }; + Chapter.prototype.displayNode = function(json, textstatus){ + console.log('Chapter :: displayNode : json', json); }; Node.initialized = true; } - this.setInitPos(); + this.init(); };//Chapter @@ -286,4 +351,35 @@ jQuery(document).ready(function($) { init(); -}); \ No newline at end of file +}); + + + + + +// Drupal.behaviors.init_theme = function (context) { +// // Growl-style system messages +// $('#messages-and-help > div.messages:not(.processed)') +// .addClass('processed') +// .each(function() { +// // If a message meets these criteria, we don't autoclose +// // - contains a link +// // - is an error or warning +// // - contains a lenghthy amount of text +// if ($('a', this).size() || $(this).is('.error') || $(this).is('.warning') || $(this).text().length > 100) { +// $(this).prepend("X"); +// $('span.close', this).click(function() { +// $(this).parent().slideUp('fast'); +// }); +// } +// else { +// // This essentially adds a 3 second pause before hiding the message. +// $(this).animate({opacity:1}, 5000, 'linear', function() { +// $(this).slideUp('fast'); +// }); +// } +// }); +// }; + + + diff --git a/sites/all/themes/gui/jee/templates/html.tpl.php b/sites/all/themes/gui/jee/templates/html.tpl.php index fe926a9..ff0d10e 100755 --- a/sites/all/themes/gui/jee/templates/html.tpl.php +++ b/sites/all/themes/gui/jee/templates/html.tpl.php @@ -58,8 +58,10 @@ - - + + + + <?php print $head_title; ?>