From 52fefb2eeee126887fa1ee617dd4aa7c222e06a0 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 12 Oct 2010 14:38:58 +0000
Subject: [PATCH] Updated mail folder editing mechanism .

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20006 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../personal/groupware/class_Groupware.inc         |  1 +
 .../groupware/personal/groupware/generic.tpl       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index dff1a0f4c..f31eac726 100644
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -909,6 +909,7 @@ class Groupware extends plugin
                     "plProvidedAcls"  => array(
                         "mailAddress"                   => _("Mail address"),
                         "mailLocation"                  => _("Mail location"),
+                        "mailFolder"                    => _("Mail folder"),
                         "quotaUsage"                    => _("Quota usage"),
                         "mailFilter"                    => _("Mail filter"),
                         "quotaSize"                     => _("Quota size"),
diff --git a/gosa-plugins/groupware/personal/groupware/generic.tpl b/gosa-plugins/groupware/personal/groupware/generic.tpl
index 94cdd7c35..210f0e8ff 100644
--- a/gosa-plugins/groupware/personal/groupware/generic.tpl
+++ b/gosa-plugins/groupware/personal/groupware/generic.tpl
@@ -6,10 +6,6 @@
     <button name="retry">{t}Retry{/t}</button>
 {else}
 
-    {if $mailFolder_isActive}
-        {t}Mail folder{/t}:&nbps;<button name='configureFolder'>{msgPool type=editButton}</button>
-    {/if}
-
 <table summary="{t}Mail settings{/t}" style='width:100%;'>
     <tr>
         <td style='width:50%; '>  
@@ -35,6 +31,16 @@
                         {/render}
                     </td>
                 </tr>
+                {if $mailFolder_isActive}
+                <tr>
+                    <td><label for="mailFolder">{t}Mail folder{/t}</label></td>
+                    <td>
+                        {render acl=$mailFolderACL}
+                            <button name='configureFolder'>{msgPool type=editButton}</button>
+                        {/render}
+                    </td>
+                </tr>
+                {/if}
                 {if $quotaUsage_isActive}
                 <tr>
                     <td><label for='quotaUsage_dummy'>{t}Quota usage{/t}</label></td>
-- 
2.30.2