[whimsy] branch master updated: add checkbox confirming that notice has expired

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys 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 1553171  add checkbox confirming that notice has expired
1553171 is described below

commit 1553171a52eaabd550969ce5d4cda752d0ef4d6c
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sun Sep 10 19:02:24 2017 -0400

    add checkbox confirming that notice has expired
    
    https://issues.apache.org/jira/browse/WHIMSY-131
---
 www/roster/.main.rb.swp                    | Bin 0 -> 16384 bytes
 www/roster/public/stylesheets/.app.css.swp | Bin 0 -> 12288 bytes
 www/roster/public/stylesheets/app.css      |  13 +++++++++++++
 www/roster/views/pmc/add.js.rb             |  12 +++++++++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/www/roster/.main.rb.swp b/www/roster/.main.rb.swp
new file mode 100644
index 0000000..4ae9c03
Binary files /dev/null and b/www/roster/.main.rb.swp differ
diff --git a/www/roster/public/stylesheets/.app.css.swp b/www/roster/public/stylesheets/.app.css.swp
new file mode 100644
index 0000000..446c6fb
Binary files /dev/null and b/www/roster/public/stylesheets/.app.css.swp differ
diff --git a/www/roster/public/stylesheets/app.css b/www/roster/public/stylesheets/app.css
index c51b876..4ea0250 100644
--- a/www/roster/public/stylesheets/app.css
+++ b/www/roster/public/stylesheets/app.css
@@ -77,6 +77,19 @@ input:disabled[type=submit] {cursor: not-allowed}
 
 .clickable {cursor: pointer}
 
+.modal p {
+  clear: both;
+}
+
+.modal label {
+  margin-top: 1em;
+}
+
+.modal label input[type=checkbox] {
+  margin-right: 10px;
+  margin-left: 15px;
+}
+
 @media screen and (min-width: 768px) {
   .wide-form .modal-dialog {
     width: 80%;
diff --git a/www/roster/views/pmc/add.js.rb b/www/roster/views/pmc/add.js.rb
index c0f4cef..bc39c36 100644
--- a/www/roster/views/pmc/add.js.rb
+++ b/www/roster/views/pmc/add.js.rb
@@ -47,6 +47,15 @@ class PMCAdd < Vue
               _CommitterSearch add: self.add,
                 exclude: @@project.roster.keys().
                   concat(@people.map {|person| person.id})
+
+              _p do
+                _label do
+                  _input type: 'checkbox', checked: @notice_elapsed
+                  _a '72 hour Notice', 
+                    href: 'https://www.apache.org/dev/pmc.html#notice_period'
+                  _span ' period elapsed?'
+                end
+              end
             end
           end
 
@@ -63,7 +72,8 @@ class PMCAdd < Vue
               onClick: self.post, disabled: (@people.empty?)
 
             _button.btn.btn_primary 'Add to PMC', onClick: self.post,
-              data_action: 'add pmc info commit', disabled: (@people.empty?)
+              data_action: 'add pmc info commit', 
+              disabled: (@people.empty? or not @notice_elapsed)
           end
         end
       end

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