summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kolab-webclient/kolab-webclient.spec4
-rw-r--r--patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch49
-rw-r--r--patches/horde-webmail/1.2.0/merges/issue3329.patch49
-rw-r--r--patches/horde-webmail/1.2.0/merges/series1
4 files changed, 101 insertions, 2 deletions
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index 725f497..1bfea53 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -3,12 +3,12 @@
%define V_package kolab-webclient
%define V_year 2009
%define V_month 04
-%define V_day 02
+%define V_day 22
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release %{V_year}%{V_month}%{V_day}
+%define V_release %{V_year}%{V_month}%{V_day}suc01
# Package Information
Name: %{V_package}
diff --git a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
index 697cf19..cb6fe48 100644
--- a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
+++ b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
@@ -20022,3 +20022,52 @@ diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/H
}
Diff finished. Wed Feb 18 17:55:20 2009
+diff --git a/horde-webmail/imp/lib/MIME/Viewer/itip.php b/horde-webmail/imp/lib/MIME/Viewer/itip.php
+index 3227519..48769a2 100644
+--- a/horde-webmail/imp/lib/MIME/Viewer/itip.php
++++ b/horde-webmail/imp/lib/MIME/Viewer/itip.php
+@@ -752,8 +752,6 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer {
+ }
+
+ $script = 'if (DIMP.baseWindow) {var B = DIMP.baseWindow.DimpBase;} else {B = DimpBase;};DimpCore.addMouseEvents({ id: \'button_invitation_cont\', type: \'itippopdown\', offset: \'button_invitation_cont\', left: true});';
+- $script .= '[ \'acceptimport\', \'import\', \'accept\', \'tentative\', \'deny\', \'update\', \'send\' ].each(function(a) {var d = $(\'ctx_itippopdown_\' + a); if (d) { DimpCore.clickObserveHandler({ d: d, f: function(a) { B.itip(a, DIMP.conf.msg_index, DIMP.conf.msg_folder, ' . $id . '); window.close(); }.curry(a) })}})';
+-
+ $html .= '<div><span id="button_invitation_cont">' . _createMEntry(_("Invitation"), 'kronolith.png', 'button_invitation', 'hasmenu', true, 'kronolith') . Horde::img('popdown.png', '', array(), $GLOBALS['registry']->getImageDir('dimp')) . '</span></div><p/><script type="text/javascript">' . $script . '</script>';
+
+ if ($this->_msgs) {
+@@ -866,14 +864,30 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer {
+ $html .= '</select> <input type="submit" class="button" value="' . _("Go") . '" />';
+
+ } else if ($_SESSION['imp']['viewmode'] == 'dimp') {
++ // the div of the context menu
++ $script = "var itipContextMenu = document.createElement('div');\n";
++ $script .= "itipContextMenu.setAttribute('class', 'context');\n";
++ $script .= "itipContextMenu.setAttribute('id', 'ctx_itippopdown');\n";
++ $script .= "itipContextMenu.setAttribute('style', 'display:none');\n";
+
+- $html .= '<div class="context" id="ctx_itippopdown">';
+-
++ // all the context menu items
+ foreach ($options as $key => $description) {
+- $html .= '<div>' . _createMEntry($description, 'kronolith.png', 'ctx_itippopdown_' . $key, '', true, 'kronolith') . '</div>';
++ $script .= "var itipContextMenuItem = document.createElement('a');\n";
++ $script .= "itipContextMenuItem.setAttribute('id', 'ctx_itippopdown" . $key . "');\n";
++ $script .= "var linkText = document.createTextNode('" . $description . "');\n";
++ $script .= "itipContextMenuItem.appendChild(linkText);\n";
++ $script .= "itipContextMenu.appendChild(itipContextMenuItem);\n";
++ $script .= "var d = $(itipContextMenuItem);\n";
++ $script .= "DimpCore.clickObserveHandler({ d: d,\n";
++ $script .= " f: function(a) {\n";
++ $script .= " B.itip(a, DIMP.conf.msg_index, DIMP.conf.msg_folder, '" . $id . "');\n";
++ $script .= " window.close();\n";
++ $script .= " }.curry('" . $key . "'),\n";
++ $script .= " ns: true,\n";
++ $script .= " });\n";
+ }
+-
+- $html .= '</div>';
++ $script .= "document.getElementById('dimpPage').appendChild(itipContextMenu);\n";
++ $html .= '<script type="text/javascript">' . $script . '</script>';
+ }
+ }
+
diff --git a/patches/horde-webmail/1.2.0/merges/issue3329.patch b/patches/horde-webmail/1.2.0/merges/issue3329.patch
new file mode 100644
index 0000000..80f38a7
--- /dev/null
+++ b/patches/horde-webmail/1.2.0/merges/issue3329.patch
@@ -0,0 +1,49 @@
+diff --git a/horde-webmail/imp/lib/MIME/Viewer/itip.php b/horde-webmail/imp/lib/MIME/Viewer/itip.php
+index 3227519..48769a2 100644
+--- a/horde-webmail/imp/lib/MIME/Viewer/itip.php
++++ b/horde-webmail/imp/lib/MIME/Viewer/itip.php
+@@ -752,8 +752,6 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer {
+ }
+
+ $script = 'if (DIMP.baseWindow) {var B = DIMP.baseWindow.DimpBase;} else {B = DimpBase;};DimpCore.addMouseEvents({ id: \'button_invitation_cont\', type: \'itippopdown\', offset: \'button_invitation_cont\', left: true});';
+- $script .= '[ \'acceptimport\', \'import\', \'accept\', \'tentative\', \'deny\', \'update\', \'send\' ].each(function(a) {var d = $(\'ctx_itippopdown_\' + a); if (d) { DimpCore.clickObserveHandler({ d: d, f: function(a) { B.itip(a, DIMP.conf.msg_index, DIMP.conf.msg_folder, ' . $id . '); window.close(); }.curry(a) })}})';
+-
+ $html .= '<div><span id="button_invitation_cont">' . _createMEntry(_("Invitation"), 'kronolith.png', 'button_invitation', 'hasmenu', true, 'kronolith') . Horde::img('popdown.png', '', array(), $GLOBALS['registry']->getImageDir('dimp')) . '</span></div><p/><script type="text/javascript">' . $script . '</script>';
+
+ if ($this->_msgs) {
+@@ -866,14 +864,30 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer {
+ $html .= '</select> <input type="submit" class="button" value="' . _("Go") . '" />';
+
+ } else if ($_SESSION['imp']['viewmode'] == 'dimp') {
++ // the div of the context menu
++ $script = "var itipContextMenu = document.createElement('div');\n";
++ $script .= "itipContextMenu.setAttribute('class', 'context');\n";
++ $script .= "itipContextMenu.setAttribute('id', 'ctx_itippopdown');\n";
++ $script .= "itipContextMenu.setAttribute('style', 'display:none');\n";
+
+- $html .= '<div class="context" id="ctx_itippopdown">';
+-
++ // all the context menu items
+ foreach ($options as $key => $description) {
+- $html .= '<div>' . _createMEntry($description, 'kronolith.png', 'ctx_itippopdown_' . $key, '', true, 'kronolith') . '</div>';
++ $script .= "var itipContextMenuItem = document.createElement('a');\n";
++ $script .= "itipContextMenuItem.setAttribute('id', 'ctx_itippopdown" . $key . "');\n";
++ $script .= "var linkText = document.createTextNode('" . $description . "');\n";
++ $script .= "itipContextMenuItem.appendChild(linkText);\n";
++ $script .= "itipContextMenu.appendChild(itipContextMenuItem);\n";
++ $script .= "var d = $(itipContextMenuItem);\n";
++ $script .= "DimpCore.clickObserveHandler({ d: d,\n";
++ $script .= " f: function(a) {\n";
++ $script .= " B.itip(a, DIMP.conf.msg_index, DIMP.conf.msg_folder, '" . $id . "');\n";
++ $script .= " window.close();\n";
++ $script .= " }.curry('" . $key . "'),\n";
++ $script .= " ns: true,\n";
++ $script .= " });\n";
+ }
+-
+- $html .= '</div>';
++ $script .= "document.getElementById('dimpPage').appendChild(itipContextMenu);\n";
++ $html .= '<script type="text/javascript">' . $script . '</script>';
+ }
+ }
+
diff --git a/patches/horde-webmail/1.2.0/merges/series b/patches/horde-webmail/1.2.0/merges/series
index 41da374..418a8ed 100644
--- a/patches/horde-webmail/1.2.0/merges/series
+++ b/patches/horde-webmail/1.2.0/merges/series
@@ -1 +1,2 @@
t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff
+issue3329.patch