summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-07-20 08:39:07 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-07-20 08:39:07 (GMT)
commit14ebc367f1615e5b7cfefa5b1d08c3800592fbb2 (patch)
tree16b17d4e6145e7582a51bfb2bf4f79381340e015
parent5b36d7322ac41766863ddcf8062189335fc6e6bc (diff)
downloadserver-14ebc367f1615e5b7cfefa5b1d08c3800592fbb2.tar.gz
Updated header and translations for the acl editing patch. Added patch that closes the context menu when clicking in the left pane.
-rw-r--r--patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch95
-rw-r--r--patches/horde-webmail/1.2.0/merges/series1
-rw-r--r--patches/horde-webmail/1.2.0/merges/t_dimp_H_BL_CloseContextMenu.diff59
-rw-r--r--patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff36
4 files changed, 173 insertions, 18 deletions
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 c26f0db..0062a39 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
@@ -27213,8 +27213,8 @@ Signed-off-by: Gunnar Wrobel <p@rdus.de>
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 | 6 ++++++
- 7 files changed, 22 insertions(+), 2 deletions(-)
+ 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
@@ -27244,7 +27244,7 @@ diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail
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 c1a6f52..6de9591 100644
+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"
@@ -27253,7 +27253,7 @@ index c1a6f52..6de9591 100644
msgstr "Ergebnisse gefunden"
+
+msgid "Share Folder"
-+msgstr "Gemeinsame Ordner"
++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
@@ -27296,26 +27296,38 @@ index cfa285f..851d8de 100644
$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">
@@ -27330,11 +27342,17 @@ index 79580aa..72cf1c5 100644
<td class="header">&nbsp;</td>
</tr>
--
-tg: (ad147a4..) 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@rdus.de>
+Date: Mon Jul 20 09:36:01 2009 +0200
+
+ Fix translation and improve header.
+
commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
Author: Gunnar Wrobel <p@rdus.de>
Date: Sun Jun 21 23:58:30 2009 +0200
@@ -27521,3 +27539,62 @@ Author: Gunnar Wrobel <p@rdus.de>
Date: Sun Mar 8 19:01:41 2009 +0000
Completed the hack.
+From: Gunnar Wrobel <p@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@science-computing.de>
+
+Signed-off-by: Gunnar Wrobel <p@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@rdus.de>
+Date: Mon Jul 20 09:39:24 2009 +0200
+
+ Close the context menu when clicking into the Dimp menu.
diff --git a/patches/horde-webmail/1.2.0/merges/series b/patches/horde-webmail/1.2.0/merges/series
index 00ceb25..0dccfba 100644
--- a/patches/horde-webmail/1.2.0/merges/series
+++ b/patches/horde-webmail/1.2.0/merges/series
@@ -2,3 +2,4 @@ t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff
issue3329.patch
t_dimp_H_GW_AclView.diff
t_dimp_H_GW_FoldersView.diff
+t_dimp_H_BL_CloseContextMenu.diff
diff --git a/patches/horde-webmail/1.2.0/merges/t_dimp_H_BL_CloseContextMenu.diff b/patches/horde-webmail/1.2.0/merges/t_dimp_H_BL_CloseContextMenu.diff
new file mode 100644
index 0000000..a0503ac
--- /dev/null
+++ b/patches/horde-webmail/1.2.0/merges/t_dimp_H_BL_CloseContextMenu.diff
@@ -0,0 +1,59 @@
+From: Gunnar Wrobel <p@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@science-computing.de>
+
+Signed-off-by: Gunnar Wrobel <p@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@rdus.de>
+Date: Mon Jul 20 09:39:24 2009 +0200
+
+ Close the context menu when clicking into the Dimp menu.
diff --git a/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff b/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff
index 780b0fb..76d745f 100644
--- a/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff
+++ b/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff
@@ -18,8 +18,8 @@ Signed-off-by: Gunnar Wrobel <p@rdus.de>
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 | 6 ++++++
- 7 files changed, 22 insertions(+), 2 deletions(-)
+ 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
@@ -49,7 +49,7 @@ diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail
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 c1a6f52..6de9591 100644
+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"
@@ -58,7 +58,7 @@ index c1a6f52..6de9591 100644
msgstr "Ergebnisse gefunden"
+
+msgid "Share Folder"
-+msgstr "Gemeinsame Ordner"
++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
@@ -101,26 +101,38 @@ index cfa285f..851d8de 100644
$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">
@@ -135,11 +147,17 @@ index 79580aa..72cf1c5 100644
<td class="header">&nbsp;</td>
</tr>
--
-tg: (ad147a4..) 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@rdus.de>
+Date: Mon Jul 20 09:36:01 2009 +0200
+
+ Fix translation and improve header.
+
commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
Author: Gunnar Wrobel <p@rdus.de>
Date: Sun Jun 21 23:58:30 2009 +0200