This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a commit to branch naming-things
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/naming-things by this push:
new 3e32f22f Rename key meeting files for consistency
3e32f22f is described below
commit 3e32f22fd7efcd607a587b489055e70e211a8022
Author: Shane Curcuru <[email protected]>
AuthorDate: Mon Jan 27 15:26:01 2025 -0500
Rename key meeting files for consistency
---
lib/whimsy/asf/meeting-util.rb | 8 +++---
.../{board-nominations.cgi => check_boardnoms.cgi} | 8 +++---
.../{invitations.cgi => check_invitations.cgi} | 4 +--
.../{nominations.cgi => check_membernoms.cgi} | 14 +++++-----
www/members/index.cgi | 30 +++++++++++-----------
www/members/meeting.cgi | 8 +++---
.../{board-nominate.cgi => nominate_board.cgi} | 6 ++---
...{member_nominations.cgi => nominate_member.cgi} | 10 ++++----
www/members/watch.cgi | 6 ++---
9 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
index 149f4f72..a6e3456b 100644
--- a/lib/whimsy/asf/meeting-util.rb
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -26,15 +26,15 @@ module ASF
MEETING_FILES = { # Filename in meeting dir, pathname to another deployed
tool, or URL
'README.txt' => 'README For Meeting Process And Roll Call',
'runbook/email_03_nomination_of_board.txt' => 'How To Nominate Someone
For Board',
- '/members/board-nominate.cgi' => 'Nominate someone for the Board',
+ '/members/nominate_board.cgi' => 'Nominate someone for the Board',
'runbook/email_02_nomination_of_members.txt' => 'How To Nominate A New
Member',
- '/members/member_nominations.cgi' => 'Nominate someone for ASF Member',
+ '/members/nominate_member.cgi' => 'Nominate someone for ASF Member',
'/members/proxy.cgi' => 'Submit A Proxy/Check Your Proxies',
'agenda.txt' => 'Official Meeting Agenda',
- '/members/board_nominations.cgi' => 'Cross-check existing Board
nominations',
+ '/members/check_boardnoms.cgi' => 'Cross-check existing Board
nominations',
'board_ballot.txt' => 'Official Board Candidate Ballots and Statements',
'board_nominations.txt' => 'Official list of Board Nominations',
- '/members/nominations.cgi' => 'Cross-check existing New Member
nominations',
+ '/members/check_membernoms.cgi' => 'Cross-check existing New Member
nominations',
'nominated-members.txt' => 'Official list of New Member nominations',
PROXIES_FILENAME => 'Official List Of Meeting Proxies',
'record' => 'Official List Of Voting Members',
diff --git a/www/members/board-nominations.cgi b/www/members/check_boardnoms.cgi
similarity index 96%
rename from www/members/board-nominations.cgi
rename to www/members/check_boardnoms.cgi
index 9609c190..808cf25e 100755
--- a/www/members/board-nominations.cgi
+++ b/www/members/check_boardnoms.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-PAGETITLE = "Board nominations cross-check" # Wvisible:meeting
+PAGETITLE = "Cross-check existing Board nominations" # Wvisible:meeting
$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'time'
require 'erb'
@@ -100,9 +100,9 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- '/members/meeting' => 'Member Meeting FAQ and info',
- 'board-nominate.cgi' => "Nominate someone for director in
board_nominations.txt",
- 'nominations' => 'New Member nominations cross-check',
+ 'meeting.cgi' => 'Member Meeting FAQ and info',
+ 'nominate_board.cgi' => 'Nominate someone for the Board',
+ 'check_membernoms.cgi' => 'Cross-check existing New Member
nominations',
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
diff --git a/www/members/invitations.cgi b/www/members/check_invitations.cgi
similarity index 98%
rename from www/members/invitations.cgi
rename to www/members/check_invitations.cgi
index 27a336ec..835b64d5 100755
--- a/www/members/invitations.cgi
+++ b/www/members/check_invitations.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-PAGETITLE = "New Member invitations cross-check" # Wvisible:meeting,members
+PAGETITLE = "Cross-check new Member invitations/applications" #
Wvisible:meeting,members
$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'date'
@@ -139,7 +139,7 @@ _html do
memappurl => 'memapp-received.txt',
'https://lists.apache.org/[email protected]' =>
'[email protected]',
nominationsurl => 'nominated-members.txt',
-
'https://github.com/apache/whimsy/blob/master/www/members/invitations.cgi' =>
'Source code for this page'
+
'https://github.com/apache/whimsy/blob/master/www/members/check_invitations.cgi'
=> 'Source code for this page'
},
helpblock: -> {
_p do
diff --git a/www/members/nominations.cgi b/www/members/check_membernoms.cgi
similarity index 93%
rename from www/members/nominations.cgi
rename to www/members/check_membernoms.cgi
index 10f451af..96172122 100755
--- a/www/members/nominations.cgi
+++ b/www/members/check_membernoms.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-PAGETITLE = "New Member nominations cross-check" # Wvisible:meeting
+PAGETITLE = "Cross-check existing New Member nominations" # Wvisible:meeting
$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'time'
require 'erb'
@@ -110,12 +110,12 @@ _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',
- 'board-nominations' => 'Board nominations cross-check',
- 'board-nominate.cgi' => "Add entries to board nomination file",
+ 'meeting.cgi' => 'Member Meeting FAQ and info',
+ 'memberless-pmcs.cgi' => 'PMCs with no/few ASF Members',
+ 'watch.cgi' => 'Watch list for potential Member candidates',
+ 'nominate_member.cgi' => 'Add entries to list of nominated members',
+ 'check_boardnoms.cgi' => 'Cross-check existing Board nominations',
+ 'nominate_board.cgi' => 'Nominate someone for the Board',
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
diff --git a/www/members/index.cgi b/www/members/index.cgi
index c527389b..a60cd21b 100755
--- a/www/members/index.cgi
+++ b/www/members/index.cgi
@@ -8,19 +8,19 @@ require 'wunderbar'
require 'wunderbar/bootstrap'
MEETING = {
- 'meeting.cgi' => "Member's Meeting FAQ, Timeline, How-Tos",
- 'proxy.cgi' => "Assign a proxy for the (current) Member's meeting",
- 'watch.cgi' => "Potential Member Watch List - tracking candidates for future
nominations",
- 'memberless-pmcs.cgi' => "Crosscheck PMCs with few/no ASF Members, for
future nominations",
- 'member_nominations' => 'Add entries to list of nominated members',
- 'nominations.cgi' => "Member's nominations cross-check - ensuring
nominations get on the ballot, etc.",
- 'invitations.cgi' => "New Member invitations cross-check",
- 'board-nominations.cgi' => "Board nominations cross-check - ensuring
nominations get on the ballot, etc.",
- 'board-nominate.cgi' => "Add entries to board nomination file",
- 'attendance-xcheck.cgi' => "Member's Meeting Attendance cross-check - who
attended when",
- 'non-participants.cgi' => "Active Members not participating in recent
meetings (to send a poll to)",
- 'inactive.cgi' => "Poll of Inactive Members - tool to query
non-participating members why",
- 'whatif.cgi' => "Board STV Results 'what-if' tool - review past board
election votes"
+ 'meeting.cgi' => 'Member Meeting FAQ, Timeline, How-Tos',
+ 'proxy.cgi' => 'Assign a proxy for the (current) Member meeting',
+ 'watch.cgi' => 'Potential Member Watch List - tracking candidates for future
nominations',
+ 'memberless-pmcs.cgi' => 'Crosscheck PMCs with few/no ASF Members, for
future nominations',
+ 'nominate_member.cgi' => 'Nominate someone for ASF Member',
+ 'check_membernoms.cgi' => 'Cross-check existing New Member nominations',
+ 'nominate_board.cgi' => 'Nominate someone for the Board',
+ 'check_boardnoms.cgi' => 'Cross-check existing Board nominations',
+ 'check_invitations.cgi' => 'Cross-check new Member invitations /
applications',
+ 'attendance-xcheck.cgi' => 'Member Meeting Attendance cross-check - who
attended when',
+ 'non-participants.cgi' => 'Active Members not participating in recent
meetings (to send a poll to)',
+ 'inactive.cgi' => 'Poll of Inactive Members - tool to query
non-participating members why',
+ 'whatif.cgi' => 'Board STV Results what-if tool - review past board election
results'
}
LISTS = {
@@ -36,11 +36,11 @@ LISTS = {
MISC = {
'mentors.cgi' => "New Member mentoring program overview",
'board-attend.cgi' => "Director attendance statistics at board meetings",
- 'board-nominations.cgi' => "Board Member nominations cross-check - ensuring
nominations get on the ballot, etc.",
'ldap-namecheck.cgi' => "Crosscheck LDAP Names With Public Name from ICLAs",
'namediff.cgi' => "Crosscheck Members Names With ICLA records",
'mirror_check.cgi' => "ASF Distribution Mirror Check - is a mirror
configured correctly",
- 'download_check.cgi' => "Verify an Apache project download page is
configured correctly"
+ 'download_check.cgi' => "Verify an Apache project download page is
configured correctly",
+ 'logs.cgi' => "View server logs"
}
_html do
diff --git a/www/members/meeting.cgi b/www/members/meeting.cgi
index a08e3fd5..6aa1f390 100755
--- a/www/members/meeting.cgi
+++ b/www/members/meeting.cgi
@@ -167,12 +167,12 @@ _html do
_p do
_ 'Before an Annual meeting, Members may nominate candidates for the
Board election, or as New Member Candidates. Nominations are only official if
placed in the correct files; although much discussion also happens on members@.'
_ul do
- ['/members/board-nominate.cgi',
- '/members/member_nominations.cgi',
+ ['/members/nominate_board.cgi',
+ '/members/nominate_member.cgi',
'/members/proxy.cgi',
'agenda.txt',
- '/members/board_nominations.cgi',
- '/members/nominations.cgi',
+ '/members/check_boardnoms.cgi',
+ '/members/check_membernoms.cgi',
'board_ballot.txt'].each do |f|
_li do
emit_link(svn_mtg_dir, f, ASF::MeetingUtil::MEETING_FILES[f])
diff --git a/www/members/board-nominate.cgi b/www/members/nominate_board.cgi
similarity index 96%
rename from www/members/board-nominate.cgi
rename to www/members/nominate_board.cgi
index e0e8e9da..0226c46f 100755
--- a/www/members/board-nominate.cgi
+++ b/www/members/nominate_board.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-PAGETITLE = "Add entries to board_nominations.txt file" # Wvisible:meeting
+PAGETITLE = "Nominate someone for the Board" # Wvisible:meeting
$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'time'
require 'wunderbar'
@@ -115,8 +115,8 @@ _html do
title: PAGETITLE,
subtitle: 'About This Script',
related: {
- '/members/meeting' => 'Member Meeting FAQ and info',
- 'board-nominations.cgi' => 'Board nominations cross-check',
+ 'meeting' => 'Member Meeting FAQ and info',
+ 'check_boardnoms.cgi' => 'Board nominations cross-check',
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
diff --git a/www/members/member_nominations.cgi
b/www/members/nominate_member.cgi
similarity index 94%
rename from www/members/member_nominations.cgi
rename to www/members/nominate_member.cgi
index c3528ae0..074ea887 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/nominate_member.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-PAGETITLE = "Add entries to nominated-members.txt" # Wvisible:meeting
+PAGETITLE = "Nominate someone for ASF Member" # Wvisible:meeting
$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'time'
require 'wunderbar'
@@ -116,10 +116,10 @@ _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.",
+ 'meeting.cgi' => 'Member Meeting FAQ and info',
+ 'memberless-pmcs.cgi' => 'PMCs with no/few ASF Members',
+ 'watch.cgi' => 'Watch list for potential Member candidates',
+ 'check_membernoms.cgi' => "Member nominations cross-check - ensuring
nominations get on the ballot, etc.",
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index be289e82..c2092ada 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -19,9 +19,9 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- '/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
- '/members/member_nominations' => 'Add entries to list of nominated
members',
- '/members/nominations' => 'Members Meeting Nomination Crosscheck',
+ 'memberless-pmcs.cgi' => 'PMCs with no/few ASF Members',
+ 'nominate_member.cgi' => 'Nominate someone for ASF Member',
+ 'check_membernoms.cgi' => 'Cross-check existing New Member
Nominations',
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
