The End, etc.

@@ -141,12 +142,20 @@ incResize.resizeElements(); // Manage the hinding of the bar and of the pointer - incHideBar.init(); + incHideBar.init(showHide); }); var resizePopup = function() { popupPosition('popUpDiv', 'content'); } + + var showHide = function(show) { + if (show) { + $("#breturn").show(); + } else { + $("#breturn").hide(); + } + } \ No newline at end of file diff -r 097e4023ede3 -r be6c1f9cc258 web/portraits-the-end-etc.html --- a/web/portraits-the-end-etc.html Thu Jan 24 16:28:04 2013 +0100 +++ b/web/portraits-the-end-etc.html Thu Jan 24 16:30:41 2013 +0100 @@ -1,10 +1,11 @@ - - The End - @todo + + THE END, ETC. UNE EXPÉRIENCE WEB DE LAETITIA MASSON - + + diff -r 097e4023ede3 -r be6c1f9cc258 web/prologue-the-end-etc.html --- a/web/prologue-the-end-etc.html Thu Jan 24 16:28:04 2013 +0100 +++ b/web/prologue-the-end-etc.html Thu Jan 24 16:30:41 2013 +0100 @@ -1,10 +1,12 @@ - - The End - @todo + + THE END, ETC. UNE EXPÉRIENCE WEB DE LAETITIA MASSON - + + + diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/css/style_nonsupporte.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/static/res/css/style_nonsupporte.css Thu Jan 24 16:30:41 2013 +0100 @@ -0,0 +1,101 @@ +/*----------------------------------------------*/ +/* Summary */ +/*----------------------------------------------*/ + +/* 1- Mentions */ +/* 2- Reset */ +/* 3- Base styles */ +/* 4- HP */ + +/*----------------------------------------------*/ +/* 1- Mentions */ +/*----------------------------------------------*/ + +/* @client : The End */ +/* @date : octobre 2012 */ + +/*----------------------------------------------*/ +/* 2- Reset */ +/*----------------------------------------------*/ +html,body,div,ul,ol,li,h1,h2,h3,h4,h5,h6,form,fieldset,legend,input,button,textarea,select,figure,p,blockquote,th,td { + margin:0; + padding:0; +} +html { + font-size: 100%; +} +h1,h2,h3,h4,h5,h6 { + font-size: 100%; + font-weight: normal; + font-style: normal; +} +a, +a:link, +a:visited, +a:active, +a:hover, +a:focus { + text-decoration: none; +} +li { + list-style: none; +} +img, table, td, blockquote, code, pre, textarea, input, object { + max-width: 100%; +} +/*----------------------------------------------*/ +/* 3- Base styles */ +/*----------------------------------------------*/ +html { + overflow: hidden; +} +body { + background-color: #000000; + font-size: 1em; + line-height: 1; +} +html, body { + height: 100%; + width: 100%; +} +#content { + margin: 0 auto; + width: 80%; +} +#content p { + margin: 1em 0; + font-family: Arial, "arialregular", Helvetica, sans-serif; + font-size: 14px; + color: #ffffff; +} +b, +strong, +.bold { + font-weight: bold; +} + +.txt_hidden { + text-indent: -9999em; +} + +h1 { + margin : auto; + width: 422px; + height: 114px; + background-image: url("../img/hp_title.jpg"); + overflow: hidden; + text-indent: -9999px; +} +#top { + height: 30%; + background: red; +} +#middle { + height: 30%; + background: green; +} +#footer { + height: 40%; + background: red; + +} \ No newline at end of file diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/img/choixMusique6.jpg Binary file web/static/res/img/choixMusique6.jpg has changed diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/img/hp_title.jpg Binary file web/static/res/img/hp_title.jpg has changed diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/img/menuPortraits.jpg Binary file web/static/res/img/menuPortraits.jpg has changed diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/js/inchidebar.js --- a/web/static/res/js/inchidebar.js Thu Jan 24 16:28:04 2013 +0100 +++ b/web/static/res/js/inchidebar.js Thu Jan 24 16:30:41 2013 +0100 @@ -3,6 +3,7 @@ this.timeoutBarPointer; this.goUp; this.canShowCursor; + this.callback; this.showBarPointer = function(state) { if (state) { @@ -33,7 +34,11 @@ setTimeout(function() {incHideBar.canShowCursor = true;}, 300); } } - } + + if (this.callback !== null) { + this.callback(state); + } + }; this.hideBarPointerTimeout = function(time) { this.timeoutBarPointer = setTimeout(function() { @@ -53,9 +58,10 @@ } }; - this.init = function() { + this.init = function(callback) { this.goUp = false; this.canShowCursor = incPlayer.ipad; + this.callback = callback; if (!incPlayer.ipad) { // Hide bar and pointer in seconds @@ -64,7 +70,9 @@ if (incPlayer.ipad) { document.ontouchmove = function(e) { - e.preventDefault(); + if (typeof( popupOn ) === "undefined" || !popupOn) { + e.preventDefault(); + } }; document.ontouchstart = function() { diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/js/incplayer.js --- a/web/static/res/js/incplayer.js Thu Jan 24 16:28:04 2013 +0100 +++ b/web/static/res/js/incplayer.js Thu Jan 24 16:30:41 2013 +0100 @@ -138,6 +138,10 @@ for (var i = 0; i < videosIndex.length; ++i) { this.sequences.push(this.allSequencesData.videos[videosIndex[i]]); } + } else if (wordsIndex[0] == null) { + // No reason to be here, redirection + location.href = "index.html"; + } else { // We choose new videos @@ -764,14 +768,26 @@ this.loadJson = function(jsonFile) { var txt = this.loadTxtFile(jsonFile); - return JSON.parse(txt); + var obj = null; + + $.ajax({ + url: jsonFile, + async: false, + success: function (data){ + obj = data; + } + }); + + return obj; }; this.loadTxtFile = function(jsonFile) { var xhr = new XMLHttpRequest(); - xhr.open("GET", jsonFile, false); - xhr.overrideMimeType('text/plain; charset=x-user-defined'); + xhr.open("GET", jsonFile, false); + if (xhr.overrideMimeType) { + xhr.overrideMimeType('text/plain; charset=x-user-defined'); + } try { xhr.send(null); diff -r 097e4023ede3 -r be6c1f9cc258 web/static/res/js/modernizr.custom.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/static/res/js/modernizr.custom.js Thu Jan 24 16:30:41 2013 +0100 @@ -0,0 +1,4 @@ +/* Modernizr 2.6.2 (Custom Build) | MIT & BSD + * Build: http://modernizr.com/download/#-canvas-audio-video-shiv-cssclasses-load + */ +;window.Modernizr=function(a,b,c){function u(a){j.cssText=a}function v(a,b){return u(prefixes.join(a+";")+(b||""))}function w(a,b){return typeof a===b}function x(a,b){return!!~(""+a).indexOf(b)}function y(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:w(f,"function")?f.bind(d||b):f}return!1}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m={},n={},o={},p=[],q=p.slice,r,s={}.hasOwnProperty,t;!w(s,"undefined")&&!w(s.call,"undefined")?t=function(a,b){return s.call(a,b)}:t=function(a,b){return b in a&&w(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=q.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(q.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(q.call(arguments)))};return e}),m.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},m.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},m.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c};for(var z in m)t(m,z)&&(r=z.toLowerCase(),e[r]=m[z](),p.push((e[r]?"":"no-")+r));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)t(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},u(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+p.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f - - The End - @todo + + THE END, ETC. UNE EXPÉRIENCE WEB DE LAETITIA MASSON @@ -46,7 +46,7 @@ -->

diff -r 097e4023ede3 -r be6c1f9cc258 web/transition-the-end-etc.html --- a/web/transition-the-end-etc.html Thu Jan 24 16:28:04 2013 +0100 +++ b/web/transition-the-end-etc.html Thu Jan 24 16:30:41 2013 +0100 @@ -1,10 +1,11 @@ - - The End - @todo + + THE END, ETC. UNE EXPÉRIENCE WEB DE LAETITIA MASSON - + + @@ -54,7 +55,7 @@

Partagez

Recommencez

The end, etc.

Prolongez l'expérience

Crédits