[whimsy] branch master updated: Allow for multiple ids

[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 7ad65fa  Allow for multiple ids
7ad65fa is described below

commit 7ad65fa9841e10c530007d11d9b6bd0098a21695
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jul 6 22:22:35 2018 +0100

    Allow for multiple ids
---
 www/project/icla/views/pages/form.js.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/project/icla/views/pages/form.js.rb b/www/project/icla/views/pages/form.js.rb
index 89a451c..4298039 100644
--- a/www/project/icla/views/pages/form.js.rb
+++ b/www/project/icla/views/pages/form.js.rb
@@ -32,6 +32,7 @@ class Form < Vue
     _div.form_group do
       _p 'Full Name:'
       _input.form_control.fullname! value: @fullName, required: true,
+        placeholder: 'GivenName FamilyName',
         onChange: self.setFullName
     end
 
@@ -57,9 +58,11 @@ class Form < Vue
 
     if FormData.votelink
       _div.form_group do
-        _p 'Preferred Apache Id (format: ^[a-z][-a-z0-9]{2,}$):'
+        _p 'Preferred Apache Id:'
         _input.form_control.apacheId! value: @apacheId, 
-          pattern: "^[a-z][-a-z0-9]{2,}$"
+          placeholder: 'At least 3 lower-case alphanumeric, starting with alpha. Separate multiple choices with spaces.',
+          pattern: "^[a-z][a-z0-9]{2,}{1,}\s*(\s+[a-z][a-z0-9]{2,}{1,})*$"
+          # Single name, optional spaces after, followed by zero or more names with leading spaces
       end
     end