')
+ .wrap('
')
+ .wrap('![](" + Timegrid.urlPrefix
+ + "images/progress-running.gif)
" + Timegrid.l10n.loadingMessage;
+
+ this.showLoadingMessage = function() { $(message.containerDiv).show(); };
+ this.hideLoadingMessage = function() { $(message.containerDiv).hide(); };
+
+ this._panel.render(container);
+ this.rendering = false;
+};
+
+Timegrid._Impl.prototype._update = function() {
+ this._panel.renderChanged();
+};
+
+Timegrid._Impl.prototype._resize = function() {
+ var newHeight = $(this._container).height();
+ var newWidth = $(this._container).width();
+
+ if (!(newHeight == this._oldHeight && newWidth == this._oldWidth)) {
+ if (!this.rendering) { this._construct(); }
+ this._oldHeight = newHeight;
+ this._oldWidth = newWidth;
+ }
+};
+
+Timegrid._Impl.prototype._onAddMany = function() {
+ this._update();
+};
+
+Timegrid._Impl.prototype._onClear = function() {
+ this._update();
+};
+
diff --git a/src/webapp/api/scripts/controls.js b/src/webapp/api/scripts/controls.js
index 3b4ba36..15cde49 100644
--- a/src/webapp/api/scripts/controls.js
+++ b/src/webapp/api/scripts/controls.js
@@ -1,148 +1,161 @@
-/**
- * Controls
- */
-
-Timegrid.Controls = {};
-
-/*
- * A panel will render controls around a set of layouts. This should be the
- * only entrypoint into this code, in addition to the render method.
- * Possible controls include:
- * Switching between the layouts (tabs)
- * Iterating through time, different weeks/months, etc (arrows)
- * Switching between data sources
- * The style and selection of which types of controls to render in the panel
- * should be easily configurable through the params hash passed in.
- */
-Timegrid.Controls.Panel = function(layouts, params) {
- this._layouts = layouts;
- this._titles = $.map(this._layouts, function(l) { return l.title; });
- this._tabSet = new Timegrid.Controls.TabSet(this._titles, this._layouts);
-};
-
-Timegrid.Controls.Panel.prototype.setLayouts = function(layouts) {
- this._layouts = layouts;
- this._titles = $.map(this._layouts, function(l) { return l.title; });
- this._tabSet.setLayouts(this._titles, this._layouts);
-};
-
-Timegrid.Controls.Panel.prototype.render = function(container) {
- this._tabSet.render(container);
- this._tabSet.switchTo(this._tabSet.current || this._titles[0]);
-};
-
-Timegrid.Controls.Panel.prototype.renderChanged = function() {
- this._tabSet.renderChanged();
- this._tabSet.switchTo(this._tabSet.current || this._titles[0]);
-};
-
-/*
- * TabSet is a style of control that generates a set of tabs. These tabs can
- * be configured to switch between different views, time slices, or data
- * sources.
- */
-Timegrid.Controls.TabSet = function(titles, layouts) {
- this.setLayouts(titles, layouts);
- this.current = "";
-};
-
-Timegrid.Controls.TabSet.prototype.setLayouts = function(titles, layouts) {
- this._tabs = {};
- this._renderedLayouts = {};
- this._iterators = {};
- this._layoutMap = {};
- for (var i = 0; i < titles.length; i++) {
- this._layoutMap[titles[i]] = layouts[i];
- }
-};
-
-Timegrid.Controls.TabSet.prototype.render = function(container) {
- this._container = container;
- var self = this;
- var tabDiv = $('').addClass('timegrid-tabs');
- $(container).prepend(tabDiv);
- var makeCallback = function(title) {
- return function() { self.switchTo(title); };
- };
- for (var lTitle in this._layoutMap) {
- var tab = $(''+monthString+'
');
+mDiv.addClass('timegrid-month-label');
+mDiv.css('top',self.yCell*monthStart.i+"px");
+var height=monthStart.height*self.yCell;
+mDiv.height(height+"px");
+mDiv.children().css('line-height',height+"px");
+return mDiv.get(0);
+});
+};
+
+Timegrid.NMonthLayout.prototype.highlightNow=function(){
+var now=new Date();
+var x=this.xMapper({time:now});
+var y=this.yMapper({time:now});
+};
+
+Timegrid.NMonthLayout.prototype.getXLabels=function(){
+return Date.l10n.dayNames;
+};
+
+Timegrid.NMonthLayout.prototype.getYLabels=function(){
+return this.yLabels;
+};
+
+Timegrid.NMonthLayout.prototype.goPrevious=function(){
+this.dataStartTime.add('M',0-this.n);
+this.startTime=new Date(this.dataStartTime);
+this.updateGrid();
+this.render();
+};
+
+Timegrid.NMonthLayout.prototype.goNext=function(){
+this.dataStartTime.add('M',this.n);
+this.startTime=new Date(this.dataStartTime);
+this.updateGrid();
+this.render();
+};
+
+Timegrid.NMonthLayout.prototype.getCurrent=function(){
+var start=this.monthStarts[0].date;
+var end=this.monthStarts[this.monthStarts.length-1].date;
+if(this.n>1){
+return Timegrid.NMonthLayout.l10n.makeRange(start,end);
+}else{
+return Timegrid.NMonthLayout.l10n.makeRange(start);
+}
+};
+
+Timegrid.NMonthLayout.prototype.computeStartTime=function(date){
+if(date){
+var startTime=new Date(date);
+startTime.setDate(1);
+startTime.setHours(0);
+
+while(this.xMapper({time:startTime})>0){
+startTime.setHours(-24);
+}
+return startTime;
+}
+};
+
+Timegrid.NMonthLayout.prototype.computeEndTime=function(date){
+if(date){
+var endTime=new Date(date);
+endTime.add('d',this.ySize*7);
+return endTime;
+}
+return false;
+};
+
+Timegrid.NMonthLayout.prototype.computeYSize=function(date){
+var gridStart={time:new Date(date)};
+var month=this.dataStartTime.getMonth();
+this.ySize=0;
+this.monthStarts=[{i:this.ySize,date:new Date(this.dataStartTime)}];
+while(this.xMapper(gridStart)>0&&this.yMapper(gridStart)>=0){
+gridStart.time.setHours(-24);
+}
+gridStart.time.add('d',7);
+for(;this.monthStarts.length<=this.n;gridStart.time.add('d',7)){
+if(gridStart.time.getMonth()!=month){
+month=gridStart.time.getMonth();
+var year=gridStart.time.getFullYear();
+this.monthStarts.push({i:this.ySize,date:new Date(gridStart.time)});
+var old=this.monthStarts[this.monthStarts.length-2];
+old.height=this.ySize-old.i+1;
+}
+this.ySize++;
+}
+this.monthStarts.pop();
+};
+
+Timegrid.NMonthLayout.prototype.computeLabels=function(date){
+var gridStart={time:new Date(date)};
+this.cellLabels=[];
+this.months=[];
+this.yLabels=[];
+
+
+while(this.xMapper(gridStart)"+evt.getText()+"
- SIMILE | Timegrid | Examples | MIT Academic Calendar
+
+
+
+
+
+
+
+
+
+
MIT Academic Calendar
- - - + + + + +
+ SIMILE | Timegrid | Examples | Conference Schedule
-
-
-
-
-
-
-
MIT Academic Calendar
+ + + diff --git a/src/webapp/site/examples/conference/conference.html b/src/webapp/site/examples/conference/conference.html index 48364df..eedf0e9 100644 --- a/src/webapp/site/examples/conference/conference.html +++ b/src/webapp/site/examples/conference/conference.html @@ -1,27 +1,30 @@ - - - - -
- SIMILE | Timegrid | Examples | Conference Schedule
+
+
+
+
+
+
+
+
+
+
ISWC 2005 Schedule
-
-
-
-
+
+
+
+
+
+ SIMILE | Timegrid | Examples | Monthly Schedule
-
+
+
+
+
ISWC 2005 Schedule
+
+
+
+
diff --git a/src/webapp/site/examples/month/month.html b/src/webapp/site/examples/month/month.html
index c7204c8..da4b2b9 100644
--- a/src/webapp/site/examples/month/month.html
+++ b/src/webapp/site/examples/month/month.html
@@ -8,7 +8,10 @@
-
diff --git a/src/webapp/site/examples/property/lectures.js b/src/webapp/site/examples/property/lectures.js
index f330065..98d232c 100644
--- a/src/webapp/site/examples/property/lectures.js
+++ b/src/webapp/site/examples/property/lectures.js
@@ -1,29 +1,29 @@
-{
- 'dateTimeFormat': 'iso8601',
- 'events' : [
- {
- 'start' : '2007-08-09T09:00',
- 'end' : '2007-08-09T10:00',
- 'title' : '18.01 - Single-Variable Calculus',
- 'room' : '10-250'
- },
- {
- 'start' : '2007-08-09T10:00',
- 'end' : '2007-08-09T11:00',
- 'title' : '3.091 - Solid-State Chemistry',
- 'room' : '10-250'
- },
- {
- 'start' : '2007-08-09T15:00',
- 'end' : '2007-08-09T17:00',
- 'title' : '8.01 - Physics I',
- 'room' : '26-132'
- },
- {
- 'start' : '2007-08-09T15:00',
- 'end' : '2007-08-09T17:00',
- 'title' : '8.02 - Physics II',
- 'room' : '32-052'
- }
- ]
-}
+{
+ 'dateTimeFormat': 'iso8601',
+ 'events' : [
+ {
+ 'start' : '2007-08-09T09:00',
+ 'end' : '2007-08-09T10:00',
+ 'title' : '18.01 - Single-Variable Calculus',
+ 'room' : '10-250'
+ },
+ {
+ 'start' : '2007-08-09T10:00',
+ 'end' : '2007-08-09T11:00',
+ 'title' : '3.091 - Solid-State Chemistry',
+ 'room' : '10-250'
+ },
+ {
+ 'start' : '2007-08-09T15:00',
+ 'end' : '2007-08-09T17:00',
+ 'title' : '8.01 - Physics I',
+ 'room' : '26-132'
+ },
+ {
+ 'start' : '2007-08-09T15:00',
+ 'end' : '2007-08-09T17:00',
+ 'title' : '8.02 - Physics II',
+ 'room' : '32-052'
+ }
+ ]
+}
diff --git a/src/webapp/site/examples/property/property.html b/src/webapp/site/examples/property/property.html
index 5cbd990..a748747 100644
--- a/src/webapp/site/examples/property/property.html
+++ b/src/webapp/site/examples/property/property.html
@@ -1,27 +1,30 @@
-
-
-
-
-
- Timeplot
- SIMILE | Timegrid | Examples | Lecture Locations
+
+
+
+
+
+
+
+
+
+
Monday Lecture Schedule
-
-
-
-
+
+
+
+
+
+ SIMILE | Timegrid | Examples | Weekly Schedule
-
+
+
+
+
-
+
diff --git a/src/webapp/site/styles.css b/src/webapp/site/styles.css
index f62f72e..e349d24 100644
--- a/src/webapp/site/styles.css
+++ b/src/webapp/site/styles.css
@@ -1,4 +1,4 @@
-@import url("http://simile.mit.edu/styles/default.css");
+@import url("docs/default.css");
body {
margin-bottom: 20em;
Monday Lecture Schedule
+
+
+
+
diff --git a/src/webapp/site/examples/week/sched.html b/src/webapp/site/examples/week/sched.html
index 52eb5ce..541be06 100644
--- a/src/webapp/site/examples/week/sched.html
+++ b/src/webapp/site/examples/week/sched.html
@@ -8,7 +8,10 @@
-
diff --git a/src/webapp/site/index.html b/src/webapp/site/index.html
index aa85ec5..f33a717 100644
--- a/src/webapp/site/index.html
+++ b/src/webapp/site/index.html
@@ -9,8 +9,10 @@