amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-06 12:30:31 +00:00
Code Issues Projects Releases Wiki Activity

merge of '45aca387e14de293ad62e303a3c8c06620805e6c'

Browse Source 
and '9cbe6e6f1780024d4dcb37d4ce3de593f9c91828'

Monotone-Parent: 45aca387e14de293ad62e303a3c8c06620805e6c
Monotone-Parent: 9cbe6e6f1780024d4dcb37d4ce3de593f9c91828
Monotone-Revision: 81b84aa1dccb31c15c94976cc8ed486e6a1efd9a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-08-17T21:33:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-08-17 21:33:55 +00:00
parent 0444386ef9 be7be5bc93
commit e99cb37de3
8 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/ContactsUI.js
+9 -1
View File
@@ -1037,9 +1037,17 @@ function onDocumentKeydown(event) {
}
}
function fixSearchFieldPosition () {
var panel = $("filterPanel");
panel.style.position = "relative";
panel.style.top = "3px";
}
function initContacts(event) {
if ($(document.body).hasClassName("popup"))
if ($(document.body).hasClassName("popup")) {
configureSelectionButtons();
fixSearchFieldPosition ();
}
else if (Prototype.Browser.Gecko)
Event.observe(document, "keypress", onDocumentKeydown); // for FF2
else
UI/WebServerResources/SchedulerUI.js
+10 -4
View File
@@ -7,7 +7,7 @@ var listFilter = 'view_today';
var listOfSelection = null;
var selectedCalendarCell;
var showCompletedTasks = 0;
var showCompletedTasks;;
var currentDay = '';
@@ -1354,9 +1354,12 @@ function refreshEvents() {
+ "&filterpopup=" + listFilter);
}
function refreshTasks() {
function refreshTasks(setUserDefault) {
var url = "taskslist?show-completed=" + showCompletedTasks;
if (setUserDefault == 1)
url += "&setud=1";
refreshAlarms();
return _loadTasksHref("taskslist?show-completed=" + showCompletedTasks);
return _loadTasksHref(url);
}
function refreshEventsAndDisplay() {
@@ -1560,7 +1563,7 @@ function changeMonthCalendarDisplayOfSelectedDay(node) {
function onShowCompletedTasks(event) {
showCompletedTasks = (this.checked ? 1 : 0);
return refreshTasks();
return refreshTasks(1);
}
function updateTaskStatus(event) {
@@ -2039,6 +2042,8 @@ function configureLists() {
var input = $("showHideCompletedTasks");
input.observe("click", onShowCompletedTasks);
if (showCompletedTasks)
input.checked = true;
list = $("eventsList");
list.multiselect = true;
@@ -2123,6 +2128,7 @@ function drawNowLine () {
function initCalendars() {
sorting["attribute"] = "start";
sorting["ascending"] = true;
showCompletedTasks = UserDefaults['ShowCompletedTasks'];
if (!$(document.body).hasClassName("popup")) {
var node = $("filterpopup");