See ChangeLog.

Monotone-Parent: 6bb1bd2b9a63daae8f56da56b2ba72ac8bad2d3e
Monotone-Revision: bc6a066b0ed99cc7226c2f6c089a4ed6987ee423

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-09-23T19:25:56
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/SchedulerUI.js

@@ -36,7 +36,24 @@ var clipboard = null;
 var eventsToCopy = [];
 
 function newEvent(type, day, hour, duration) {
-    var folder = getSelectedFolder();
+    var folder = null;
+    if (UserDefaults['SOGoDefaultCalendar'] == 'personal')
+        folder = $("calendarList").down("li");
+    else if (UserDefaults['SOGoDefaultCalendar'] == 'first') {
+        var list = $("calendarList");
+        var inputs = list.select("input");
+        for (var i = 0; i < inputs.length; i++) {
+            var input = inputs[i];
+            if (input.checked) {
+                folder = input.up();
+                break;
+            }
+        }
+        if (!folder)
+            folder = list.down("li");
+    }
+    else
+        folder = getSelectedFolder();
     var folderID = folder.readAttribute("id");
     var urlstr = ApplicationBaseURL + folderID + "/new" + type;
     var params = [];
@@ -908,7 +925,7 @@ function eventsListCallback(http) {
                 if (rTime)
                     row.recurrenceTime = escape(rTime);
                 row.isException = data[i][17];
-                row.editable = data[i][18];
+                row.editable = data[i][18] || IsSuperUser;
                 row.erasable = data[i][19] || IsSuperUser;
                 var startDate = new Date();
                 startDate.setTime(data[i][5] * 1000);

UI/WebServerResources/UIxPreferences.css

@@ -51,7 +51,7 @@ DIV.listWrapper
 #calendarCategoriesListWrapper
 { bottom: 30px;
   right: 2em;
-  top: 88px;
+  top: 108px;
   left: 2em; }
 
 #contactsCategoriesListWrapper

UI/WebServerResources/UIxPreferences.js

@@ -88,7 +88,7 @@ function _setupEvents() {
     var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
                     "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
                     "firstWeek", "messageCheck", "sortByThreads", 
-                    "subscribedFoldersOnly", "language" ];
+                    "subscribedFoldersOnly", "language", "defaultCalendar" ];
     for (var i = 0; i < widgets.length; i++) {
         var widget = $(widgets[i]);
         if (widget) {