Changeset 2883

Timestamp:

04/25/10 10:07:32

Author:

johnsa

Message:

ongoing updates to freebusy mockup

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/bedeworkFb.js (modified) (8 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/schedule.css (modified) (3 diffs)

trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/bedeworkFb.js

@@ -207 +207 @@
-      
-      // generate the date row - includes top left empty corner 
-0
+fbDisplay.rows.length
-      $(fbDisplayDateRow).html('<td rowspan="2" colspan="3" class="corner"></td><td class="fbBoundry"></td>');
-      for (i=0; i < range; i++) {
@@ -216 +216 @@
-      
-      // generate the times row - each cell spans over the day divisions
-1
+fbDisplay.rows.length
-      $(fbDisplayTimesRow).html('<td class="fbBoundry"></td>');
-      for (i=0; i < range; i++) {
@@ -234 +234 @@
-      
-      // generate the "All Attendees" row
-2
+fbDisplay.rows.length
-      $(fbDisplayTimesRow).addClass("allAttendees");
-      $(fbDisplayTimesRow).html('<td class="status"></td><td class="role"></td><td class="name">All Attendees</td><td class="fbBoundry"></td>');
@@ -273 +273 @@
-      // generate the regular attendees rows
-      for (attendee = 0; attendee < this.attendees.length; attendee++) {
-TimesRow = fbDisplay.insertRow(attendee + 3); // offset by three to account for previous special rows
+AttendeeRow = fbDisplay.insertRow(fbDisplay.rows.length); 
-        var curAttendee = this.attendees[attendee];
-        
@@ -280 +280 @@
-        switch (curAttendee.status) {
-          case bwAttendeeStatusAccepted : 
-Times
+Attendee
-            break;
-          case bwAttendeeStatusDeclined : 
-Times
+Attendee
-            break;
-          case bwAttendeeStatusTentative : 
-Times
+Attendee
-            break;
-          case bwAttendeeStatusDelegated : 
-Times
+Attendee
-            break;
-          case bwAttendeeStatusCompleted : 
-Times
+Attendee
-            break;
-          case bwAttendeeStatusInProcess : 
-Times
+Attendee
-            break;
-          default : // default to bwAttendeeStatusNeedsAction - display question mark
-Times
+Attendee
-        }
-
@@ -305 +305 @@
-        switch (curAttendee.role) {
-          case bwAttendeeRoleChair : // displays writing hand icon
-Times
+Attendee
-            break;
-          case bwAttendeeRoleRequired : // displays right-pointing arrow icon
-Times
+Attendee
-            break;
-          case bwAttendeeRoleNonParticipant : // non-participant
-Times
+Attendee
-            break;
-          default : // bwAttendeeRoleOptional - no icon (use a space to provide a rollover)
-Times
+Attendee
-        }
-        
-        // output the attendee name or address (depending on which we have available)
-        if (curAttendee.name && curAttendee.name != "") {
-Times
+Attendee
-        } else {
-Times
+Attendee
-        }
-        
@@ -342 +342 @@
-                // adding the hourdivision increment in the calculation below is to correct for a bug
-                // in which the class was always offset by one table cell - should find cause
-/this.hourDivision*
+ / this.hourDivision * 
-                if (curAttendee.freebusy[m].contains(curDateUTC)) {
-                  $(fbCell).addClass("busy");
@@ -348 +348 @@
-                }
-              }
-Times
+Attendee
-              curDate.addMinutes(60/this.hourDivision);
-            }
-          }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      $("#" + displayId).html(fbDisplay);
-      
-      
-
+
+
-      $("#bwScheduleTable .icon").hover(
-        function () {

trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/schedule.css

@@ -4 +4 @@
-}
-s#bwSchedule {
-
-
-
-
+
+
+
+
+
-}
-#bwScheduleTable {
@@ -58 +59 @@
-  font-size: 1.6em;
-}
+#bwScheduleTable td.name {
+  padding-right: 1em;
+}
-#bwScheduleTable td.accepted {
-  color: #5a0;
@@ -66 +70 @@
-  font-family: Paladino, Times, serif;
-}
-
-
-
-
+
-  color: #bbb;
-  background-color: transparent;
+  cursor: pointer;
+  padding: 8px 0 8px 4px;
-}
-#bwScheduleTable td.busy {