implemented trashing

[scalable-opengroupware.org] / SOGo / UI / MailerUI / product.plist

diff --git a/SOGo/UI/MailerUI/product.plist b/SOGo/UI/MailerUI/product.plist
index e4f0b930455df89921e59fa32246cd3f806479cb..d8ed9bf73de62fd68110d9f1c7b6cc2894a9dcef 100644 (file)
--- a/SOGo/UI/MailerUI/product.plist
+++ b/SOGo/UI/MailerUI/product.plist
@@ -217,9 +217,11 @@
                 cssClass = "tbicon_forward";  label = "Forward";   },
             ),
             ( // third group
-              { link     = "delete"; 
-                isSafe   = NO;
-                enabled  = clientObject.isDeletionAllowed;
+              { link     = "delete"; isSafe = NO;
+                enabled  = showMarkDeletedButton;
+                cssClass = "tbicon_delete"; label = "Delete"; },
+              { link     = "trash"; isSafe = NO;
+                enabled  = showTrashButton;
                 cssClass = "tbicon_delete"; label = "Delete"; },
 /* TODO: enable when we know how to mark junk (#971)
               { link = "#"; 
@@ -257,6 +259,11 @@
           pageName    = "UIxMailView"; 
           actionName  = "delete";
         };
+        trash = { 
+          protectedBy = "View";
+          pageName    = "UIxMailView"; 
+          actionName  = "trash";
+        };
         junk = { 
           protectedBy = "View";
           pageName    = "UIxMailView";