wilde: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.14, 1.32.2.15
cvs at kolab.org
cvs at kolab.org
Thu Oct 15 17:15:06 CEST 2009
Author: wilde
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv801/patches/horde-webmail/1.2.0
Modified Files:
Tag: kolab_2_2_branch
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Fix to close context menu in dimp on outside clicks. (Merged from suc branch)
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.14
retrieving revision 1.32.2.15
diff -u -d -r1.32.2.14 -r1.32.2.15
--- horde-webmail-1.2.0_kolab_openpkg.patch 13 Oct 2009 13:24:07 -0000 1.32.2.14
+++ horde-webmail-1.2.0_kolab_openpkg.patch 15 Oct 2009 15:15:03 -0000 1.32.2.15
@@ -14254,11 +14254,12 @@
---
horde-webmail/kronolith/attendees.php | 18 +++++
horde-webmail/kronolith/config/prefs.php.dist | 8 ++
+ horde-webmail/kronolith/po/de_DE.po | 6 ++
horde-webmail/kronolith/savedattlist.php | 77 ++++++++++++++++++++
.../kronolith/templates/attendees/attendees.inc | 2 +
.../templates/javascript/open_savedattlist_win.js | 36 +++++++++
.../templates/savedattlist/savedattlist.inc | 68 +++++++++++++++++
- 6 files changed, 209 insertions(+), 0 deletions(-)
+ 7 files changed, 215 insertions(+), 0 deletions(-)
diff --git a/horde-webmail/kronolith/attendees.php b/horde-webmail/kronolith/attendees.php
index a2d8b3e..e1b15c0 100644
@@ -14312,6 +14313,20 @@
+ 'type' => 'implicit',
+ 'desc' => _("A saved list of attendees")
+);
+diff --git a/horde-webmail/kronolith/po/de_DE.po b/horde-webmail/kronolith/po/de_DE.po
+index 2b555a2..68ed35c 100644
+--- a/horde-webmail/kronolith/po/de_DE.po
++++ b/horde-webmail/kronolith/po/de_DE.po
+@@ -2674,3 +2674,9 @@ msgstr "Jahr(e) am gleichen Jahrestag"
+ #: templates/view/view.inc:116 templates/edit/edit.inc:271
+ msgid "year(s) on the same weekday and month of the year"
+ msgstr "Jahr(e) am gleichen Wochentag und Monat des Jahres"
++
++msgid "Load Attendee List"
++msgstr "Teilnehmerliste laden"
++
++msgid "Save Attendee List"
++msgstr "Teilnehmerliste speichern"
diff --git a/horde-webmail/kronolith/savedattlist.php b/horde-webmail/kronolith/savedattlist.php
new file mode 100644
index 0000000..631b994
@@ -14526,6 +14541,33 @@
+</form>
--
tg: (6938161..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master)
+--
+TOPGIT patch commit log
+=======================
+
+commit 3715013c5b1c184a72130bab132e3157d7e4b0ca
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Fri Jun 26 12:06:46 2009 +0200
+
+ Fixed translations.
+
+commit ced8db79fc783d16931dfcecea9bc823c2f5737f
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Fri Jun 26 11:15:43 2009 +0200
+
+ German translations.
+
+commit cd7f4fe16072b7b40a1a75bd5c9a296e23bca779
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Sat Mar 14 01:10:10 2009 +0100
+
+ Remove stray .orig file.
+
+commit e508e429dcac35ef7ac223c771a9973f823db53f
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Sun Feb 1 22:21:11 2009 +0000
+
+ Added patch kronolith/HK-SB-Fbview_save_attendees.patch from the mercurial release queue.
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/SB/ExtraParameters
@@ -27656,12 +27698,14 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/dimp/js/DimpBase.js | 1 +
- horde-webmail/dimp/lib/DIMP.php | 1 +
- horde-webmail/dimp/templates/index/index.inc | 1 +
- horde-webmail/imp/acl.php | 12 ++++++++++--
- horde-webmail/imp/templates/acl/acl.html | 6 ++++++
- 5 files changed, 19 insertions(+), 2 deletions(-)
+ horde-webmail/dimp/js/DimpBase.js | 1 +
+ horde-webmail/dimp/lib/DIMP.php | 1 +
+ .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo | Bin 168731 -> 168778 bytes
+ horde-webmail/dimp/po/de_DE.po | 3 +++
+ horde-webmail/dimp/templates/index/index.inc | 1 +
+ horde-webmail/imp/acl.php | 12 ++++++++++--
+ horde-webmail/imp/templates/acl/acl.html | 13 +++++++++++++
+ 7 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
index 39a728b..c4eb9f4 100644
@@ -27687,6 +27731,20 @@
'sortthread' => SORTTHREAD,
'sortdate' => SORTDATE,
+diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo
+index 2f1c11c..973776f 100644
+Binary files a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo and b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo differ
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index a536db6..0486297 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -791,3 +791,6 @@ msgstr "entfernen"
+ #: lib/DIMP.php:191
+ msgid "results found"
+ msgstr "Ergebnisse gefunden"
++
++msgid "Share Folder"
++msgstr "Berechtigungen"
diff --git a/horde-webmail/dimp/templates/index/index.inc b/horde-webmail/dimp/templates/index/index.inc
index 21939e0..7c02fe7 100644
--- a/horde-webmail/dimp/templates/index/index.inc
@@ -27729,26 +27787,38 @@
$t->set('sharedimg', Horde::img('shared.png', _("Change Folder")));
$t->set('options', IMP::flistSelect('', true, array(), $folder));
diff --git a/horde-webmail/imp/templates/acl/acl.html b/horde-webmail/imp/templates/acl/acl.html
-index 79580aa..72cf1c5 100644
+index 79580aa..ae85ff4 100644
--- a/horde-webmail/imp/templates/acl/acl.html
+++ b/horde-webmail/imp/templates/acl/acl.html
-@@ -7,6 +7,7 @@
+@@ -2,11 +2,14 @@
+ <input type="hidden" name="actionID" value="" />
+ <tag:forminput />
+
++<if:imp_view>
+ <div class="header">
+ <tag:aclnavcell />
<gettext>Share mail folders</gettext>
</div>
++</if:imp_view>
+<if:imp_view>
<div class="header">
<ul>
<li>
-@@ -17,6 +18,7 @@
+@@ -17,6 +20,12 @@
<span class="smallheader"><tag:current /></span>
</div>
</form>
++<else:imp_view>
++<div class="header">
++ <span class="smallheader"><tag:current /></span>
++</div>
++</else:imp_view>
+</if:imp_view>
<form method="post" name="acl" id="acl" action="<tag:aclurl />">
<input type="hidden" name="actionID" value="imp_acl_set" />
-@@ -76,9 +78,13 @@
+@@ -76,9 +85,13 @@
</tr>
<tr>
<td colspan = "<tag:maxrule />" class="header" valign="middle">
@@ -27763,11 +27833,23 @@
<td class="header"> </td>
</tr>
--
-tg: (3c3721f..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
+tg: (f251c16..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
--
TOPGIT patch commit log
=======================
+commit e9630629c7479c73d3eb156f00544c34e95f0597
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jul 20 09:36:01 2009 +0200
+
+ Fix translation and improve header.
+
+commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Sun Jun 21 23:58:30 2009 +0200
+
+ German translation.
+
commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5
Author: Gunnar Wrobel <p at rdus.de>
Date: Fri Mar 13 12:04:03 2009 +0000
@@ -27799,28 +27881,46 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/dimp/config/menu.php | 6 ++++++
+ horde-webmail/dimp/config/menu.php | 9 ++++++++-
+ horde-webmail/dimp/po/de_DE.po | 3 +++
horde-webmail/imp/folders.php | 17 ++++++++++++-----
horde-webmail/imp/templates/folders/actions.html | 2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ 4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
-index 5dcf354..99a4b8c 100644
+index 0c6ebe9..b5e0a5c 100644
--- a/horde-webmail/dimp/config/menu.php
+++ b/horde-webmail/dimp/config/menu.php
-@@ -28,6 +28,12 @@
+@@ -28,7 +28,14 @@
// 'text' => 'Say Hi!',
// 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
// );
++
+$site_menu = array(
+ 'folders' => array(
+ 'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
-+ 'text' => _('Folders'),
-+ 'icon' => $GLOBALS['registry']->getImageDir('imp') . '/folders/folder.png'),
++ 'text' => _('Folder Subscription'),
++ 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
+);
++
if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
- require_once(dirname(__FILE__) . '/menu.local.php');
+ require(dirname(__FILE__) . '/menu.local.php');
}
+-
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index 65e8824..a536db6 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -16,6 +16,9 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
++msgid "Folder Subscription"
++msgstr "Ordner verwalten"
++
+ #: lib/Views/ShowMessage.php:295
+ #, php-format
+ msgid "%d Attachment"
diff --git a/horde-webmail/imp/folders.php b/horde-webmail/imp/folders.php
index a0425aa..c46b0e5 100644
--- a/horde-webmail/imp/folders.php
@@ -27890,11 +27990,23 @@
<option value="expunge_folder"><gettext>Purge</gettext></option>
</if:notrash>
--
-tg: (eff636a..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
--
TOPGIT patch commit log
=======================
+commit 93403a869ff14d7868d4cc9c4687ea1270e3c225
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jun 22 08:39:51 2009 +0200
+
+ Typo
+
+commit ad147a4b42d61800400a2a779e884ee050358811
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jun 22 00:06:14 2009 +0200
+
+ Fixed menu entry name, added translation, fixed image.
+
commit a1966161022108d9bf4831a8613b1db9a4e68c4d
Author: Gunnar Wrobel <p at rdus.de>
Date: Fri Mar 13 11:06:45 2009 +0000
@@ -27918,3 +28030,62 @@
Date: Sun Mar 8 19:01:41 2009 +0000
Completed the hack.
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/dimp/H/BL/CloseContextMenu
+
+Close the context menu when clicking into the Dimp menu.
+
+Provided by Boris Lorbeer <B.Lorbeer at science-computing.de>
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/dimp/config/menu.php | 2 +-
+ horde-webmail/dimp/js/DimpBase.js | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
+index b5e0a5c..a079da6 100644
+--- a/horde-webmail/dimp/config/menu.php
++++ b/horde-webmail/dimp/config/menu.php
+@@ -31,7 +31,7 @@
+
+ $site_menu = array(
+ 'folders' => array(
+- 'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
++ 'action' => 'DimpCore.DMenu.close(); DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
+ 'text' => _('Folder Subscription'),
+ 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
+ );
+diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
+index c4eb9f4..d90f09b 100644
+--- a/horde-webmail/dimp/js/DimpBase.js
++++ b/horde-webmail/dimp/js/DimpBase.js
+@@ -1507,6 +1507,7 @@ var DimpBase = {
+
+ case 'folder':
+ case 'special':
++ DimpCore.DMenu.close();
+ e.stop();
+ return this.go('folder:' + li.readAttribute('mbox'));
+ break;
+@@ -1903,7 +1904,7 @@ var DimpBase = {
+ 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);
+ }
+
+--
+tg: (19ee6e6..) t/dimp/H/BL/CloseContextMenu (depends on: t/kronolith/HK/GW/AnonymousiCalDownload)
+--
+TOPGIT patch commit log
+=======================
+
+commit b4b3190a4fb88e1843ff86adde4897dea21046db
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jul 20 09:39:24 2009 +0200
+
+ Close the context menu when clicking into the Dimp menu.
More information about the commits
mailing list