From c6329f56a5d40cc21ddd2357b755b2b9dd4ba096 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 4 Oct 2007 17:26:21 +0000 Subject: [PATCH] Monotone-Parent: dc2b0827f3e72cd80a1a6e0907d7f31d9eabcdf3 Monotone-Revision: 40d064d504a6fa3becd0151859c8b0878ef027e9 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-10-04T17:26:21 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/English.lproj/Localizable.strings | 2 +- UI/Scheduler/French.lproj/Localizable.strings | 2 +- UI/WebServerResources/SchedulerUI.js | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index fde04128b..69afbd28c 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -410,5 +410,5 @@ validate_endbeforestart = "Enddate is before startdate!"; "Location" = "Location"; "(Private Event)" = "(Private Event)"; -"closeThisWindowMessage" = "Thank you! You may now close this window."; +"closeThisWindowMessage" = "Thank you! You may now close this window or view your "; "Multicolumn Day View" = "Multicolumn Day View"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index ce1107256..3adda5cff 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -409,5 +409,5 @@ validate_endbeforestart = "La date de fin est avant la date de début !"; "Location" = "Lieu"; "(Private Event)" = "(Événement privé)"; -"closeThisWindowMessage" = "Merci! Vous pouvez maintenant fermer cette fenêtre."; +"closeThisWindowMessage" = "Merci! Vous pouvez maintenant fermer cette fenêtre ou consulter votre "; "Multicolumn Day View" = "Multicolonne"; diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index e8baa1f43..af65b80e6 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -165,15 +165,21 @@ function modifyEvent(sender, modification) { function closeInvitationWindow() { var closeDiv = document.createElement("div"); + document.body.appendChild(closeDiv); closeDiv.addClassName("javascriptPopupBackground"); + var closePseudoWin = document.createElement("div"); + document.body.appendChild(closePseudoWin); closePseudoWin.addClassName("javascriptMessagePseudoTopWindow"); closePseudoWin.style.top = "0px;"; closePseudoWin.style.left = "0px;"; closePseudoWin.style.right = "0px;"; closePseudoWin.appendChild(document.createTextNode(labels["closeThisWindowMessage"])); - document.body.appendChild(closeDiv); - document.body.appendChild(closePseudoWin); + + var calLink = document.createElement("a"); + closePseudoWin.appendChild(calLink); + calLink.href = ApplicationBaseURL; + calLink.appendChild(document.createTextNode(labels["Calendar"].toLowerCase())); } function modifyEventCallback(http) { @@ -958,7 +964,7 @@ function onListFilterChange() { return refreshEvents(); } -function onEventClick(event) { +function onEventClick(event) { log ("onEventClick"); var day = this.day; var hour = this.hour; @@ -1035,7 +1041,7 @@ function onSearchFormSubmit() { function onCalendarSelectEvent() { var list = $("eventsList"); - list.deselectAll(); + list.tBodies[0].deselectAll(); if (selectedCalendarCell) for (var i = 0; i < selectedCalendarCell.length; i++)