From 7b4c1ac29d90c297b9b5e808f746b0643f8bed59 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 14 Aug 2006 20:32:30 +0000 Subject: [PATCH] Monotone-Parent: 29276051aae3738adb5fbfa6b52ffbc6eb8f3968 Monotone-Revision: 326d1c3e09ab40b1884b684c1cfb0feca9ae3c0d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-08-14T20:32:30 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/SchedulerUI.js | 9 ----- UI/WebServerResources/ContactsUI.css | 17 +++++++++ UI/WebServerResources/ContactsUI.js | 27 ++++++++++++++ UI/WebServerResources/MailerUI.js | 4 +-- UI/WebServerResources/SchedulerUI.js | 35 +++++++++++++++++++ UI/WebServerResources/UIxAppointmentEditor.js | 10 ++++++ 6 files changed, 91 insertions(+), 11 deletions(-) delete mode 100644 UI/Scheduler/SchedulerUI.js create mode 100644 UI/WebServerResources/SchedulerUI.js diff --git a/UI/Scheduler/SchedulerUI.js b/UI/Scheduler/SchedulerUI.js deleted file mode 100644 index 11d6d6f7d..000000000 --- a/UI/Scheduler/SchedulerUI.js +++ /dev/null @@ -1,9 +0,0 @@ -function newEvent(sender) { - var urlstr; - - urlstr = "new"; - window.open(urlstr, "SOGo_compose", - "width=680,height=520,resizable=1,scrollbars=1,toolbar=0," + - "location=0,directories=0,status=0,menubar=0,copyhistory=0"); - return false; /* stop following the link */ -} diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index d55be60f5..b5938be77 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/UI/WebServerResources/ContactsUI.css @@ -372,3 +372,20 @@ DIV#mailboxDragHandle right: 0px; height: .4em; } + +DIV.contactSelector +{ + position: absolute; + top: 0px; + bottom: 3em; + right: 0px; + left: 0px; +} + +DIV.contactSelection +{ + position: absolute; + height: 2.5em; + bottom: 0px; + right: 1em; +} diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 3c391ef8a..8f2614e19 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -808,3 +808,30 @@ function onSearchKeyDown(searchValue) searchValue.timer = setTimeout("onSearchFormSubmit()", 1000); } + +function onConfirmContactSelection() +{ + var rows = collectSelectedRows(); + + var folderLi = document.getElementById(currentContactFolder); + var currentContactFolderName = folderLi.innerHTML; + + for (i = 0; i < rows.length; i++) + { + var row = document.getElementById(rows[i]); +// opener.window.log (rows[i] + " selected."); +// opener.window.log (row.cells.length); + var cid = row.getAttribute("contactid"); + if (cid) + { + var cname = '' + row.getAttribute("contactname"); + opener.window.log('cid = ' + cid + '; cname = ' + cname ); + if (cid.length > 0) + opener.window.addContact(contactSelectorId, + cid, + currentContactFolderName + '/' + cname); + } + } + + return false; +} diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 20a140c1a..ca3cd9a34 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -225,9 +225,9 @@ function openAnais(sender) { function openAddressbook(sender) { var urlstr; - urlstr = "addressbook"; + urlstr = ApplicationBaseURL + "/../Contacts/select"; var w = window.open(urlstr, "Addressbook", - "width=600,height=400,left=10,top=10,toolbar=no," + + "width=640,height=400,left=10,top=10,toolbar=no," + "dependent=yes,menubar=no,location=no,resizable=yes," + "scrollbars=yes,directories=no,status=no"); w.focus(); diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js new file mode 100644 index 000000000..74771f321 --- /dev/null +++ b/UI/WebServerResources/SchedulerUI.js @@ -0,0 +1,35 @@ +function newEvent(sender) { + var urlstr; + + urlstr = "new"; + window.open(urlstr, "SOGo_compose", + "width=680,height=520,resizable=1,scrollbars=1,toolbar=0," + + "location=0,directories=0,status=0,menubar=0,copyhistory=0"); + return false; /* stop following the link */ +} + +function onContactRefresh(node) +{ + var parentNode = node.parentNode; + var contacts = ''; + var done = false; + + var currentNode = parentNode.firstChild; + while (currentNode && !done) + { + if (currentNode.nodeType == 1 + && currentNode.getAttribute("type") == "hidden") + { + contacts = currentNode.value; + done = true; + } + else + currentNode = currentNode.nextSibling; + } + + log ('contacts: ' + contacts); + if (contacts.length > 0) + window.location = ApplicationBaseURL + '/show?userUIDString=' + contacts; + + return false; +} diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js index 1de34b0ce..3c27bc34c 100644 --- a/UI/WebServerResources/UIxAppointmentEditor.js +++ b/UI/WebServerResources/UIxAppointmentEditor.js @@ -91,3 +91,13 @@ function validateAptEditor() { return true; } + +function submitMeeting(thisForm) { + var action = document.getElementById('jsaction'); + action.setAttribute("name", "save:method"); + action.setAttribute("value", "save"); + + thisForm.submit(); + opener.window.location.reload(); + window.close(); +}