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 6c4fdb0 Show rejects in separate tab
6c4fdb0 is described below
commit 6c4fdb08936f8ee2dc57d3f60661757a7150b130
Author: Sebb <[email protected]>
AuthorDate: Wed Feb 16 14:06:25 2022 +0000
Show rejects in separate tab
Gives more space for choices
---
www/secretary/workbench/views/parts.js.rb | 46 +++++++++++++++++--------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/www/secretary/workbench/views/parts.js.rb
b/www/secretary/workbench/views/parts.js.rb
index dd40f9f..2adb240 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -96,9 +96,12 @@ class Parts < Vue
headers: @headers
_ul.nav.nav_tabs do
- _li class: ('active' unless %i[edit mail].include?(@form)) do
+ _li class: ('active' unless %i[edit mail reject].include?(@form)) do
_a 'Categorize', onMousedown: self.tabSelect
end
+ _li class: ('active' if @form == :reject) do
+ _a 'Reject', onMousedown: self.tabSelect
+ end
_li class: ('active' if @form == :edit) do
_a 'Edit', onMousedown: self.tabSelect
end
@@ -151,6 +154,28 @@ class Parts < Vue
_hr
+ _label do
+ _input type: 'radio', name: 'doctype', value: 'forward',
+ onClick: -> {@form = Forward}
+ _span 'forward email'
+ end
+
+ _hr
+
+ _label do
+ _input type: 'radio', name: 'doctype', value: 'forward',
+ onClick: -> {@form = Note}
+ if @headers&.secmail&.notes
+ _span 'edit note'
+ else
+ _span 'add note'
+ end
+ end
+ end
+
+ elsif @form == :reject
+
+ _div.doctype do
_h4 'Reject email with message:'
# reject message with message
@@ -213,25 +238,6 @@ class Parts < Vue
end
- _hr
-
- _label do
- _input type: 'radio', name: 'doctype', value: 'forward',
- onClick: -> {@form = Forward}
- _span 'forward email'
- end
-
- _hr
-
- _label do
- _input type: 'radio', name: 'doctype', value: 'forward',
- onClick: -> {@form = Note}
- if @headers&.secmail&.notes
- _span 'edit note'
- else
- _span 'add note'
- end
- end
end
elsif @form == :edit