This is an automated email from the ASF dual-hosted git repository.
curcuru 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 2facd3db Fixup times; normalize some text
2facd3db is described below
commit 2facd3db6f6be8f2e07645aed39b4a9cef51067e
Author: Shane Curcuru <[email protected]>
AuthorDate: Fri Jan 24 12:24:24 2025 -0500
Fixup times; normalize some text
---
www/members/board-nominate.cgi | 2 +-
www/members/member_nominations.cgi | 16 +++++++++-------
www/members/nominations.cgi | 18 ++++++++++--------
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/www/members/board-nominate.cgi b/www/members/board-nominate.cgi
index d9ad2116..c48e4049 100755
--- a/www/members/board-nominate.cgi
+++ b/www/members/board-nominate.cgi
@@ -128,7 +128,7 @@ _html do
end
end
else # if _.post?
- emit_form('Enter nomination data', {})
+ emit_form('Enter your nomination for a Director Candidate', {})
end
end
end
diff --git a/www/members/member_nominations.cgi
b/www/members/member_nominations.cgi
index 7054ce97..77a70783 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/member_nominations.cgi
@@ -1,8 +1,7 @@
#!/usr/bin/env ruby
-PAGETITLE = "Add entries to member nomination file" # Wvisible:tools
-# Note: PAGETITLE must be double quoted
-
+PAGETITLE = "Add entries to nominated-members.txt" # Wvisible:meeting
$LOAD_PATH.unshift '/srv/whimsy/lib'
+require 'time'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'whimsy/asf'
@@ -12,8 +11,9 @@ require 'whimsy/asf/wunderbar_updates'
require 'whimsy/asf/meeting-util'
require 'whimsy/asf/time-utils'
+# Countdown until nominations for current meeting close
t_now = Time.now.to_i
-t_end = ASF::MeetingUtil.nominations_close
+t_end = Time.parse(ASF::MeetingUtil.nominations_close).to_i
nomclosed = t_now > t_end
def emit_form(title, prev_data)
@@ -85,6 +85,7 @@ _html do
title: PAGETITLE,
subtitle: 'About This Script',
related: {
+ '/members/meeting' => 'Member Meeting FAQ and info',
'/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
'/members/watch' => 'Watch list for potential Member candidates',
'nominations.cgi' => "Member nominations cross-check - ensuring
nominations get on the ballot, etc.",
@@ -94,7 +95,7 @@ _html do
_h3 'BETA - please report any errors to the Whimsy PMC!'
_p %{
This form can be used to ADD entries to the nominated-members.txt
file.
- This is currently for use by the Nominator only, and does not send a
copy
+ This is currently for use by the Nominator only, and does not yet
send a copy
of the nomination to the members list.
There is currently no support for updating an existing entry.
}
@@ -119,7 +120,8 @@ _html do
end
elsif valid == 'OK'
if process_form(formdata: submission, wunderbar: _)
- _p.lead "Thanks for Using This Form!"
+ _p.lead "Your nomination was submitted to svn."
+ # TODO Also send mail to members@ with this data (to complete
process)
else
_div.alert.alert_warning role: 'alert' do
_p "SORRY! Your submitted form data failed process_form,
please try again."
@@ -132,7 +134,7 @@ _html do
end
end
else # if _.post?
- emit_form('Enter nomination data', {})
+ emit_form('Enter your New Member nomination', {})
end
end
end
diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index e333286e..7c1ffe5c 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -1,7 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "New Member nominations cross-check" # Wvisible:meeting
$LOAD_PATH.unshift '/srv/whimsy/lib'
-
require 'time'
require 'erb'
require 'wunderbar/bootstrap'
@@ -11,8 +10,10 @@ require 'whimsy/asf/meeting-util'
require_relative '../../tools/parsemail'
require 'whimsy/asf/time-utils'
+# Countdown until nominations for current meeting close
t_now = Time.now.to_i
-t_end = ASF::MeetingUtil.nominations_close
+t_end = Time.parse(ASF::MeetingUtil.nominations_close).to_i
+nomclosed = t_now > t_end
# link to members private-arch
MBOX = 'https://mail-search.apache.org/members/private-arch/members/'
@@ -107,6 +108,7 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
+ '/members/meeting' => 'Member Meeting FAQ and info',
'/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
'/members/watch' => 'Watch list for potential Member candidates',
'/members/member_nominations' => 'Add entries to list of nominated
members',
@@ -116,20 +118,20 @@ _html do
},
helpblock: -> {
_ 'This script checks new member nomination statements from members@
against the official meeting ballot files, and highlights differences. '
- _ 'This probably only works in the period shortly before or after a
Members meeting!'
+ _ 'This only works in the period shortly before or after a Members
meeting!'
_br
_ 'Entries are highlighted if they are not present in both lists.'
_br
_br
- _b 'N.B. only entries present in the SVN file will be considered for
the ballot.'
+ _b 'N.B. only entries present in the nominated-members.txt will be
considered for the ballot.'
}
) do
- if t_end > t_now
- _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
- _p 'Please ensure all posted nominations are added to SVN before then.'
- else
+ if nomclosed
_h1 'Nominations are now closed!'
_p 'Nominations must no longer be added to the nominations file'
+ else
+ _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
+ _p 'Please ensure all posted nominations are added to
nominated-members.txt before then.'
end
cur_mtg_dir = File.basename(ASF::MeetingUtil.get_latest(MEETINGS))
nominations, emails = setup_data
