This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new f88653dd Add Links to Deleted and All messages
f88653dd is described below
commit f88653ddce5a019a76e0b1ee83bb19e129fe238b
Author: Sebb <[email protected]>
AuthorDate: Tue Aug 6 11:18:32 2024 +0100
Add Links to Deleted and All messages
---
www/secretary/workbench/server.rb | 12 ++++++++++++
www/secretary/workbench/views/all.html.rb | 9 ++++++++-
www/secretary/workbench/views/deleted.html.rb | 9 ++++++++-
www/secretary/workbench/views/index.html.rb | 3 +++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/www/secretary/workbench/server.rb
b/www/secretary/workbench/server.rb
index 5154070f..2fa04c30 100644
--- a/www/secretary/workbench/server.rb
+++ b/www/secretary/workbench/server.rb
@@ -103,18 +103,30 @@ get %r{/(\d{6})} do |mbox|
_json :index # This invokes workbench/views/index.json.rb
end
+get '/deleted' do
+ current = Mailbox.allmailboxes.last
+ redirect to("/#{current}/deleted")
+end
+
# display deleted messages
get %r{/(\d{6})/deleted} do |mbox|
@mbox = mbox
+ @prv, @nxt = Mailbox.prev_next(mbox)
@messages = Mailbox.new(@mbox).client_headers.select do |message|
message[:status] == :deleted
end
_html :deleted
end
+get '/all' do
+ current = Mailbox.allmailboxes.last
+ redirect to("/#{current}/all")
+end
+
# display all messages
get %r{/(\d{6})/all} do |mbox|
@mbox = mbox
+ @prv, @nxt = Mailbox.prev_next(mbox)
@messages = Mailbox.new(@mbox).client_headers
_html :all
end
diff --git a/www/secretary/workbench/views/all.html.rb
b/www/secretary/workbench/views/all.html.rb
index 056da464..a22e425e 100644
--- a/www/secretary/workbench/views/all.html.rb
+++ b/www/secretary/workbench/views/all.html.rb
@@ -1,5 +1,12 @@
_html do
- _h1 'All messages'
+ _h1 "All messages for #{@mbox}"
+ _a 'Workbench', href: '..'
+ if @prv
+ _a 'Previous', href: "../#{@prv}/all"
+ end
+ if @nxt
+ _a 'Next', href: "../#{@nxt}/all"
+ end
_table.table do
_thead do
_tr do
diff --git a/www/secretary/workbench/views/deleted.html.rb
b/www/secretary/workbench/views/deleted.html.rb
index 3d71f5e5..5a486987 100644
--- a/www/secretary/workbench/views/deleted.html.rb
+++ b/www/secretary/workbench/views/deleted.html.rb
@@ -1,5 +1,12 @@
_html do
- _h1.bg_danger 'Deleted messages'
+ _h1.bg_danger "Deleted messages for #{@mbox}"
+ _a 'Workbench', href: '..'
+ if @prv
+ _a 'Previous', href: "../#{@prv}/deleted"
+ end
+ if @nxt
+ _a 'Next', href: "../#{@nxt}/deleted"
+ end
_table.table do
_thead do
_tr do
diff --git a/www/secretary/workbench/views/index.html.rb
b/www/secretary/workbench/views/index.html.rb
index b1bcf06b..a7ef8fa7 100644
--- a/www/secretary/workbench/views/index.html.rb
+++ b/www/secretary/workbench/views/index.html.rb
@@ -12,6 +12,9 @@ _html do
_h1.bg_success do
_a 'ASF Secretary Mail', href: '.'
end
+ _a 'Deleted messages', href: 'deleted'
+ _ '-'
+ _a 'All messages', href: 'all'
end
_div_.index!
