[whimsy] branch master updated: Revert "Show rejects in separate tab"

[sebb]

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 aa8ec90  Revert "Show rejects in separate tab"
aa8ec90 is described below

commit aa8ec90a0561c6cd30fa6215b4527deadd00900d
Author: Sebb <s...@apache.org>
AuthorDate: Fri Feb 18 14:28:23 2022 +0000

    Revert "Show rejects in separate tab"
    
    This reverts commit 6c4fdb08936f8ee2dc57d3f60661757a7150b130.
---
 www/secretary/workbench/views/parts.js.rb | 46 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index 2adb240..dd40f9f 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -96,12 +96,9 @@ class Parts < Vue
         headers: @headers
 
       _ul.nav.nav_tabs do
-        _li class: ('active' unless %i[edit mail reject].include?(@form)) do
+        _li class: ('active' unless %i[edit mail].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
@@ -154,28 +151,6 @@ 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
@@ -238,6 +213,25 @@ 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