kolab-webclient/dimp
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Tue Jan 11 01:11:29 CET 2011
kolab-webclient/dimp/patches/dimp-1.1.6/0003-acl-view.patch | 39 ----------
kolab-webclient/dimp/patches/dimp-1.1.6/0004-folders-view.patch | 10 --
kolab-webclient/dimp/patches/dimp-1.1.6/0005-itip-handling.patch | 11 --
kolab-webclient/dimp/patches/dimp-1.1.6/0006-copy-msgs-with-ctrl.patch | 11 --
4 files changed, 71 deletions(-)
New commits:
commit 9b23ee89ee9fbc352f79a6b496f277c40dacec8f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Jan 11 00:11:05 2011 +0000
These .orig files are a left-over from diff missing the point, remove them
diff --git a/kolab-webclient/dimp/patches/dimp-1.1.6/0003-acl-view.patch b/kolab-webclient/dimp/patches/dimp-1.1.6/0003-acl-view.patch
index d537ee6..648b6ce 100644
--- a/kolab-webclient/dimp/patches/dimp-1.1.6/0003-acl-view.patch
+++ b/kolab-webclient/dimp/patches/dimp-1.1.6/0003-acl-view.patch
@@ -9,26 +9,6 @@ diff -ur dimp-h3-1.1.6-0002-close-context-menu/js/DimpBase.js dimp-h3-1.1.6/js/D
[ 'ctx_folder_seen', 'ctx_folder_unseen' ].each(function(a) {
C({ d: $(a), f: function(type) { this.flag(type, null, DimpCore.DMenu.element().readAttribute('mbox')); }.bind(this, a == 'ctx_folder_seen' ? 'allSeen' : 'allUnseen'), ns: true });
}, this);
-diff -ur dimp-h3-1.1.6-0002-close-context-menu/js/DimpBase.js.orig dimp-h3-1.1.6/js/DimpBase.js.orig
---- dimp-h3-1.1.6-0002-close-context-menu/js/DimpBase.js.orig 2011-01-10 23:49:33.895945000 +0000
-+++ dimp-h3-1.1.6/js/DimpBase.js.orig 2011-01-10 23:50:59.238945002 +0000
-@@ -1510,6 +1510,7 @@
-
- case 'folder':
- case 'special':
-+ DimpCore.DMenu.close();
- e.stop();
- return this.go('folder:' + li.readAttribute('mbox'));
- break;
-@@ -1887,7 +1888,7 @@
- tmp = $('applicationfolders');
- if (tmp) {
- tmp.select('ul li.custom a').each(function(s) {
-- C({ d: s, f: this.go.bind(this, 'app:' + s.readAttribute('app')) });
-+ C({ d: s, f: function(data){DimpCore.DMenu.close(); this.go('app:' + s.readAttribute('app'), data)}.bind(this) });
- }, this);
- }
-
diff -ur dimp-h3-1.1.6-0002-close-context-menu/lib/DIMP.php dimp-h3-1.1.6/lib/DIMP.php
--- dimp-h3-1.1.6-0002-close-context-menu/lib/DIMP.php 2011-01-10 23:49:33.897945000 +0000
+++ dimp-h3-1.1.6/lib/DIMP.php 2011-01-10 23:52:13.910945003 +0000
@@ -40,25 +20,6 @@ diff -ur dimp-h3-1.1.6-0002-close-context-menu/lib/DIMP.php dimp-h3-1.1.6/lib/DI
'sortthread' => SORTTHREAD,
'sortdate' => SORTDATE,
-diff -ur dimp-h3-1.1.6-0002-close-context-menu/lib/DIMP.php.orig dimp-h3-1.1.6/lib/DIMP.php.orig
---- dimp-h3-1.1.6-0002-close-context-menu/lib/DIMP.php.orig 2010-09-27 19:14:30.000000000 +0100
-+++ dimp-h3-1.1.6/lib/DIMP.php.orig 2011-01-10 23:49:33.897945000 +0000
-@@ -436,8 +436,13 @@
- }
-
- if ($elt['user_icon']) {
-- $ob->cl = 'custom';
-- $ob->i = Horde::img($elt['icon'], $elt['alt'], '', $elt['icondir']);
-+ $ob->cl = 'customimg';
-+ $dir = empty($elt['icondir'])
-+ ? $GLOBALS['registry']->getImageDir()
-+ : $elt['icondir'];
-+ $ob->i = empty($dir)
-+ ? $elt['icon']
-+ : $dir . '/' . $elt['icon'];
- }
-
- return $ob;
diff -ur dimp-h3-1.1.6-0002-close-context-menu/po/de_DE.po dimp-h3-1.1.6/po/de_DE.po
--- dimp-h3-1.1.6-0002-close-context-menu/po/de_DE.po 2010-10-25 13:50:13.000000000 +0100
+++ dimp-h3-1.1.6/po/de_DE.po 2011-01-10 23:52:13.910945003 +0000
diff --git a/kolab-webclient/dimp/patches/dimp-1.1.6/0004-folders-view.patch b/kolab-webclient/dimp/patches/dimp-1.1.6/0004-folders-view.patch
index d448885..78025a3 100644
--- a/kolab-webclient/dimp/patches/dimp-1.1.6/0004-folders-view.patch
+++ b/kolab-webclient/dimp/patches/dimp-1.1.6/0004-folders-view.patch
@@ -29,13 +29,3 @@ diff -ur dimp-h3-1.1.6-0003-acl-view/po/de_DE.po dimp-h3-1.1.6/po/de_DE.po
#: lib/Views/ShowMessage.php:295
#, php-format
msgid "%d Attachment"
-diff -ur dimp-h3-1.1.6-0003-acl-view/po/de_DE.po.orig dimp-h3-1.1.6/po/de_DE.po.orig
---- dimp-h3-1.1.6-0003-acl-view/po/de_DE.po.orig 2010-10-25 13:50:13.000000000 +0100
-+++ dimp-h3-1.1.6/po/de_DE.po.orig 2011-01-10 23:52:13.910945003 +0000
-@@ -798,3 +798,6 @@
- #: lib/DIMP.php:216
- msgid "results found"
- msgstr "Ergebnisse gefunden"
-+
-+msgid "Share Folder"
-+msgstr "Berechtigungen"
diff --git a/kolab-webclient/dimp/patches/dimp-1.1.6/0005-itip-handling.patch b/kolab-webclient/dimp/patches/dimp-1.1.6/0005-itip-handling.patch
index e3a5e7a..ffdcdab 100644
--- a/kolab-webclient/dimp/patches/dimp-1.1.6/0005-itip-handling.patch
+++ b/kolab-webclient/dimp/patches/dimp-1.1.6/0005-itip-handling.patch
@@ -56,14 +56,3 @@ diff -ur dimp-h3-1.1.6-0004-folders-view/js/DimpBase.js dimp-h3-1.1.6/js/DimpBas
/* Flag actions for message list. */
flag: function(action, index, folder)
{
-diff -ur dimp-h3-1.1.6-0004-folders-view/js/DimpBase.js.orig dimp-h3-1.1.6/js/DimpBase.js.orig
---- dimp-h3-1.1.6-0004-folders-view/js/DimpBase.js.orig 2011-01-10 23:50:59.238945002 +0000
-+++ dimp-h3-1.1.6/js/DimpBase.js.orig 2011-01-10 23:52:13.909945003 +0000
-@@ -1926,6 +1926,7 @@
- C({ d: $('ctx_folder_rename'), f: function() { this.renameFolder(DimpCore.DMenu.element()); }.bind(this), ns: true });
- C({ d: $('ctx_folder_empty'), f: function() { if (window.confirm(DIMP.text.empty_folder)) { DimpCore.doAction('EmptyFolder', { folder: DimpCore.DMenu.element().readAttribute('mbox') }, [], this._emptyFolderCallback.bind(this)); } }.bind(this), ns: true });
- C({ d: $('ctx_folder_delete'), f: function() { if (window.confirm(DIMP.text.delete_folder)) { DimpCore.doAction('DeleteFolder', { folder: DimpCore.DMenu.element().readAttribute('mbox') }, [], this.bcache.get('folderC') || this.bcache.set('folderC', this._folderCallback.bind(this))); } }.bind(this), ns: true });
-+ C({ d: $('ctx_folder_rights'), f: function() { this.go('app:horde', DIMP.conf.folder_rights + '&' + $H({ folder: DimpCore.DMenu.element().readAttribute('mbox') }).toQueryString() ) }.bind(this), ns: true });
- [ 'ctx_folder_seen', 'ctx_folder_unseen' ].each(function(a) {
- C({ d: $(a), f: function(type) { this.flag(type, null, DimpCore.DMenu.element().readAttribute('mbox')); }.bind(this, a == 'ctx_folder_seen' ? 'allSeen' : 'allUnseen'), ns: true });
- }, this);
diff --git a/kolab-webclient/dimp/patches/dimp-1.1.6/0006-copy-msgs-with-ctrl.patch b/kolab-webclient/dimp/patches/dimp-1.1.6/0006-copy-msgs-with-ctrl.patch
index 610c11c..fd3b350 100644
--- a/kolab-webclient/dimp/patches/dimp-1.1.6/0006-copy-msgs-with-ctrl.patch
+++ b/kolab-webclient/dimp/patches/dimp-1.1.6/0006-copy-msgs-with-ctrl.patch
@@ -616,14 +616,3 @@ diff -ur dimp-h3-1.1.6-0005-itip-handling/lib/DIMP.php dimp-h3-1.1.6/lib/DIMP.ph
'moveto' => _("Move %s to %s"),
'baselevel' => _("base level of the folder tree"),
'cancel' => _("Cancel"),
-diff -ur dimp-h3-1.1.6-0005-itip-handling/lib/DIMP.php.orig dimp-h3-1.1.6/lib/DIMP.php.orig
---- dimp-h3-1.1.6-0005-itip-handling/lib/DIMP.php.orig 2011-01-10 23:49:33.897945000 +0000
-+++ dimp-h3-1.1.6/lib/DIMP.php.orig 2011-01-10 23:52:13.910945003 +0000
-@@ -166,6 +166,7 @@
- 'message_url' => Horde::url($dimp_webroot . '/message.php'),
- 'compose_url' => Horde::url($dimp_webroot . '/compose.php'),
- 'prefs_url' => str_replace('&', '&', Horde::getServiceLink('options', 'dimp')),
-+ 'folder_rights' => Util::addParameter(Horde::url($registry->get('webroot', 'imp') . '/acl.php', true), array('app' => 'imp', 'group'=> 'acl'), null, false),
-
- 'sortthread' => SORTTHREAD,
- 'sortdate' => SORTDATE,
More information about the commits
mailing list