(whimsy) branch master updated: Improve output; needs some FIXME to be pretty

[curcuru]

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 842ebc8f Improve output; needs some FIXME to be pretty
842ebc8f is described below

commit 842ebc8fdf7d4577058c58bd75838ec6da19eaae
Author: Shane Curcuru <a...@shanecurcuru.org>
AuthorDate: Mon Feb 3 15:41:17 2025 -0500

    Improve output; needs some FIXME to be pretty
---
 www/members/check_boardstmt.cgi | 50 ++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/www/members/check_boardstmt.cgi b/www/members/check_boardstmt.cgi
index ba46d1de..ae11f411 100755
--- a/www/members/check_boardstmt.cgi
+++ b/www/members/check_boardstmt.cgi
@@ -3,6 +3,7 @@ PAGETITLE = "Review existing Board statements" # 
Wvisible:meeting
 $LOAD_PATH.unshift '/srv/whimsy/lib'
 require 'wunderbar/bootstrap'
 require 'whimsy/asf'
+require 'whimsy/asf/forms'
 require 'whimsy/asf/member-files'
 require 'whimsy/asf/meeting-util'
 
@@ -27,22 +28,45 @@ _html do
         _ 'This only works in the period shortly before or after a Members 
meeting!'
       }
     ) do
+      _h2 id: 'board-statement-list' do
+        _ 'All Board Nominations and Candidate Statements'
+      end
       statements = ASF::MemberFiles.board_all
       statements.each do |availid, shash|
-        _div id: availid
-        _whimsy_panel("Director Nominee: #{shash.fetch('Public Name', '')} 
(#{availid})", style: 'panel-default') do
-          _p do
-            _strong "Director's Own Statement (once present)"
-            _br
-            _ shash.fetch('candidate_statement', '')
+        listid = availid
+        public_name = shash.fetch('Public Name', availid) # Fallback if missing
+        _div.panel.panel_primary id: listid do
+          _div.panel_heading do
+            _h3!.panel_title do
+              _! 'Nominee for Director: '
+              _a! "#{public_name} (#{availid})", href: 
"/roster/committer/#{availid}"
+            end
           end
-          _p do
-            _strong "Nominated By: #{shash['nombycn']} 
(#{shash['nombyeavailid']})"
-            _br
-            _ "Testing: Seconded by = #{shash['Seconded by']}"
-            _ 'Nominator Statment(s):'
-            _br
-            _ shash.fetch('Nomination Statement', '')
+          _div.panel_body do
+            _div.panel_group id: listid, role: 'tablist', 
aria_multiselectable: 'true' do
+              _whimsy_accordion_item(listid: listid, itemid: 
"#{availid}-nomination", itemtitle: "Nominated by: #{shash['nombycn']}", n: 1, 
itemclass: 'panel-info') do
+                _p do
+                  _strong "Nominated By: #{shash['nombycn']} 
(#{shash['nombyeavailid']})"
+                  _br
+                  _ "Seconded by: #{shash['Seconded by'].join(', ')}"
+                  _br
+                  _ "Nomination and Seconds Statements:"
+                end
+                _p do
+                  allnoms = shash.fetch('Nomination Statement', '(no statement 
entered)')
+                  allnoms.split('\n') do |l| # FIXME: add styles to key lines 
or (availids)
+                    _! l
+                    _br
+                  end
+                end
+              end
+              _whimsy_accordion_item(listid: listid, itemid: 
"#{availid}-statement", itemtitle: "Candidate Statement for (#{availid})", n: 
2, itemclass: 'panel-primary') do
+                _p do
+                   # FIXME: display message for blank/one line or when DECLINE
+                  _{shash.fetch('candidate_statement', '')}
+                end
+              end
+            end
           end
         end
       end