gunnar: server/patches/horde-webmail/1.2.0/merges t_dimp_H_BL_CloseContextMenu.diff, NONE, 1.1.2.1 series, 1.1.4.3, 1.1.4.4 t_dimp_H_GW_AclView.diff, 1.1.2.2, 1.1.2.3
cvs at kolab.org
cvs at kolab.org
Mon Jul 20 10:39:09 CEST 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv14542/patches/horde-webmail/1.2.0/merges
Modified Files:
Tag: suc_branch
series t_dimp_H_GW_AclView.diff
Added Files:
Tag: suc_branch
t_dimp_H_BL_CloseContextMenu.diff
Log Message:
Updated header and translations for the acl editing patch. Added patch that closes the context menu when clicking in the left pane.
--- NEW FILE: t_dimp_H_BL_CloseContextMenu.diff ---
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.
Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/series,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- series 22 Apr 2009 16:18:51 -0000 1.1.4.3
+++ series 20 Jul 2009 08:39:07 -0000 1.1.4.4
@@ -2,3 +2,4 @@
issue3329.patch
t_dimp_H_GW_AclView.diff
t_dimp_H_GW_FoldersView.diff
+t_dimp_H_BL_CloseContextMenu.diff
Index: t_dimp_H_GW_AclView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/t_dimp_H_GW_AclView.diff,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- t_dimp_H_GW_AclView.diff 21 Jun 2009 22:13:48 -0000 1.1.2.2
+++ t_dimp_H_GW_AclView.diff 20 Jul 2009 08:39:07 -0000 1.1.2.3
@@ -18,8 +18,8 @@
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 @@
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 @@
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 @@
$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,10 +147,16 @@
<td class="header"> </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 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>
More information about the commits
mailing list