merge of '7d3304b769784beb1122a7a8507098f0d966fc4d'

and 'cff25745ccc8bc7caca33ea99cd3b32e15d60a4e'

Monotone-Parent: 7d3304b769784beb1122a7a8507098f0d966fc4d
Monotone-Parent: cff25745ccc8bc7caca33ea99cd3b32e15d60a4e
Monotone-Revision: 25ef4774f63414bacd7d7a784ee1c61d318f7003

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-28T20:10:30
Monotone-Branch: ca.inverse.sogo

UI/Templates/SchedulerUI/UIxCalDateSelector.wox

@@ -36,11 +36,10 @@
           ></var:month-label>
       <var:month-title class="contentStyle"
         ><span var:class="extraStyle"
-          ><a href="#"
-            onclick="return onDaySelect(this);"
 	       var:day="currentDay.shortDateString" 
-            ><var:string value="currentDay.dayOfMonth"/></a
+	       onclick="return onDaySelect(this);"
-            ></span
+          ><var:string value="currentDay.dayOfMonth"/>
+            </
           ></var:month-title
         ></var:month-overview>
   </div>

UI/WebServerResources/HTMLElement.js

@@ -1,8 +1,7 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* custom extensions to the DOM api */
-Element.addMethods(
+Element.addMethods({
-{
         addInterface: function(element, objectInterface) {
             element = $(element);
             Object.extend(element, objectInterface);
@@ -121,7 +120,7 @@ Element.addMethods(
 
         onContextMenu: function(element, event) {
             element = $(element);
-
+            Event.stop(event);
             if (document.currentPopupMenu)
                 hideMenu(document.currentPopupMenu);
     

UI/WebServerResources/SchedulerUI.css

@@ -220,41 +220,40 @@ TABLE#dateSelectorTable
 #dateSelector TABLE,
 #dateSelector TABLE TABLE
 { border-collapse: collapse;
+  text-align: center;
   margin: 0px auto;
   width: 100%; }
 
-#dateSelector TABLE#dateSelectorTable TD TABLE TD
+TABLE#dateSelectorTable TD TABLE TD
-{ width: 0px; /* temp hack */ }
+{ width: 5px; /* temp hack */ }
 
-#dateSelector TABLE#dateSelectorTable TD TABLE TD.activeDay,
+TABLE#dateSelectorTable TD TABLE TD.activeDay,
-#dateSelector TABLE#dateSelectorTable TD TABLE TD.inactiveDay,
+TABLE#dateSelectorTable TD TABLE TD.inactiveDay,
-#dateSelector TABLE#dateSelectorTable TD TABLE TD.dayOfToday
+TABLE#dateSelectorTable TD TABLE TD.dayOfToday
-{ width: 1em; }
+{ width: 100%; }
 
-#dateSelector TABLE TABLE TD
+#dateSelector TABLE TABLE TD.activeDay,
+#dateSelector TABLE TABLE TD.inactiveDay,
+#dateSelector TABLE TABLE TD.dayOfToday
 { cursor: pointer;
   margin: 0px;
   padding: 0px;
-  border: 1px solid #fff; 
+  border: 1px solid #fff; }
-  text-align: center; }
 
-#dateSelector TABLE TABLE TD:hover
+#dateSelectorTable TABLE TD.activeDay:hover,
+#dateSelectorTable TABLE TD.inactiveDay:hover
 { border: 1px solid #deebf7; }
 
-#dateSelector TD SPAN
+#dateSelectorTable TABLE TD.activeDay:active,
-{ text-align: center;
+#dateSelectorTable TABLE TD.inactiveDay:active
-  display: block; }
+{ background-color: #ddd; }
 
-#dateSelector TD SPAN A
+#dateSelectorTable TD SPAN
-{ color: #000;
+{ display: block;
-  background: inherit;
+  color: #000;
-  text-decoration: none; }
+  background: inherit; }
 
-#dateSelector TD:active
+#dateSelector TD.inactiveDay SPAN
-{ background-color: #ddd;
-  border: 1px solid #deebf7; }
-
-#dateSelector TD.inactiveDay A
 { color: #dedfde; }
 
 #dateSelector TD.dayOfToday
@@ -264,7 +263,7 @@ TABLE#dateSelectorTable
 #dateSelector TD.dayOfToday._selected
 { background-color: #4b6983; }
 
-#dateSelector TD._selected A
+#dateSelectorTable TABLE TD._selected SPAN
 { color: #fff; }
 
 TABLE#eventsList

UI/WebServerResources/SchedulerUI.js

@@ -804,9 +804,9 @@ function changeCalendarDisplay(data, newView) {
                     document.selectedDate.deselect();
 	
                 // Select day in date selector
-                var selectedLink = $$('table#dateSelectorTable a[day='+day+']');
+                var selectedLink = $$('table#dateSelectorTable span[day='+day+']');
                 if (selectedLink.length > 0) {
-                    selectedCell = selectedLink[0].up(1);
+                    selectedCell = selectedLink[0].getParentWithTagName("td");
                     selectedCell.selectElement();
                     document.selectedDate = selectedCell;
                 }
@@ -1178,8 +1178,7 @@ function calendarDisplayCallback(http) {
             observer = $("monthDaysView");
         }
         initMenu($("currentViewMenu"), menu);
-        observer.observe("contextmenu", function(event) {
+        observer.observe("contextmenu", onMenuCurrentView);
-                popupMenu(event, 'currentViewMenu', this); });
 		
         var contentView;
         if (currentView == "monthview")
@@ -1766,6 +1765,10 @@ function onMenuSharing(event) {
     }
 }
 
+function onMenuCurrentView(event) {
+    popupMenu(event, 'currentViewMenu', this);
+}
+
 function configureDragHandles() {
     var handle = $("verticalDragHandle");
     if (handle) {
@@ -1784,7 +1787,7 @@ function configureDragHandles() {
 
 function initCalendarSelector() {
     var selector = $("calendarSelector");
-    updateCalendarStatus();
+    updateCalendarStatus(); // triggers the initial events refresh
     selector.changeNotification = updateCalendarsList;
 
     var list = $("calendarList");

UI/WebServerResources/generic.js

@@ -668,6 +668,7 @@ function popupMenu(event, menuId, target) {
         if (!popup.prepareVisibility())
             isVisible = false;
 
+    Event.stop(event);
     if (isVisible) {
         popup.setStyle({ top: menuTop + "px",
                     left: menuLeft + "px",
@@ -678,7 +679,6 @@ function popupMenu(event, menuId, target) {
         $(document.body).observe("click", onBodyClickMenuHandler);
     }
 	
-	Event.stop(event);
 }
 
 function getParentMenu(node) {