From 774ad312bbbe78176b014e723578311e5c705256 Mon Sep 17 00:00:00 2001 From: ajc Date: Wed, 11 Feb 2009 04:42:14 +0000 Subject: [PATCH] * Reinstated the 'Delete' button in the mailbox view, for use by users who don't know that the keyboard Delete button works (and for systems where the keyboard Delete isn't working for whatever reason) git-svn-id: svn://uncensored.citadel.org/trunk@7095 c9418f8e-8c02-0410-9258-ad310909226a --- webcit/roomops.c | 8 ++++++++ webcit/static/summaryview.js | 13 +++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/webcit/roomops.c b/webcit/roomops.c index eb84ba3e..f8664cf1 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -725,6 +725,14 @@ void embed_room_banner(char *got, int navbar_style) { "%s" "\n", _("Write mail") ); + wprintf( + "
  • " + "" + "" + "%s" + "
  • \n", _("Delete") + ); break; default: wprintf( diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js index 930679de..804ff2d2 100644 --- 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) { -- 2.11.4.GIT