[whimsy] branch master updated: Simplify screen

[se...@apache.org]

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 57052dc  Simplify screen
57052dc is described below

commit 57052dcb83734d1a68b804f05c09c48f3a973b5a
Author: Sebb <se...@apache.org>
AuthorDate: Thu Aug 16 12:30:56 2018 +0100

    Simplify screen
---
 tools/moderationhelper.rb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tools/moderationhelper.rb b/tools/moderationhelper.rb
index 11fb95a..2591428 100755
--- a/tools/moderationhelper.rb
+++ b/tools/moderationhelper.rb
@@ -47,6 +47,14 @@ _html do
           _ 'Press Generate.  The To: address below can be copy/pasted into an email to send.  In most cases you must be a moderator for that list.'
         end
         _p do
+          _ul do
+            _li 'subscribers can post and will receive mail'
+            _li 'allow-subscribers can post; they do not get copies of mails (this is used for e.g. press@)'
+            _li 'deny-subscribers cannot post; their posts will be rejected without needing moderation'
+            _li 'sendsubscribertomod-subscribers will have all posts moderated (for posters who are borderline problems) - ask INFRA to enable the setting for the list'
+          end
+        end
+        _p do
           _span.text_danger 'BETA SOFTWARE: double-check the command first. '
           _a "Feedback welcome!", href: "mailto:dev@whimsical.apache.org?Subject=Feedback on moderation helper app"
         end
@@ -54,17 +62,6 @@ _html do
     ) do
       _form method: 'post' do
         _fieldset do
-          _legend 'Mail Moderation Helper'
-
-          _p do
-            _ul do
-              _li 'subscribers can post and will receive mail'
-              _li 'allow-subscribers can post; they do not get copies of mails (this is used for e.g. press@)'
-              _li 'deny-subscribers cannot post; their posts will be rejected without needing moderation'
-              _li 'sendsubscribertomod-subscribers will have all posts moderated (for posters who are borderline problems) - ask INFRA to enable the setting for the list'
-            end
-          end
-
           _table do
             _tr do
               _th 'Mailing list'