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 b7aad3ff Improve errors and UI text again
b7aad3ff is described below
commit b7aad3ff8bd634aa96001021415d0577e0e495b1
Author: Shane Curcuru <[email protected]>
AuthorDate: Fri Jan 24 21:15:51 2025 -0500
Improve errors and UI text again
---
www/members/board-nominate.cgi | 18 +++++++++++-------
www/members/member_nominations.cgi | 20 ++++++++++++--------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/www/members/board-nominate.cgi b/www/members/board-nominate.cgi
index a15f5dfe..25c59f0e 100755
--- a/www/members/board-nominate.cgi
+++ b/www/members/board-nominate.cgi
@@ -10,11 +10,8 @@ require 'whimsy/asf/member-files'
require 'whimsy/asf/wunderbar_updates'
require 'whimsy/asf/meeting-util'
require 'whimsy/asf/time-utils'
+require 'mail'
-# Countdown until nominations for current meeting close
-t_now = Time.now.to_i
-t_end = Time.parse(ASF::MeetingUtil.nominations_close).to_i
-nomclosed = t_now > t_end
MAILING_LIST = '[email protected]'
NOMINATION_FILE = 'board_nominations.txt'
@@ -105,8 +102,14 @@ end
# Produce HTML
_html do
- _body? do # The ? traps errors inside this block
- _whimsy_body( # This emits the entire page shell: header, navbar, basic
styles, footer
+ _body? do
+ # Countdown until nominations for current meeting close
+ latest_meeting_dir = ASF::MeetingUtil.latest_meeting_dir
+ timelines = ASF::MeetingUtil.get_timeline(latest_meeting_dir)
+ t_now = Time.now.to_i
+ t_end = Time.parse(timelines['nominations_close_iso']).to_i
+ nomclosed = t_now > t_end
+ _whimsy_body(
title: PAGETITLE,
subtitle: 'About This Script',
related: {
@@ -116,6 +119,7 @@ _html do
},
helpblock: -> {
_h3 'BETA - please report any errors at private@whimsical!'
+ _b "For: #{timelines['meeting_type']} Meeting on:
#{timelines['meeting_iso']}"
_p %Q{
This form can be used to nominate candidates for the ASF Board of
Director election if they are already Members.
It automatically adds an entry to to the #{NOMINATION_FILE} file,
@@ -127,7 +131,7 @@ _html do
if nomclosed
_h1 'Nominations are now closed!'
else
- _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
+ _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
end
_div id: 'nomination-form' do
diff --git a/www/members/member_nominations.cgi
b/www/members/member_nominations.cgi
index f7d4f96c..befcd671 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/member_nominations.cgi
@@ -12,11 +12,8 @@ require 'whimsy/asf/meeting-util'
require 'whimsy/asf/time-utils'
require 'mail'
-# Countdown until nominations for current meeting close
-t_now = Time.now.to_i
-t_end = Time.parse(ASF::MeetingUtil.nominations_close).to_i
-nomclosed = t_now > t_end
MAILING_LIST = '[email protected]'
+NOMINATION_FILE = 'nominated-members.txt'
def emit_form(title, prev_data)
_whimsy_panel(title, style: 'panel-success') do
@@ -106,8 +103,14 @@ end
# Produce HTML
_html do
- _body? do # The ? traps errors inside this block
- _whimsy_body( # This emits the entire page shell: header, navbar, basic
styles, footer
+ _body? do
+ # Countdown until nominations for current meeting close
+ latest_meeting_dir = ASF::MeetingUtil.latest_meeting_dir
+ timelines = ASF::MeetingUtil.get_timeline(latest_meeting_dir)
+ t_now = Time.now.to_i
+ t_end = Time.parse(timelines['nominations_close_iso']).to_i
+ nomclosed = t_now > t_end
+ _whimsy_body(
title: PAGETITLE,
subtitle: 'About This Script',
related: {
@@ -118,7 +121,8 @@ _html do
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
- _h3 'BETA - please report any errors to the Whimsy PMC!'
+ _h3 'BETA - please report any errors at private@whimsical!'
+ _b "For: #{timelines['meeting_type']} Meeting on:
#{timelines['meeting_iso']}"
_p %Q{
This form can be used to nominate new candidates for ASF Membership
if they are already committers.
It automatically adds an entry to to the #{NOMINATION_FILE} file,
@@ -131,7 +135,7 @@ _html do
if nomclosed
_h1 'Nominations are now closed!'
else
- _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
+ _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
end
_div id: 'nomination-form' do
