# HG changeset patch # User Sandrine Ribeau # Date 1226626124 28800 # Node ID df10dcecbd02dedb9caca94a7cd656c194c9526c # Parent 69a4bf8f5e49fa1b0636ecd42ac695d939654f1a# Parent 58fd269f626ba03d1bf8b334a10ffcd92fc21288 merge diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/fr/images/blog-demo-first-page.png Binary file doc/book/fr/images/blog-demo-first-page.png has changed diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/fr/images/login-form.png Binary file doc/book/fr/images/login-form.png has changed diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/archi_globale.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/blog-demo-first-page.png Binary file doc/book/images/blog-demo-first-page.png has changed diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.00-login.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.01-start.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.02-cookie-values.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.02-create-blog.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.03-list-one-blog.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.03-site-config-panel.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.03-state-submitted.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.03-transitions-view.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.04-detail-one-blog.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.05-list-two-blog.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.06-add-relation-entryof.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.06-header-no-login.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.06-main-template-layout.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.06-main-template-logo.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.06-simple-main-template.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.07-detail-one-blogentry.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.08-schema.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.09-new-view-blogentry.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/lax-book.10-blog-with-two-entries.en.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/login-form.png Binary file doc/book/images/login-form.png has changed diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/main_template_layout.png diff -r 69a4bf8f5e49 -r df10dcecbd02 doc/book/images/server-class-diagram.png diff -r 69a4bf8f5e49 -r df10dcecbd02 web/data/cubicweb.timeline-bundle.js --- a/web/data/cubicweb.timeline-bundle.js Thu Nov 13 17:26:30 2008 -0800 +++ b/web/data/cubicweb.timeline-bundle.js Thu Nov 13 17:28:44 2008 -0800 @@ -3722,21 +3722,25 @@ }; Timeline.createBandInfo=function(D){var E=("theme" in D)?D.theme:Timeline.getDefaultTheme(); var B=("eventSource" in D)?D.eventSource:null; -var F=new Timeline.LinearEther({centersOn:("date" in D)?D.date:new Date(),interval:SimileAjax.DateTime.gregorianUnitLengths[D.intervalUnit],pixelsPerInterval:D.intervalPixels,theme:E}); -var G=new Timeline.GregorianEtherPainter({unit:D.intervalUnit,multiple:("multiple" in D)?D.multiple:1,theme:E,align:("align" in D)?D.align:undefined}); -var I={showText:("showEventText" in D)?D.showEventText:true,theme:E}; -if("eventPainterParams" in D){for(var A in D.eventPainterParams){I[A]=D.eventPainterParams[A]; -}}if("trackHeight" in D){I.trackHeight=D.trackHeight; -}if("trackGap" in D){I.trackGap=D.trackGap; -}var H=("overview" in D&&D.overview)?"overview":("layout" in D?D.layout:"original"); +var F={interval:SimileAjax.DateTime.gregorianUnitLengths[D.intervalUnit],pixelsPerInterval:D.intervalPixels,theme:E}; +if("startsOn" in D||"endsOn" in D){if("startsOn" in D){F.startsOn=D.startsOn; +}if("endsOn" in D){F.endsOn=D.endsOn; +}}else{F.centersOn=("date" in D)?D.date:new Date(); +}var G=new Timeline.LinearEther(F); +var H=new Timeline.GregorianEtherPainter({unit:D.intervalUnit,multiple:("multiple" in D)?D.multiple:1,theme:E,align:("align" in D)?D.align:undefined}); +var J={showText:("showEventText" in D)?D.showEventText:true,theme:E}; +if("eventPainterParams" in D){for(var A in D.eventPainterParams){J[A]=D.eventPainterParams[A]; +}}if("trackHeight" in D){J.trackHeight=D.trackHeight; +}if("trackGap" in D){J.trackGap=D.trackGap; +}var I=("overview" in D&&D.overview)?"overview":("layout" in D?D.layout:"original"); var C; -if("eventPainter" in D){C=new D.eventPainter(I); -}else{switch(H){case"overview":C=new Timeline.OverviewEventPainter(I); +if("eventPainter" in D){C=new D.eventPainter(J); +}else{switch(I){case"overview":C=new Timeline.OverviewEventPainter(J); break; -case"detailed":C=new Timeline.DetailedEventPainter(I); +case"detailed":C=new Timeline.DetailedEventPainter(J); break; -default:C=new Timeline.OriginalEventPainter(I); -}}return{width:D.width,eventSource:B,timeZone:("timeZone" in D)?D.timeZone:0,ether:F,etherPainter:G,eventPainter:C,theme:E,zoomIndex:("zoomIndex" in D)?D.zoomIndex:0,zoomSteps:("zoomSteps" in D)?D.zoomSteps:null}; +default:C=new Timeline.OriginalEventPainter(J); +}}return{width:D.width,eventSource:B,timeZone:("timeZone" in D)?D.timeZone:0,ether:G,etherPainter:H,eventPainter:C,theme:E,zoomIndex:("zoomIndex" in D)?D.zoomIndex:0,zoomSteps:("zoomSteps" in D)?D.zoomSteps:null}; }; Timeline.createHotZoneBandInfo=function(D){var E=("theme" in D)?D.theme:Timeline.getDefaultTheme(); var B=("eventSource" in D)?D.eventSource:null; @@ -3878,23 +3882,25 @@ }}if(!E.autoWidth){return ; }F(); }; -Timeline._Impl.prototype._initialize=function(){var H=this._containerDiv; -var E=H.ownerDocument; -H.className=H.className.split(" ").concat("timeline-container").join(" "); -var B=(this.isHorizontal())?"horizontal":"vertical"; -H.className+=" timeline-"+B; -while(H.firstChild){H.removeChild(H.firstChild); -}var A=SimileAjax.Graphics.createTranslucentImage(Timeline.urlPrefix+(this.isHorizontal()?"data/timeline/copyright-vertical.png":"data/timeline/copyright.png")); -A.className="timeline-copyright"; -A.title="Timeline © SIMILE - http://simile.mit.edu/timeline/"; -SimileAjax.DOM.registerEvent(A,"click",function(){window.location="http://simile.mit.edu/timeline/"; +Timeline._Impl.prototype._initialize=function(){var E=this._containerDiv; +var G=E.ownerDocument; +E.className=E.className.split(" ").concat("timeline-container").join(" "); +var A=(this.isHorizontal())?"horizontal":"vertical"; +E.className+=" timeline-"+A; +while(E.firstChild){E.removeChild(E.firstChild); +}var B=SimileAjax.Graphics.createTranslucentImage(Timeline.urlPrefix+(this.isHorizontal()?"data/timeline/copyright-vertical.png":"data/timeline/copyright.png")); +B.className="timeline-copyright"; +B.title="Timeline © SIMILE - http://simile.mit.edu/timeline/"; +SimileAjax.DOM.registerEvent(B,"click",function(){window.location="http://simile.mit.edu/timeline/"; }); -H.appendChild(A); +E.appendChild(B); this._bands=[]; for(var C=0; C Loading..."; -this.showLoadingMessage=function(){D.containerDiv.style.display="block"; -}; -this.hideLoadingMessage=function(){D.containerDiv.style.display="none"; +}}var I=SimileAjax.Graphics.createMessageBubble(G); +I.containerDiv.className="timeline-message-container"; +E.appendChild(I.containerDiv); +I.contentDiv.className="timeline-message"; +I.contentDiv.innerHTML=" Loading..."; +this.showLoadingMessage=function(){I.containerDiv.style.display="block"; +}; +this.hideLoadingMessage=function(){I.containerDiv.style.display="none"; }; }; Timeline._Impl.prototype._distributeWidths=function(){var B=this.getPixelLength();