whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Put ICLA listing option against field it affects
Date Sat, 17 Feb 2018 18:09:54 GMT
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 ffab409  Put ICLA listing option against field it affects
ffab409 is described below

commit ffab40977a9e64b005fec33f77c929bbf7b3bae4
Author: Sebb <sebb@apache.org>
AuthorDate: Sat Feb 17 18:09:52 2018 +0000

    Put ICLA listing option against field it affects
---
 www/officers/acreq.cgi | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index fe9a407..678a3e3 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -156,16 +156,19 @@ _html do
             _form.form_horizontal method: 'post' do
               _div.form_group do
                 _label.control_label.col_sm_2 'User ID', for: "user"
-                _div.col_sm_10 do
+                _div.col_sm_6 do
                   _input.form_control name: "user", id: "user", autofocus: true,
                     type: "text", required: true,
                     pattern: '^[a-z][a-z0-9]{2,}$' # useridvalidationpattern dup
                 end
+                _div.col_md_4 do
+                  _ 'Alphanumeric only, starting with alpha, minimum 3 chars'
+                end
               end
 
               _div.form_group do
                 _label.control_label.col_sm_2 'Name', for: "name"
-                _div.col_sm_10 do
+                _div.col_sm_6 do
                   _select.form_control name: "name", id: "name", required: true do
                     _option value: ''
                     iclas.invert.to_a.sort.each do |name, email|
@@ -173,6 +176,17 @@ _html do
                     end
                   end
                 end
+                _div.col_md_4 do
+                  if @iclas == 'all'
+                    _ 'Showing all ICLAs ever received.'
+                    _br
+                    _a 'Show only ICLAs received recently', href: '?'
+                  else
+                    _ 'Showing only ICLAs received recently.'
+                    _br
+                    _a 'Show the full list of ICLAs submitted', href: '?iclas=all'
+                  end
+                end
               end
 
               _div.form_group do
@@ -342,22 +356,6 @@ _html do
             end # of if _.post?
           end
         end
-        # Add separate column for ICLA options
-        _div.col_md_4 do
-          unless _.post?
-            _div.well.well_lg do
-              if @iclas == 'all'
-                _span 'Now showing all ICLAs ever received.  Click here to'
-                _a 'show only ICLAs received recently', href: '?'
-                _span '.'
-              else
-                _span 'Now showing only ICLAs received recently.  Click here to'
-                _a 'choose from the full list of ICLA submitters', href: '?iclas=all'
-                _span '.'
-              end
-            end
-          end
-        end
       end
     end
   end

-- 
To stop receiving notification emails like this one, please contact
sebb@apache.org.

Mime
View raw message