rodauth-rails 0.17.1 → 0.18.0

data/lib/generators/rodauth/templates/app/views/rodauth/remember.html.erb

@@ -1,19 +1,24 @@
-<%%= form_tag <%= rodauth %>.remember_path, method: :post do %>
+<% content_for :title, rodauth.remember_page_title %>
+
+<%= form_with url: rodauth.remember_path, method: :post do |form| %>
   <fieldset class="form-group mb-3">
     <div class="form-check">
-      <%%= radio_button_tag <%= rodauth %>.remember_param, <%= rodauth %>.remember_remember_param_value, false, id: "remember-remember", class: "form-check-input" %>
-      <%%= label_tag "remember-remember", "Remember Me", class: "form-check-label" %>
+      <%= form.radio_button rodauth.remember_param, rodauth.remember_remember_param_value, id: "remember-remember", class: "form-check-input" %>
+      <%= form.label "remember-remember", rodauth.remember_remember_label, class: "form-check-label" %>
     </div>
 
     <div class="form-check">
-      <%%= radio_button_tag <%= rodauth %>.remember_param, <%= rodauth %>.remember_forget_param_value, false, id: "remember-forget", class: "form-check-input" %>
-      <%%= label_tag "remember-forget", "Forget Me", class: "form-check-label" %>
+      <%= form.radio_button rodauth.remember_param, rodauth.remember_forget_param_value, id: "remember-forget", class: "form-check-input" %>
+      <%= form.label "remember-forget", rodauth.remember_forget_label, class: "form-check-label" %>
     </div>
 
     <div class="form-check">
-      <%%= radio_button_tag <%= rodauth %>.remember_param, <%= rodauth %>.remember_disable_param_value, false, id: "remember-disable", class: "form-check-input" %>
-      <%%= label_tag "remember-disable", "Disable Remember Me", class: "form-check-label" %>
+      <%= form.radio_button rodauth.remember_param, rodauth.remember_disable_param_value, id: "remember-disable", class: "form-check-input" %>
+      <%= form.label "remember-disable", rodauth.remember_disable_label, class: "form-check-label" %>
     </div>
   </fieldset>
-  <%%= render "submit", value: "Change Remember Setting" %>
-<%% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.remember_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/reset_password.html.erb

@@ -1,5 +1,21 @@
-<%%= form_tag <%= rodauth %>.reset_password_path, method: :post do %>
-  <%%= render "password_field" %>
-  <%%= render "password_confirm_field" if <%= rodauth %>.require_password_confirmation? %>
-  <%%= render "submit", value: "Reset Password" %>
-<%% end %>
+<% content_for :title, rodauth.reset_password_page_title %>
+
+<%= form_with url: rodauth.reset_password_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "password", rodauth.password_label, class: "form-label" %>
+    <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+  </div>
+
+  <% if rodauth.require_password_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "password-confirm", rodauth.password_confirm_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_confirm_param, value: "", id: "password-confirm", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_confirm_param)}", aria: ({ invalid: true, describedby: "password-confirm_error_message" } if rodauth.field_error(rodauth.password_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_confirm_param), class: "invalid-feedback", id: "password-confirm_error_message") if rodauth.field_error(rodauth.password_confirm_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.reset_password_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/reset_password_request.html.erb

@@ -1,9 +1,19 @@
-<%%= form_tag <%= rodauth %>.reset_password_request_path, method: :post do %>
-  <p>If you have forgotten your password, you can request a password reset:</p>
-  <%% if params[<%= rodauth %>.login_param] && !<%= rodauth %>.field_error(<%= rodauth %>.login_param) %>
-    <%%= render "login_hidden_field" %>
-  <%% else %>
-    <%%= render "login_field" %>
-  <%% end %>
-  <%%= render "submit", value: "Request Password Reset" %>
-<%% end %>
+<% content_for :title, rodauth.reset_password_request_page_title %>
+
+<%= form_with url: rodauth.reset_password_request_path, method: :post do |form| %>
+  <%== rodauth.reset_password_explanatory_text %>
+
+  <% if params[rodauth.login_param] && !rodauth.field_error(rodauth.login_param) %>
+    <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
+  <% else %>
+    <div class="form-group mb-3">
+      <%= form.label "login", rodauth.login_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.reset_password_request_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_auth.html.erb

@@ -1,4 +1,17 @@
-<%%= form_tag <%= rodauth %>.sms_auth_path, method: :post do %>
-  <%%= render "sms_code_field" %>
-  <%%= render "submit", value: "Authenticate via SMS Code" %>
-<%% end %>
+<% content_for :title, rodauth.sms_auth_page_title %>
+
+<%= form_with url: rodauth.sms_auth_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "sms-code", rodauth.sms_code_label, class: "form-label" %>
+    <div class="row">
+      <div class="col-sm-3">
+        <%= form.text_field rodauth.sms_code_param, value: "", id: "sms-code", autocomplete: "one-time-code", inputmode: "numeric", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.sms_code_param)}", aria: ({ invalid: true, describedby: "sms-code_error_message" } if rodauth.field_error(rodauth.sms_code_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.sms_code_param), class: "invalid-feedback", id: "sms-code_error_message") if rodauth.field_error(rodauth.sms_code_param) %>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.sms_auth_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_confirm.html.erb

@@ -1,4 +1,17 @@
-<%%= form_tag <%= rodauth %>.sms_confirm_path, method: :post do %>
-  <%%= render "sms_code_field" %>
-  <%%= render "submit", value: "Confirm SMS Backup Number" %>
-<%% end %>
+<% content_for :title, rodauth.sms_confirm_page_title %>
+
+<%= form_with url: rodauth.sms_confirm_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "sms-code", rodauth.sms_code_label, class: "form-label" %>
+    <div class="row">
+      <div class="col-sm-3">
+        <%= form.text_field rodauth.sms_code_param, value: "", id: "sms-code", autocomplete: "one-time-code", inputmode: "numeric", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.sms_code_param)}", aria: ({ invalid: true, describedby: "sms-code_error_message" } if rodauth.field_error(rodauth.sms_code_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.sms_code_param), class: "invalid-feedback", id: "sms-code_error_message") if rodauth.field_error(rodauth.sms_code_param) %>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.sms_confirm_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_disable.html.erb

@@ -1,4 +1,15 @@
-<%%= form_tag <%= rodauth %>.sms_disable_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
-  <%%= render "submit", value: "Disable Backup SMS Authentication" %>
-<%% end %>
+<% content_for :title, rodauth.sms_disable_page_title %>
+
+<%= form_with url: rodauth.sms_disable_path, method: :post do |form| %>
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.sms_disable_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_request.html.erb

@@ -1,3 +1,7 @@
-<%%= form_tag <%= rodauth %>.sms_request_path, method: :post do %>
-  <%%= render "submit", value: "Send SMS Code" %>
-<%% end %>
+<% content_for :title, rodauth.sms_request_page_title %>
+
+<%= form_with url: rodauth.sms_request_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.sms_request_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_setup.html.erb

@@ -1,5 +1,25 @@
-<%%= form_tag <%= rodauth %>.sms_setup_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
-  <%%= render "sms_phone_field" %>
-  <%%= render "submit", value: "Setup SMS Backup Number" %>
-<%% end %>
+<% content_for :title, rodauth.sms_setup_page_title %>
+
+<%= form_with url: rodauth.sms_setup_path, method: :post do |form| %>
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.label "sms-phone", rodauth.sms_phone_label, class: "form-label" %>
+    <div class="row">
+      <div class="col-sm-3">
+        <%= form.telephone_field rodauth.sms_phone_param, value: "", id: "sms-phone", autocomplete: "tel", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.sms_phone_param)}", aria: ({ invalid: true, describedby: "sms-phone_error_message" } if rodauth.field_error(rodauth.sms_phone_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.sms_phone_param), class: "invalid-feedback", id: "sms-phone_error_message") if rodauth.field_error(rodauth.sms_phone_param) %>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.sms_setup_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/two_factor_auth.html.erb

@@ -1,5 +1,7 @@
+<% content_for :title, rodauth.two_factor_auth_page_title %>
+
 <ul>
-  <%% <%= rodauth %>.two_factor_auth_links.sort.each do |_, link, text| %>
-    <li><%%= link_to text, link %></li>
-  <%% end %>
+  <% rodauth.two_factor_auth_links.sort.each do |_, link, text| %>
+    <li><%= link_to text, link %></li>
+  <% end %>
 </ul>

data/lib/generators/rodauth/templates/app/views/rodauth/two_factor_disable.html.erb

@@ -1,4 +1,15 @@
-<%%= form_tag <%= rodauth %>.two_factor_disable_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
-  <%%= render "submit", value: "Remove All Multifactor Authentication Methods" %>
-<%% end %>
+<% content_for :title, rodauth.two_factor_disable_page_title %>
+
+<%= form_with url: rodauth.two_factor_disable_path, method: :post do |form| %>
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.two_factor_disable_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/two_factor_manage.html.erb

@@ -1,22 +1,24 @@
-<%% if <%= rodauth %>.two_factor_setup_links.any? %>
-  <h2>Setup Multifactor Authentication</h2>
+<% content_for :title, rodauth.two_factor_manage_page_title %>
+
+<% if rodauth.two_factor_setup_links.any? %>
+  <%== rodauth.two_factor_setup_heading %>
 
   <ul>
-    <%% <%= rodauth %>.two_factor_setup_links.sort.each do |_, link, text| %>
-      <li><%%= link_to text, link %></li>
-    <%% end %>
+    <% rodauth.two_factor_setup_links.sort.each do |_, link, text| %>
+      <li><%= link_to text, link %></li>
+    <% end %>
   </ul>
-<%% end %>
+<% end %>
 
-<%% if <%= rodauth %>.two_factor_remove_links.any? %>
-  <h2>Remove Multifactor Authentication</h2>
+<% if rodauth.two_factor_remove_links.any? %>
+  <%== rodauth.two_factor_remove_heading %>
 
   <ul>
-    <%% <%= rodauth %>.two_factor_remove_links.sort.each do |_, link, text| %>
-      <li><%%= link_to text, link %></li>
-    <%% end %>
-    <%% if <%= rodauth %>.two_factor_remove_links.length > 1 %>
-      <li><%%= link_to "Remove All Multifactor Authentication Methods", <%= rodauth %>.two_factor_disable_path %></li>
-    <%% end %>
+    <% rodauth.two_factor_remove_links.sort.each do |_, link, text| %>
+      <li><%= link_to text, link %></li>
+    <% end %>
+    <% if rodauth.two_factor_remove_links.length > 1 %>
+      <li><%= link_to rodauth.two_factor_disable_link_text, rodauth.two_factor_disable_path %></li>
+    <% end %>
   </ul>
-<%% end %>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/unlock_account.html.erb

@@ -1,5 +1,17 @@
-<%%= form_tag <%= rodauth %>.unlock_account_path, method: :post do %>
-  <p>This account is currently locked out.  You can unlock the account:</p>
-  <%%= render "password_field" if <%= rodauth %>.unlock_account_requires_password? %>
-  <%%= render "submit", value: "Unlock Account" %>
-<%% end %>
+<% content_for :title, rodauth.unlock_account_page_title %>
+
+<%= form_with url: rodauth.unlock_account_path, method: :post do |form| %>
+  <%== rodauth.unlock_account_explanatory_text %>
+
+  <% if rodauth.unlock_account_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.unlock_account_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/unlock_account_request.html.erb

@@ -1,5 +1,11 @@
-<%%= form_tag <%= rodauth %>.unlock_account_request_path, method: :post do %>
-  <p>This account is currently locked out.  You can request that the account be unlocked:</p>
-  <%%= render "login_hidden_field" %>
-  <%%= render "submit", value: "Request Account Unlock" %>
-<%% end %>
+<% content_for :title, rodauth.unlock_account_request_page_title %>
+
+<%= form_with url: rodauth.unlock_account_request_path, method: :post do |form| %>
+  <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
+
+  <%== rodauth.unlock_account_request_explanatory_text %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.unlock_account_request_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/verify_account.html.erb

@@ -1,5 +1,23 @@
-<%%= form_tag <%= rodauth %>.verify_account_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.verify_account_set_password? %>
-  <%%= render "password_confirm_field" if <%= rodauth %>.verify_account_set_password? && <%= rodauth %>.require_password_confirmation? %>
-  <%%= render "submit", value: "Verify Account" %>
-<%% end %>
+<% content_for :title, rodauth.verify_account_page_title %>
+
+<%= form_with url: rodauth.verify_account_path, method: :post do |form| %>
+  <% if rodauth.verify_account_set_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+
+    <% if rodauth.require_password_confirmation? %>
+      <div class="form-group mb-3">
+        <%= form.label "password-confirm", rodauth.password_confirm_label, class: "form-label" %>
+        <%= form.password_field rodauth.password_confirm_param, value: "", id: "password-confirm", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_confirm_param)}", aria: ({ invalid: true, describedby: "password-confirm_error_message" } if rodauth.field_error(rodauth.password_confirm_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.password_confirm_param), class: "invalid-feedback", id: "password-confirm_error_message") if rodauth.field_error(rodauth.password_confirm_param) %>
+      </div>
+    <% end %>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.verify_account_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/verify_account_resend.html.erb

@@ -1,9 +1,19 @@
-<%%= form_tag <%= rodauth %>.verify_account_resend_path, method: :post do %>
-  <p>If you no longer have the email to verify the account, you can request that it be resent to you:</p>
-  <%% if params[<%= rodauth %>.login_param] %>
-    <%%= render "login_hidden_field" %>
-  <%% else %>
-    <%%= render "login_field" %>
-  <%% end %>
-  <%%= render "submit", value: "Send Verification Login Again" %>
-<%% end %>
+<% content_for :title, rodauth.resend_verify_account_page_title %>
+
+<%= form_with url: rodauth.verify_account_resend_path, method: :post do |form| %>
+  <%== rodauth.verify_account_resend_explanatory_text %>
+
+  <% if params[rodauth.login_param] %>
+    <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
+  <% else %>
+    <div class="form-group mb-3">
+      <%= form.label "login", rodauth.login_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.verify_account_resend_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/verify_login_change.html.erb

@@ -1,3 +1,7 @@
-<%%= form_tag <%= rodauth %>.verify_login_change_path, method: :post do %>
-  <%%= render "submit", value: "Verify Login Change" %>
-<%% end %>
+<% content_for :title, rodauth.verify_login_change_page_title %>
+
+<%= form_with url: rodauth.verify_login_change_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.verify_login_change_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/webauthn_auth.html.erb

@@ -1,13 +1,17 @@
-<%% cred = <%= rodauth %>.webauth_credential_options_for_get %>
+<% content_for :title, rodauth.webauthn_auth_page_title %>
 
-<%%= form_tag <%= rodauth %>.webauthn_auth_form_path, method: :post, id: "webauthn-auth-form", data: { credential_options: cred.as_json.to_json } do %>
-  <%%= render "login_hidden_field" if params[<%= rodauth %>.login_param] %>
-  <%%= hidden_field_tag <%= rodauth %>.webauthn_auth_challenge_param, cred.challenge %>
-  <%%= hidden_field_tag <%= rodauth %>.webauthn_auth_challenge_hmac_param, <%= rodauth %>.compute_hmac(cred.challenge) %>
-  <%%= text_field_tag <%= rodauth %>.webauthn_auth_param, "", id: "webauthn-auth", aria: { hidden: "true" } %>
+<% cred = rodauth.webauth_credential_options_for_get %>
+
+<%= form_with url: rodauth.webauthn_auth_form_path, method: :post, id: "webauthn-auth-form", data: { credential_options: cred.as_json.to_json } do |form| %>
+  <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
+  <%= form.hidden_field rodauth.webauthn_auth_challenge_param, value: cred.challenge %>
+  <%= form.hidden_field rodauth.webauthn_auth_challenge_hmac_param, value: rodauth.compute_hmac(cred.challenge) %>
+  <%= form.text_field rodauth.webauthn_auth_param, value: "", id: "webauthn-auth", aria: { hidden: "true" } %>
   <div id="webauthn-auth-button">
-    <%%= render "submit", value: "Authenticate Using WebAuthn" %>
+    <div class="form-group mb-3">
+      <%= form.submit rodauth.webauthn_auth_button, class: "btn btn-primary" %>
+    </div>
   </div>
-<%% end %>
+<% end %>
 
-<%%= javascript_include_tag <%= rodauth %>.webauthn_auth_js_path %>
+<%= javascript_include_tag rodauth.webauthn_auth_js_path %>

data/lib/generators/rodauth/templates/app/views/rodauth/webauthn_remove.html.erb

@@ -1,13 +1,25 @@
-<%%= form_tag <%= rodauth %>.webauthn_remove_path, method: :post, id: "webauthn-remove-form" do %>
-  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
+<% content_for :title, rodauth.webauthn_remove_page_title %>
+
+<%= form_with url: rodauth.webauthn_remove_path, method: :post, id: "webauthn-remove-form" do |form| %>
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
   <fieldset class="form-group mb-3">
-    <%% (usage = <%= rodauth %>.account_webauthn_usage).each do |id, last_use| %>
+    <% (usage = rodauth.account_webauthn_usage).each do |id, last_use| %>
       <div class="form-check">
-        <%%= render "field", name: <%= rodauth %>.webauthn_remove_param, id: "webauthn-remove-#{id}", type: :radio, class: "form-check-input", skip_error_message: true, value: id, required: false %>
-        <%%= label_tag "webauthn-remove-#{id}", "Last use: #{last_use}", class: "form-check-label" %>
-        <%%= render "field_error", name: <%= rodauth %>.webauthn_remove_param if id == usage.keys.last %>
+        <%= form.radio_button rodauth.webauthn_remove_param, id, id: "webauthn-remove-#{id}", class: "form-check-input #{"is-invalid" if rodauth.field_error(rodauth.webauthn_remove_param)}", aria: ({ invalid: true, describedby: "webauthn_remove_error_message" } if rodauth.field_error(rodauth.webauthn_remove_param)) %>
+        <%= form.label "webauthn-remove-#{id}", "Last use: #{last_use}", class: "form-check-label" %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.webauthn_remove_param), class: "invalid-feedback", id: "webauthn_remove_error_message") if rodauth.field_error(rodauth.webauthn_remove_param) && id == usage.keys.last %>
       </div>
-    <%% end %>
+    <% end %>
   </fieldset>
-  <%%= render "submit", value: "Remove WebAuthn Authenticator" %>
-<%% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.webauthn_remove_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/webauthn_setup.html.erb

@@ -1,13 +1,25 @@
-<%% cred = <%= rodauth %>.new_webauthn_credential %>
+<% content_for :title, rodauth.webauthn_setup_page_title %>
+
+<% cred = rodauth.new_webauthn_credential %>
+
+<%= form_with url: rodauth.webauthn_setup_path, method: :post, id: "webauthn-setup-form", data: { credential_options: cred.as_json.to_json } do |form| %>
+  <%= form.hidden_field rodauth.webauthn_setup_challenge_param, value: cred.challenge %>
+  <%= form.hidden_field rodauth.webauthn_setup_challenge_hmac_param, value: rodauth.compute_hmac(cred.challenge) %>
+  <%= form.text_field rodauth.webauthn_setup_param, value: "", id: "webauthn-setup", aria: { hidden: "true" } %>
+
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
 
-<%%= form_tag <%= rodauth %>.webauthn_setup_path, method: :post, id: "webauthn-setup-form", data: { credential_options: cred.as_json.to_json } do %>
-  <%%= hidden_field_tag <%= rodauth %>.webauthn_setup_challenge_param, cred.challenge %>
-  <%%= hidden_field_tag <%= rodauth %>.webauthn_setup_challenge_hmac_param, <%= rodauth %>.compute_hmac(cred.challenge) %>
-  <%%= text_field_tag <%= rodauth %>.webauthn_setup_param, "", id: "webauthn-setup", aria: { hidden: "true" } %>
-  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <div id="webauthn-setup-button"> 
-    <%%= render "submit", value: "Setup WebAuthn Authentication" %>
+    <div class="form-group mb-3">
+      <%= form.submit rodauth.webauthn_setup_button, class: "btn btn-primary" %>
+    </div>
   </div>
-<%% end %>
+<% end %>
 
-<%%= javascript_include_tag <%= rodauth %>.webauthn_setup_js_path %>
+<%= javascript_include_tag rodauth.webauthn_setup_js_path %>

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/email_auth.text.erb

@@ -1,5 +1,5 @@
 Someone has requested a login link for the account with this email
 address.  If you did not request a login link, please ignore this
 message.  If you requested a login link, please go to
-<%%= @email_link %>
+<%= @email_link %>
 to login to this account.

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/reset_password.text.erb

@@ -1,5 +1,5 @@
 Someone has requested a password reset for the account with this email
 address.  If you did not request a password reset, please ignore this
 message.  If you requested a password reset, please go to
-<%%= @email_link %>
+<%= @email_link %>
 to reset the password for the account.

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/unlock_account.text.erb

@@ -1,5 +1,5 @@
 Someone has requested that the account with this email be unlocked.
 If you did not request the unlocking of this account, please ignore this
 message.  If you requested the unlocking of this account, please go to
-<%%= @email_link %>
+<%= @email_link %>
 to unlock this account.

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_account.text.erb

@@ -1,4 +1,4 @@
 Someone has created an account with this email address.  If you did not create
 this account, please ignore this message.  If you created this account, please go to
-<%%= @email_link %>
+<%= @email_link %>
 to verify the account.

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_login_change.text.erb

@@ -1,10 +1,10 @@
 Someone with an account has requested their login be changed to this email address:
 
-Old email: <%%= @old_login %>
+Old email: <%= @old_login %>
 
-New email: <%%= @new_login %>
+New email: <%= @new_login %>
 
 If you did not request this login change, please ignore this message.  If you
 requested this login change, please go to
-<%%= @email_link %>
+<%= @email_link %>
 to verify the login change.