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 2e12769d Add wrapped _whimsy_forms_submit method and improve help text
2e12769d is described below
commit 2e12769d618b8a05042b3244e3bba9d51474904d
Author: Shane Curcuru <[email protected]>
AuthorDate: Fri Jan 31 15:47:40 2025 -0500
Add wrapped _whimsy_forms_submit method and improve help text
---
lib/whimsy/asf/forms.rb | 11 ++++++++++-
www/members/nominate_board.cgi | 4 +++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/whimsy/asf/forms.rb b/lib/whimsy/asf/forms.rb
index a8d9fe9d..246a0116 100644
--- a/lib/whimsy/asf/forms.rb
+++ b/lib/whimsy/asf/forms.rb
@@ -50,7 +50,7 @@ class Wunderbar::HtmlMarkup
_div.col_sm_9 do
_div! class: "input-group #{args[:groupclass]}" do
yield
- _whimsy_forms_iconlink(**args)
+ _whimsy_forms_iconlink(**args) unless args[:noicon]
end
if args[:helptext]
_span.help_block id: args[:aria_describedby] do
@@ -186,6 +186,15 @@ class Wunderbar::HtmlMarkup
end
end
+ def _whimsy_forms_submitwrap(**args)
+ _whimsy_control_wrapper(**args) do
+ args[:class] = 'form-control'
+ args[:aria_describedby] = "#{args[:name]}_help" if args[:helptext]
+ _input.btn.btn_default.col_sm_3 type: 'submit', name: args[:name], id:
args[:id], value: args[:value], class: args[:class],
+ aria_describedby: args[:aria_describedby]
+ end
+ end
+
# Gather POST form data into submission Hash
# @returns {field: 'string', field2: ['array', 'only for', 'multivalue'] ...}
def _whimsy_params2formdata(params)
diff --git a/www/members/nominate_board.cgi b/www/members/nominate_board.cgi
index 75198c93..b09fde25 100755
--- a/www/members/nominate_board.cgi
+++ b/www/members/nominate_board.cgi
@@ -51,7 +51,9 @@ def emit_form(title, prev_data)
_whimsy_forms_input(label: 'Nomination Statement', name: field, rows: 10,
value: prev_data[field], helptext: 'Explain why you believe this
person would be a good Director'
)
- _whimsy_forms_submit
+ _whimsy_forms_submitwrap(
+ noicon: true, label: 'submit', name: 'submit', value: 'submit',
helptext: 'Checkin this nomination and send email to members@'
+ )
end
end
end