* Reinstated the 'Delete' button in the mailbox view, for use by users who don't...

diff --git a/webcit/roomops.c b/webcit/roomops.c
index eb84ba3eaf278ff782b0acdf1e4b8b29561c2e17..f8664cf156dd673da228bfac61557080fa699d24 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -725,6 +725,14 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "%s"
                                        "</span></a></li>\n", _("Write mail")
                                        );
+                               wprintf(
+                                       "<li class=\"newmess\">"
+                                       "<a href=\"javascript:deleteAllSelectedMessages();\">"
+                                       "<img  src=\"static/delete.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Delete")
+                                       );
                                break;
                        default:
                                wprintf(

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 930679de9368acced0765c84332bada8d0784cd9..804ff2d279f8b2ff35a0cae40f6707b6b7734838 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -373,9 +373,8 @@ function deleteAllMarkedRows() {
   rowArray = newRowArray;
   resortAndDisplay(null);
 }
-function CtdlMessageListKeyUp(event) {
-  var key = event.which;
-  if (key == 46) { // DELETE
+
+function deleteAllSelectedMessages() {
     for(msgId in currentlyMarkedRows) {
       if (!room_is_trash) {
       new Ajax.Request('ajax_servcmd', 
@@ -389,7 +388,13 @@ function CtdlMessageListKeyUp(event) {
     }
     document.getElementById("preview_pane").innerHTML = "";
     deleteAllMarkedRows();
-  }
+}
+
+function CtdlMessageListKeyUp(event) {
+       var key = event.which;
+       if (key == 46) { // DELETE
+               deleteAllSelectedMessages();
+       }
 }
 
 function clearMessage(msgId) {