* CtdlDragDrop library now works in IE7 and 8

* Fix iconbar roomlist floor expansion in IE7, IE6 todo

diff --git a/webcit/static/ctdldragdrop.js b/webcit/static/ctdldragdrop.js
index cf77cfcb12a1a58c58919f8c01e276183d93938f..9e253b3ddaf8fa79200ed3ac59bbfcc8b37cacd3 100644 (file)
--- a/webcit/static/ctdldragdrop.js
+++ b/webcit/static/ctdldragdrop.js
@@ -5,7 +5,7 @@ var draggedElement = null;
 var currentDropTargets = null;
 var dropTarget = null;
 var dragAndDropElement = null;
-
+var oldSelectHandler = null;
 function mouseDownHandler(event) {
   var target = event.target;
   var actualTarget = target;
@@ -38,7 +38,7 @@ function mouseMoveHandler(event) {
   if (draggedElement != null) {
     if (dragAndDropElement == null) {
     dragAndDropElement = draggedElement.ctdlDnDElement();
-    dragAndDropElement.setAttribute("class", "draganddrop");
+    dragAndDropElement.className = "draganddrop";
     document.body.appendChild(dragAndDropElement);
     }
     var clientX = event.clientX+5;
@@ -59,19 +59,20 @@ function mouseMoveOut(event) {
   }
 }
 function setupDragDrop() {
-if (document.addEventListener != undefined) {
-     $(document.body).observe('mousedown', mouseDownHandler);
+  $(document.body).observe('mousedown', mouseDownHandler);
     $(document.body).observe('mouseup',mouseUpHandler);
     $(document.body).observe('mousemove',mouseMoveHandler);
     $(document.body).observe('mouseover', mouseMoveOver);
-    $(document.body).observe('mouseout', mouseMoveOut);
-    } 
+    $(document.body).observe('mouseout', mouseMoveOut); 
 }
 function turnOffTextSelect() {
   document.onmousedown = new Function("return false");
-document.onmouseup = new Function("return true");
+  document.onmouseup = new Function("return true");
+ oldSelectHandler = document.onselectstart;
+ document.onselectstart = function() { return false; };
 }
 function turnOnTextSelect() {
   document.onmousedown = null;
   document.onmouseup = null;
+  document.onselectstart = oldSelectHandler;
 }

diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 4e2d2976e31c094b12f2bcaa5d599fa46ec96513..f7397ed9836ae0f1464380afbf8dab5d8b3cb0cd 100644 (file)
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -214,7 +214,7 @@ function IconBarRoomList() {
   mailboxSPAN.appendChild(document.createTextNode(_mailbox));
   $(mailboxSPAN).observe('click', expandFloorEvent);
   mailboxLI.appendChild(mailboxSPAN);
-  mailboxLI.setAttribute("class", "floor");
+  mailboxLI.className = "floor";
   var mailboxUL = document.createElement("ul");
   mailboxLI.appendChild(mailboxUL);
   var mailboxRooms = GetMailboxRooms();
@@ -235,7 +235,7 @@ function IconBarRoomList() {
     floorSPAN.appendChild(document.createTextNode(name));
     $(floorSPAN).observe('click', expandFloorEvent);
     floorLI.appendChild(floorSPAN);
-    floorLI.setAttribute("class", "floor");
+    floorLI.className = "floor";
     var floorUL = document.createElement("ul");
     floorLI.appendChild(floorUL);
     var roomsForFloor = GetRoomsByFloorNum(floornum);

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 915b21a05bd4f6d2bb824a62b440c683242fc8c8..3312d05f16af802bcb3ce5296ccf6487e6650f28 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -1106,11 +1106,9 @@ dt { clear: both; }
 .imsg {
        text-align: center;
 }
-#summary_view table {
-/*    table-layout: fixed; stops long subjects overflowing */
-}
 #summary_view > table { /* hide from IE6 */
     width: 100%;
+    table-layout: fixed;
 }
 colgroup.entity {
        text-align: center;