[whimsy] branch master updated: WHIMSY-177 Put List name first; fix nil->null typo

[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 ede2f24  WHIMSY-177 Put List name first; fix nil->null typo
ede2f24 is described below

commit ede2f24d1e447d56abdde8562bde4ed2eec79b8c
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jan 21 21:55:59 2018 +0000

    WHIMSY-177 Put List name first; fix nil->null typo
---
 www/committers/subscribe.cgi | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index 711c59e..53497b6 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -85,14 +85,8 @@ _html do
         _input type: 'hidden', name: 'request', value: 'sub'
         _fieldset do
           _legend 'Subscribe Request:'
-          _label 'Subscribe'
-          _select name: 'addr' do
-            addrs.each do |addr|
-              _option addr
-            end
-          end
-          
-          _ 'to'
+
+          _label 'List name:'
           _select name: 'list', data_live_search: 'true' do
             _optgroup label: 'Foundation lists' do
               lists.find_all { |list| seen[list] == 0 }.each do |list|
@@ -112,6 +106,14 @@ _html do
               end
             end
           end
+
+          _label 'Email:'
+          _select name: 'addr' do
+            addrs.each do |addr|
+              _option addr
+            end
+          end
+
           _input type: 'submit', value: 'Submit Request'
         end
       end
@@ -123,15 +125,9 @@ _html do
       _form method: 'post' do
         _input type: 'hidden', name: 'request', value: 'unsub'
         _fieldset do
-          _legend 'Unsubscribe Request: (choose the list first)'
-          _label 'Unsubscribe'
-          _select.uaddr! name: 'addr' do
-            addrs.each do |addr|
-              _option addr
-            end
-          end
-          _ 'from'
+          _legend 'Unsubscribe Request:'
 
+          _label 'List name:'
           # collect subscriptions
           response = {}
           ASF::MLIST.subscriptions(user.all_mail, response)
@@ -165,6 +161,13 @@ _html do
             end
           end
 
+          _label 'Email:'
+          _select.uaddr! name: 'addr' do
+            addrs.each do |addr|
+              _option addr
+            end
+          end
+
           _input type: 'submit', value: 'Submit Request'
         end
       end
@@ -276,7 +279,7 @@ _html do
         $('#uaddr option').each(function() {
           if (emails.indexOf($(this).text()) == -1) {
             this.disabled = true;
-            if (this.textContent == oldval) oldval = nil;
+            if (this.textContent == oldval) oldval = null;
           } else {
             this.disabled = false;
             newval = newval || this.textContent;

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].