You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2021/07/07 12:03:38 UTC

[whimsy] branch master updated: Make NOTICE requirement more obvious

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 b584796  Make NOTICE requirement more obvious
b584796 is described below

commit b584796d836074211daf44daad2104f1fff2c7ba
Author: Sebb <se...@apache.org>
AuthorDate: Wed Jul 7 13:03:30 2021 +0100

    Make NOTICE requirement more obvious
---
 www/roster/views/pmc/add.js.rb  | 15 ++++++++++++---
 www/roster/views/pmc/mod.js.rb  | 15 ++++++++++++---
 www/roster/views/ppmc/add.js.rb | 12 +++++++++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/www/roster/views/pmc/add.js.rb b/www/roster/views/pmc/add.js.rb
index 50d23df..b315909 100644
--- a/www/roster/views/pmc/add.js.rb
+++ b/www/roster/views/pmc/add.js.rb
@@ -55,11 +55,20 @@ class PMCAdd < Vue
                   concat(@people.map {|person| person.id})
 
               _p do
+                _br
+                _b do
+                  _ 'Before adding a new PMC member, ' 
+                  _a 'email notification must be sent to the Board mailing list',
+                    href: 'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
+                  _ ' (cc: the PMC private@ mailing list).'
+                  _br
+                  _ 'There follows a '
+                  _a '72 hour NOTICE period',
+                    href: 'https://www.apache.org/dev/pmc.html#notice_period'
+                end
                 _label do
+                  _span 'Has the NOTICE email been received by the board list and has the NOTICE period elapsed?'
                   _input type: 'checkbox', checked: @notice_elapsed
-                  _a '72 hour board@ NOTICE',
-                    href: 'https://www.apache.org/dev/pmc.html#notice_period'
-                  _span ' period elapsed?'
                 end
               end
             end
diff --git a/www/roster/views/pmc/mod.js.rb b/www/roster/views/pmc/mod.js.rb
index 39d3615..fd2cbed 100644
--- a/www/roster/views/pmc/mod.js.rb
+++ b/www/roster/views/pmc/mod.js.rb
@@ -43,11 +43,20 @@ class PMCMod < Vue
             # add to PMC button is only shown if every person is not on the PMC
             if @people.all? {|person| !@@project.members.include? person.id}
               _p do
+                _br
+                _b do
+                  _ 'Before adding a new PMC member, ' 
+                  _a 'email notification must be sent to the Board mailing list',
+                    href: 'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
+                  _ ' (cc: the PMC private@ mailing list).'
+                  _br
+                  _ 'There follows a '
+                  _a '72 hour NOTICE period',
+                    href: 'https://www.apache.org/dev/pmc.html#notice_period'
+                end
                 _label do
+                  _span 'Has the NOTICE email been received by the board list and has the NOTICE period elapsed?'
                   _input type: 'checkbox', checked: @notice_elapsed
-                  _a '72 hour board@ NOTICE',
-                    href: 'https://www.apache.org/dev/pmc.html#notice_period'
-                  _span ' period elapsed?'
                 end
               end
             end
diff --git a/www/roster/views/ppmc/add.js.rb b/www/roster/views/ppmc/add.js.rb
index f44bb1c..1bdbaa4 100644
--- a/www/roster/views/ppmc/add.js.rb
+++ b/www/roster/views/ppmc/add.js.rb
@@ -55,11 +55,17 @@ class PPMCAdd < Vue
                   concat(@people.map {|person| person.id})
 
               _p do
+                _br
+                _b do
+                  _ 'Before adding a new PPMC member, ' 
+                  _a 'email notification must be sent to the Incubator private mailing list',
+                    href: 'https://incubator.apache.org/guides/ppmc.html#voting_in_a_new_ppmc_member'
+                  _br
+                  _ 'There follows a 72 hour NOTICE period'
+                end
                 _label do
+                  _span 'Has the NOTICE email been received by the Incubator list and has the NOTICE period elapsed?'
                   _input type: 'checkbox', checked: @notice_elapsed
-                  _a '72 hour IPMC NOTICE',
-                    href: 'https://incubator.apache.org/guides/ppmc.html#voting_in_a_new_ppmc_member'
-                  _span ' period elapsed?'
                 end
               end
             end