merge of '41c1c07c9e64afed10d305ba098bdffb69a7e77d'

and '4bfa73f8df33a1fad6c74b0321872b8b41b526fa'

Monotone-Parent: 41c1c07c9e64afed10d305ba098bdffb69a7e77d
Monotone-Parent: 4bfa73f8df33a1fad6c74b0321872b8b41b526fa
Monotone-Revision: 26b5f40103235f325bd04edf2ca9fe43ad924990

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-14T14:37:43
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -3,6 +3,12 @@
 	* UI/Common/UIxPageFrame.m (_stringsForFramework:): use the system
 	default when the active user does not resolve.
 
+2009-12-11  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* Added a patch from Albrecht Gebhardt <albrecht.gebhardt@algepop.net>
+	that offers a "Reload" button in the Web contacts 
+	management module.
+
 2009-12-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/PreferencesUI/UIxPreferences.m (-setUserShortDateFormat:):

UI/Contacts/Toolbars/SOGoContactFolder.toolbar

@@ -30,5 +30,10 @@
      onclick = "return onToolbarDeleteSelectedContacts(this);";
      image="tb-mail-delete-flat-24x24.png";
      tooltip = "Delete selected card or address book"; }
-  )
+  ),
+  ( { link = "#";
+      label = "Reload";
+      onclick = "return onContactsReload();";
+      image = "calendar-reload.png";
+      tooltip = "Reload all contacts"; } )
 )

UI/WebServerResources/ContactsUI.js

@@ -1298,4 +1298,8 @@ function dropSelectedContacts (action, toId) {
 }
 
 
+function onContactsReload () {
+    openContactsFolder(Contact.currentAddressBook, true);
+}
+
 document.observe("dom:loaded", initContacts);