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 00:12:15 UTC
[whimsy] branch master updated: Add Subject to discuss and vote
phases
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 d1d2c3e Add Subject to discuss and vote phases
d1d2c3e is described below
commit d1d2c3e392b4655c58c5b744ae5128c63de01075
Author: Craig L Russell <cr...@oracle.com>
AuthorDate: Sun Dec 31 16:12:06 2017 -0800
Add Subject to discuss and vote phases
---
www/project/icla/views/pages/invite.js.rb | 50 +++++++++++++++++++++++--------
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git a/www/project/icla/views/pages/invite.js.rb b/www/project/icla/views/pages/invite.js.rb
index dc596d5..e730d31 100644
--- a/www/project/icla/views/pages/invite.js.rb
+++ b/www/project/icla/views/pages/invite.js.rb
@@ -11,6 +11,10 @@ class Invite < Vue
@noticelink = ''
@phase = ''
@role = ''
+ @roleText = ' to submit ICLA for '
+ @subject = ''
+ @subjectPhase = ''
+ @pmcOrPpmc = ''
# initialize conditional text
@showPMCVoteLink = false;
@@ -165,37 +169,54 @@ class Invite < Vue
end
end
if @showRoleFrame
- _div.form_group do
+ _div.form_check do
_label do
_input type: :radio, name: :role, value: :committer,
- onClick: -> {@role = :committer}
- _span :' Invite to become a committer'
+ onClick: -> {@role = :committer;
+ @subject = @subjectPhase + ' Invite ' + @iclaname +
+ ' to become committer for ' + @pmc
+ }
+ _span :' invite to become a committer'
end
_p
_label do
_input type: :radio, name: :role, value: :pmc,
- onClick: -> {@role = :pmc}
- _span ' Invite to become a committer and PMC/PPMC member'
+ onClick: -> {@role = :pmc;
+ @subject = @subjectPhase + ' Invite ' + @iclaname +
+ ' to become committer and ' + @pmcOrPPMC + ' member for ' + @pmc
+ }
+ _span ' invite to become a committer and ' + @pmcOrPPMC + ' member'
end
- _p
- _label do
- _input type: :radio, name: :role, value: :invite,
- onClick: -> {@role = :invite}
- _span ' Invite to submit an ICLA'
+ if @showDiscussFrame
+ _p
+ _label do
+ _input type: :radio, name: :role, value: :invite,
+ onClick: -> {@role = :invite;
+ @subject = @subjectPhase + ' Invite ' + @iclaname +
+ ' to submit an ICLA for ' + @pmc
+ }
+ _span ' invite to submit an ICLA'
+ end
end
_p
end
end
if @showDiscussFrame
- _span 'Comment'
+ _div 'Subject: ' + @subject
+ _p
+ _div 'Comment:'
_p
_textarea name: 'discussComment', value: @discussComment, rows: 4,
- onChange: self.setDiscussComment
+ placeholder: 'Please discuss this candidate.',
+ onChange: self.setDiscussComment
end
if @showVoteFrame
- _span 'Comment'
+ _div 'Subject: ' + @subject
+ _p
+ _div 'Comment:'
_p
_textarea name: 'voteComment', value: @voteComment, rows: 4,
+ placeholder: 'Please vote on this candidate.',
onChange: self.setVoteComment
end
@@ -286,6 +307,7 @@ class Invite < Vue
def setPMC(event)
@pmc = event.target.value
+ @pmcOrPPMC = (Server.data.pmcs.include? @pmc)? 'PMC' : 'PPMC'
@phase = :discuss
@showPhaseFrame = true
@showRoleFrame = true
@@ -295,6 +317,7 @@ class Invite < Vue
def selectDiscuss(event)
@phase = :discuss
+ @subjectPhase = '[DISCUSS]'
@showDiscussFrame = true;
@showRoleFrame = true;
@showVoteFrame = false;
@@ -310,6 +333,7 @@ class Invite < Vue
def selectVote(event)
@phase = :vote
+ @subjectPhase = '[VOTE]'
@showVoteFrame = true;
@showRoleFrame = true;
@showDiscussFrame = false;
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].