You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cl...@apache.org on 2018/01/01 21:28:10 UTC
[whimsy] branch master updated: Add proper text area for discuss
and vote message body
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 03f39a8 Add proper text area for discuss and vote message body
03f39a8 is described below
commit 03f39a87e2a9b697807e41f2a43e66ad0b7ccc39
Author: Craig L Russell <cr...@oracle.com>
AuthorDate: Mon Jan 1 13:28:01 2018 -0800
Add proper text area for discuss and vote message body
---
www/project/icla/views/pages/invite.js.rb | 40 ++++++++++++++++++-------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/www/project/icla/views/pages/invite.js.rb b/www/project/icla/views/pages/invite.js.rb
index e730d31..bf275a9 100644
--- a/www/project/icla/views/pages/invite.js.rb
+++ b/www/project/icla/views/pages/invite.js.rb
@@ -29,8 +29,8 @@ class Invite < Vue
@showVoteFrame = false;
@showPhaseFrame = false;
@showRoleFrame = false;
- @discussComment = ''
- @voteComment = ''
+ @discussBody = ''
+ @voteBody = ''
end
def render
@@ -71,7 +71,6 @@ class Invite < Vue
_input.form_control.iclaname! placeholder: 'GivenName FamilyName',
required: true, value: @iclaname
end
-
_div.form_group do
_label "Contributor's E-Mail address:", for: 'iclaemail'
_input.form_control.iclaemail! type: 'email', required: true,
@@ -203,21 +202,17 @@ class Invite < Vue
end
if @showDiscussFrame
_div 'Subject: ' + @subject
- _p
- _div 'Comment:'
- _p
- _textarea name: 'discussComment', value: @discussComment, rows: 4,
- placeholder: 'Please discuss this candidate.',
- onChange: self.setDiscussComment
+ _textarea.form_control rows: 4,
+ placeholder: 'Please discuss this candidate',
+ name: 'discussBody', value: @discussBody,
+ onChange: self.setDiscussBody
end
if @showVoteFrame
_div 'Subject: ' + @subject
- _p
- _div 'Comment:'
- _p
- _textarea name: 'voteComment', value: @voteComment, rows: 4,
- placeholder: 'Please vote on this candidate.',
- onChange: self.setVoteComment
+ _textarea.form_control rows: 4,
+ placeholder: 'Please discuss this candidate',
+ name: 'voteBody', value: @voteBody,
+ onChange: self.setVoteBody
end
#
@@ -309,6 +304,7 @@ class Invite < Vue
@pmc = event.target.value
@pmcOrPPMC = (Server.data.pmcs.include? @pmc)? 'PMC' : 'PPMC'
@phase = :discuss
+ @subject = ''
@showPhaseFrame = true
@showRoleFrame = true
self.checkValidity()
@@ -317,6 +313,7 @@ class Invite < Vue
def selectDiscuss(event)
@phase = :discuss
+ @subject = ''
@subjectPhase = '[DISCUSS]'
@showDiscussFrame = true;
@showRoleFrame = true;
@@ -331,8 +328,13 @@ class Invite < Vue
@disabled = false;
end
+ def setDiscussBody(event)
+ @discussBody = event.target.value
+ end
+
def selectVote(event)
@phase = :vote
+ @subject = ''
@subjectPhase = '[VOTE]'
@showVoteFrame = true;
@showRoleFrame = true;
@@ -347,6 +349,10 @@ class Invite < Vue
@disabled = false;
end
+ def setVoteBody(event)
+ @voteBody = event.target.value
+ end
+
def selectInvite(event)
@phase = :invite
@showDiscussFrame = false;
@@ -467,7 +473,7 @@ class Invite < Vue
iclaname: @iclaname,
iclaemail: @iclaemail,
pmc: @pmc,
- discussComment: @discussComment
+ discussBody: @discussBody
}
@disabled = true
@@ -488,7 +494,7 @@ class Invite < Vue
iclaname: @iclaname,
iclaemail: @iclaemail,
pmc: @pmc,
- voteComment: @voteComment
+ voteBody: @voteBody
}
@disabled = true
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].