wilde: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.4, 1.32.2.4.2.1
cvs at kolab.org
cvs at kolab.org
Wed Apr 22 17:42:23 CEST 2009
Author: wilde
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv16955/patches/horde-webmail/1.2.0
Modified Files:
Tag: suc_branch
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Added Boris patch for kolab/issue3329
improving placement of invitation handling popup menu
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.4.2.1
diff -u -d -r1.32.2.4 -r1.32.2.4.2.1
--- horde-webmail-1.2.0_kolab_openpkg.patch 2 Apr 2009 09:51:33 -0000 1.32.2.4
+++ horde-webmail-1.2.0_kolab_openpkg.patch 22 Apr 2009 15:42:21 -0000 1.32.2.4.2.1
@@ -20022,3 +20022,52 @@
}
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>';
+ }
+ }
+
More information about the commits
mailing list