Changeset af93a0 in indico

Timestamp:

06/04/10 17:18:47 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

3578b2

Parents:

92af92

git-author:

Jose Benito <jose.benito.gonzalez@…> (06/04/10 17:16:21)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/04/10 17:18:47)

Message:

[FTR] Room Layout for the timetable

• Create new layout for the timetable: by room
• [FIX] fixed bug with infinite loops while truncating the titles
• Removed Data/Services?.js from indico/htdocs/js/presentation/Loader.js becuase it does not exist anymore

Location:

indico

Files:

• MaKaC/webinterface/pages/conferences.py (modified) (1 diff)
• MaKaC/webinterface/tpls/ConferenceTimeTable.tpl (modified) (1 diff)
• htdocs/css/Default.css (modified) (1 diff)
• htdocs/js/indico/Timetable/Base.js (modified) (5 diffs)
• htdocs/js/indico/Timetable/Draw.js (modified) (5 diffs)
• htdocs/js/indico/Timetable/Layout.js (modified) (4 diffs)
• htdocs/js/presentation/Loader.js (modified) (1 diff)

indico/MaKaC/webinterface/pages/conferences.py

@@ -1160 +1160 @@
                                                                           useAttrCache = True))
         vars['eventInfo'] = simplejson.dumps(DictPickler.pickle(self._conf, timezone=tz))
+        vars['timetableLayout'] = vars.get('ttLyt','')
         return vars
 

indico/MaKaC/webinterface/tpls/ConferenceTimeTable.tpl

@@ -15 +15 @@
 
   var historyBroker = new BrowserHistoryBroker();
-
-  var timetable = new TopLevelDisplayTimeTable(ttdata,eventInfo,710,$E('timetable'), 'session', historyBroker);
+  var timetableLayout = <%= "'%s'"%timetableLayout %>;
+  if (timetableLayout === '') {
+      timetableLayout = null;
+  }
+  var timetable = new TopLevelDisplayTimeTable(ttdata,eventInfo,710,$E('timetable'), 'session', historyBroker, timetableLayout);
   $E('timetable').set(timetable.draw());
   timetable.postDraw();

indico/htdocs/css/Default.css

@@ -6089 +6089 @@
     vertical-align: middle;
 }
+
+.headerRoomLayoutTimeTable {
+    text-align: center;
+    float: left;
+    margin-top: 10px;
+    color: black;
+    font-weight: bold;
+    border-left: 1px solid #E8E8E8;
+}

indico/htdocs/js/indico/Timetable/Base.js

@@ -27 +27 @@
               'poster': {name: 'Poster',
                          manager: new PosterLayoutManager()
-                        }
+                        },
+
+              'room': {name: 'Room',
+                       manager: new RoomLayoutManager()
+                      }
              },
     filters: {'session': {name: $T('Session'),
@@ -246 +250 @@
             self.timetableDrawer.redraw(self.currentDay);
             var timetableElements = translate(self.timetableDrawer.canvas.dom.childNodes, function(value) {return $E(value);});
-            var timetableDiv = Html.div({style: {paddingTop: pixels(20), position: 'relative'}}, timetableElements);
+            var timetableDiv = Html.div({style: {width:pixels(self.timetableDrawer.width), paddingTop: pixels(20), position: 'relative'}}, timetableElements);
             $E(document.body).set(header, timetableDiv);
             $E(document.body).setStyle('padding', pixels(30));
@@ -416 +420 @@
 
 },
-     function(data, width, wrappingElement, detailLevel, managementActions, historyBroker) {
+     function(data, width, wrappingElement, detailLevel, managementActions, historyBroker, timetableLayoutId) {
 
          var self = this;
@@ -432 +436 @@
                                                     this.loadingIndicator,
                                                     !!managementActions,
-                                                    managementActions);
+                                                    managementActions,
+                                                    timetableLayoutId);
 
          this.sortedKeys = keys(this.data);
@@ -784 +789 @@
 
 },
-     function(data, contextInfo, width, wrappingElement, detailLevel, historyBroker) {
+     function(data, contextInfo, width, wrappingElement, detailLevel, historyBroker, timetableLayoutId) {
 
          this.DisplayTimeTable(data, width, wrappingElement, detailLevel);
-         this.TopLevelTimeTableMixin(data, width, wrappingElement, detailLevel, null, historyBroker);
+         this.TopLevelTimeTableMixin(data, width, wrappingElement, detailLevel, null, historyBroker, timetableLayoutId);
 
          this.eventInfo = contextInfo;

indico/htdocs/js/indico/Timetable/Draw.js

@@ -153 +153 @@
                     this.locationDiv  = Html.div('timetableBlockLocation');
                     var addComma = false;
-                    if (this.eventData.room) {
+                    if (this.eventData.room && this.timetable.getTimetableDrawer().layoutChooser.get().shouldShowRoom()) {
                         this.locationDiv.append(this.eventData.room);
                         addComma = true;
@@ -312 +312 @@
                     this.locationDiv.dom.style.maxWidth = pixels(locationMaxWidth);
 
+                    // After modifying the location width, the content of the location might be expaneded
+                    // on two lines. Therefore, we should re-check if there is enought space for the time.
+                    if (contentWidth() >= parentDivWidth || contentHeight() >= parentDivHeight) {
+                        this.timeDiv.dom.style.display = 'none';
+                        this.locationDiv.dom.style.maxWidth = pixels(parentDivWidth  - 20);
+                    }
+
                     // Presenters information should not take more than half of the space of the block
                     if (this.presentersDiv && this.presentersDiv.dom.offsetWidth > parentDivWidth / 2) {
@@ -363 +370 @@
                 var step = 2;
                 //Truncating the title since it can be displayed in a single line
-                while (contentHeight() > parentDivHeight && topContentWidth() > parentDivWidth * 0.8) {
+                // title !== "..." avoids the endless loop
+                while (title !== "..." && contentHeight() > parentDivHeight && topContentWidth() > parentDivWidth * 0.8) {
                     title = this.truncateTitle(-step, title);
                     this.titleDiv.set(title);
@@ -1227 +1235 @@
              }
 
-             return scaleDiv;
+             return Html.div({}, this.layoutChooser.get().getHeader(this.width), scaleDiv);
          },
 
@@ -1277 +1285 @@
              each(blocks, function(blockData) {
 
-                 var nCol = groups[blockData.group][1];
+                 var nCol = self.layoutChooser.get().getNumColumnsForGroup(groups[blockData.group]);
 
                  var colWidth = Math.floor((self.width-TimetableDefaults.leftMargin) / nCol);

indico/htdocs/js/indico/Timetable/Layout.js

@@ -46 +46 @@
                      addCheckpoint(key, sTime, 'start', value.sessionId);
 
-                 if (eTime > sTime) {
-                     addCheckpoint(key, eTime, 'end');
-                 } else if (eTime == '000000') {
-                     addCheckpoint(key, '240000', 'end');
-                 }
-                 else {
-                     addCheckpoint(key, 'nextday', 'end');
-                 }
+                     if (eTime > sTime) {
+                         addCheckpoint(key, eTime, 'end');
+                     } else if (eTime == '000000') {
+                         addCheckpoint(key, '240000', 'end');
+                     }
+                     else {
+                         addCheckpoint(key, 'nextday', 'end');
+                     }
                  }
              });
@@ -205 +205 @@
          addWholeDayBlock: function(blocks, key) {
              block = blocks[key] = {id: key};
+         },
+
+         getNumColumnsForGroup: function(group) {
+             return group[1];
+         },
+
+         getHeader: function() {
+             return null;
+         },
+
+         shouldShowRoom: function() {
+             return true;
          }
      }
@@ -215 +227 @@
 
              var self = this;
+
+             this.eventData = data;
 
              this.detailLevel = any(detailLevel, 'session');
@@ -490 +504 @@
      });
 
+type("RoomLayoutManager", ["CompactLayoutManager"],
+    {
+
+        drawDay: function(data, detailLevel, startTime, endTime) {
+            this.roomsCols = {};
+            return this.CompactLayoutManager.prototype.drawDay.call(this, data, detailLevel, startTime, endTime);
+        },
+
+        assign: function(assigned, block) {
+            var roomName = this.eventData[block.id].room;
+            var col = 0;
+            if (! exists(this.roomsCols[roomName])) {
+                // If there is no room name, the block will be in the column 0 (and take all the available width)
+                if (trim(roomName) !== "") {
+                    col = this.roomsCols[roomName] = keys(this.roomsCols).length;
+                }
+            } else {
+                col = this.roomsCols[roomName];
+            }
+
+            block.assigned = col;
+            assigned[col] = block;
+        },
+
+        reorderAssigned: function(assigned, lastAssigned, currentGroup) {
+            var self = this;
+            var roomNames = keys(this.roomsCols);
+            roomNames.sort();
+
+            this.roomsCols = {};
+            var counter = 0;
+            each (roomNames, function(name) {
+                self.roomsCols[name] = counter;
+                counter++;
+            });
+
+            for (key in currentGroup) {
+                var block = currentGroup[key];
+                var roomName = this.eventData[block.id].room;
+             // If there is no room name, the block will be in the column 0 (and take all the available width)
+                var col = 0;
+                if (trim(roomName) !== "") {
+                    col =  this.roomsCols[roomName];
+                }
+                block.assigned = col;
+                assigned[col] = block;
+            }
+
+        },
+
+        getNumColumnsForGroup: function(group) {
+            if (group[0].length == 1 && this.eventData[group[0][0].id].room === "") {
+                return 1;
+            } else {
+                return keys(this.roomsCols).length;
+            }
+        },
+
+        getHeader: function(width) {
+            var roomNames = keys(this.roomsCols);
+            var cols = roomNames.length;
+            var borderPixels = 1; // this is because of the separators between the room names
+            return Html.div({style:{marginLeft:pixels(TimetableDefaults.leftMargin), paddingBottom:pixels(10), paddingTop:pixels(10)}},
+                    translate(roomNames, function(key){
+                        return Html.div({className: "headerRoomLayoutTimeTable",
+                                         style:{width:pixels(Math.floor((width-TimetableDefaults.leftMargin)/cols)-borderPixels)}
+                                        }, key);
+                    })
+                    );
+        },
+
+        shouldShowRoom: function() {
+            return false;
+        }
+    },
+
+    function() {
+        this.roomsCols = {};
+    });
+
 
 type("PosterLayoutManager", ["TimetableLayoutManager"],

indico/htdocs/js/presentation/Loader.js

@@ -36 +36 @@
         "Data/Files.js",
         "Data/Cookies.js",
-        "Data/Service.js",
         "Ui/MimeTypes.js",
         "Ui/Dom.js",