whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [whimsy] branch master updated: Fix focus, discussBody; add Vote button
Date Sat, 13 Jan 2018 00:34:08 GMT
This is an automated email from the ASF dual-hosted git repository.

clr 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 d781ba4  Fix focus, discussBody; add Vote button
d781ba4 is described below

commit d781ba4e0e11f63591c98b04f57707f53c4f1639
Author: Craig L Russell <craig.russell@oracle.com>
AuthorDate: Fri Jan 12 16:33:59 2018 -0800

    Fix focus, discussBody; add Vote button
---
 www/project/icla/main.rb                   |  7 ++++---
 www/project/icla/views/pages/discuss.js.rb | 17 +++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/www/project/icla/main.rb b/www/project/icla/main.rb
index df2b853..bf5029f 100755
--- a/www/project/icla/main.rb
+++ b/www/project/icla/main.rb
@@ -71,6 +71,7 @@ get '/discuss' do
 
   # server data sent to client
   @token = params['token']
+
   # not needed for this form but required for other forms
   @pmcs = []
   @ppmcs = []
@@ -85,11 +86,11 @@ get '/discuss' do
   @subject = '[DISCUSS] Invite Joe Blow to become committer '\
   'and PMC member for whimsy'
   comment1 = {member: 'sebb', timestamp: '11/30/2017 15:30:00',
-    comment: 'Seems like a good enough guy'}
+    comment: "Seems like a good enough guy"}
   comment2 = {member: 'rubys', timestamp: '12/04/2017 17:20:00',
-    comment: 'I agree'}
+    comment: "I agree"}
   comment3 = {member: 'clr', timestamp: '12/06/2017 10:14:00',
-    comment: 'We could do better\nMuch better'}
+    comment: "We could do better\nMuch better"}
   @comments = [comment1, comment2, comment3]
 
   _html :app
diff --git a/www/project/icla/views/pages/discuss.js.rb b/www/project/icla/views/pages/discuss.js.rb
index 65aec56..0770f72 100644
--- a/www/project/icla/views/pages/discuss.js.rb
+++ b/www/project/icla/views/pages/discuss.js.rb
@@ -12,7 +12,7 @@ class Discuss < Vue
     @comments = Server.data.comments
     @discussBody = ''
     @subject = Server.data.subject
-    @debug = true;
+    @debug = false;
 
   end
 
@@ -34,17 +34,17 @@ class Discuss < Vue
       _label "Comment from " + @user, for: 'discussBody'
       _textarea.form_control rows: 4,
       required: true, placeholder: 'new comment',
-      name: 'discussBody', value: @discussBody,
+      id: 'discussBody', value: @discussBody,
       onChange: self.setDiscussBody
     end
     @comments.each {|c|
       _b 'From: ' + c.member + ' Date: ' + c.timestamp
       _p c.comment
     }
-
+if @debug
     _p 'token: ' + @token
     _p 'comment: ' + @discussBody
-
+end
     # error messages
     if @alert
       _div.alert.alert_danger do
@@ -55,12 +55,17 @@ class Discuss < Vue
 
 
     #
-    # Submission button
+    # Submission buttons
     #
 
     _p do
-      _button.btn.btn_primary 'Submit comment', disabled: @disabled,
+      _button.btn.btn_primary 'Submit comment and continue to discuss',
+        disabled: @disabled,
         onClick: self.submitComment
+      _b ' or '
+      _button.btn.btn_primary 'Submit comment and start voting',
+        disabled: @disabled,
+        onClick: self.startVoting
     end
 
     #

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

Mime
View raw message