whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: reorder page
Date Wed, 19 Apr 2017 12:32:26 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys 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  e5c5107   reorder page
e5c5107 is described below

commit e5c5107cd1a9a66b6b8b56c032e918d0a190e914
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Wed Apr 19 08:32:15 2017 -0400

    reorder page
---
 www/committers/subscribe.cgi | 87 ++++++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index 967f697..2562544 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -54,7 +54,51 @@ _html do
         end
       end
       
+      _form method: 'post' do
+        _fieldset do
+          _legend 'ASF Mailing List Self-subscription'                
+          _label 'Subscribe'
+          _select name: 'addr' do
+            addrs.each do |addr|
+              _option addr
+            end
+          end
+          
+          _ 'to'
+          _select name: 'list' do
+            seen = Hash.new
+            lists.each do |list|
+              ln = list.split('-').first
+              ln = 'empire-db' if ln == 'empire'
+              seen[list] = 0
+              seen[list] = 1 if pmcs.include? ln
+              seen[list] = 2 if current.include? ln
+              seen[list] = 2 if (ln == 'incubator') \
+              && (current.include? list.split('-')[1])
+              seen[list] = 3 if retired.include? ln
+              seen[list] = 3 if (ln == 'incubator') \
+              && (retired.include? list.split('-')[1])
+            end
+            _option '--- Foundation lists ---', disabled: 'disabled'
+            lists.find_all { |list| seen[list] == 0 }.each do |list|
+              _option list
+            end
+            _option '--- Top-Level Projects ---', disabled: 'disabled'
+            lists.find_all { |list| seen[list] == 1 }.each do |list|
+              _option list
+            end
+            _option '--- Podlings ---', disabled: 'disabled'
+            lists.find_all { |list| seen[list] == 2 }.each do |list|
+              _option list
+            end
+          end
+          _input type: 'submit', value: 'Submit Request'
+        end
+      end
+
       if _.post?
+        _hr
+
         unless addrs.include? @addr and lists.include? @list
           _h2_.text_danger {_span.label.label_danger 'Invalid Input'} 
           _p 'Both email and list to subscribe to are required!'
@@ -122,49 +166,6 @@ _html do
           end
         end
       end
-      unless _.post?
-      end
-      _form method: 'post' do
-        _fieldset do
-          _legend 'ASF Mailing List Self-subscription'                
-          _label 'Subscribe'
-          _select name: 'addr' do
-            addrs.each do |addr|
-              _option addr
-            end
-          end
-          
-          _ 'to'
-          _select name: 'list' do
-            seen = Hash.new
-            lists.each do |list|
-              ln = list.split('-').first
-              ln = 'empire-db' if ln == 'empire'
-              seen[list] = 0
-              seen[list] = 1 if pmcs.include? ln
-              seen[list] = 2 if current.include? ln
-              seen[list] = 2 if (ln == 'incubator') \
-              && (current.include? list.split('-')[1])
-              seen[list] = 3 if retired.include? ln
-              seen[list] = 3 if (ln == 'incubator') \
-              && (retired.include? list.split('-')[1])
-            end
-            _option '--- Foundation lists ---', disabled: 'disabled'
-            lists.find_all { |list| seen[list] == 0 }.each do |list|
-              _option list
-            end
-            _option '--- Top-Level Projects ---', disabled: 'disabled'
-            lists.find_all { |list| seen[list] == 1 }.each do |list|
-              _option list
-            end
-            _option '--- Podlings ---', disabled: 'disabled'
-            lists.find_all { |list| seen[list] == 2 }.each do |list|
-              _option list
-            end
-          end
-          _input type: 'submit', value: 'Submit Request'
-        end
-      end
     end
   end
 end

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

Mime
View raw message