rodauth-rails 0.15.0 → 0.18.0

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

@@ -1,7 +1,37 @@
-<%%= form_tag <%= rodauth %>.create_account_path, method: :post do %>
-  <%%= render "login_field" %>
-  <%%= render "login_confirm_field" if <%= rodauth %>.require_login_confirmation? %>
-  <%%= render "password_field" if <%= rodauth %>.create_account_set_password? %>
-  <%%= render "password_confirm_field" if <%= rodauth %>.create_account_set_password? && <%= rodauth %>.require_password_confirmation? %>
-  <%%= render "submit", value: "Create Account" %>
-<%% end %>
+<% content_for :title, rodauth.create_account_page_title %>
+
+<%= form_with url: rodauth.create_account_path, method: :post do |form| %>
+  <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>
+
+  <% if rodauth.require_login_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "login-confirm", rodauth.login_confirm_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_confirm_param, value: params[rodauth.login_confirm_param], id: "login-confirm", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_confirm_param)}", aria: ({ invalid: true, describedby: "login-confirm_error_message" } if rodauth.field_error(rodauth.login_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_confirm_param), class: "invalid-feedback", id: "login-confirm_error_message") if rodauth.field_error(rodauth.login_confirm_param) %>
+    </div>
+  <% end %>
+
+  <% if rodauth.create_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.create_account_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

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

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

@@ -1,3 +1,5 @@
-<%%= render "login_form_header" %>
-<%%= render "login_form" %>
-<%%= render "login_form_footer" %>
+<% content_for :title, rodauth.login_page_title %>
+
+<%= render "login_form_header" %>
+<%= render "login_form" %>
+<%= render "login_form_footer" %>

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

@@ -1,4 +1,16 @@
-<%%= form_tag <%= rodauth %>.logout_path, method: :post do %>
-  <%%= render "global_logout_field" if <%= rodauth %>.features.include?(:active_sessions) %>
-  <%%= render "submit", value: "Logout", class: "btn btn-warning" %>
-<%% end %>
+<% content_for :title, rodauth.logout_page_title %>
+
+<%= form_with url: rodauth.logout_path, method: :post do |form| %>
+  <% if rodauth.features.include?(:active_sessions) %>
+    <div class="form-group mb-3">
+      <div class="form-check">
+        <%= form.check_box rodauth.global_logout_param, id: "global-logout", class: "form-check-input" %>
+        <%= form.label "global-logout", rodauth.global_logout_label, class: "form-check-label" %>
+      </div>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.logout_button, class: "btn btn-warning" %>
+  </div>
+<% end %>

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

@@ -1,3 +1,5 @@
-<%%= render "login_form_header" %>
-<%%= <%= rodauth %>.render_multi_phase_login_forms.html_safe %>
-<%%= render "login_form_footer" %>
+<% content_for :title, rodauth.multi_phase_login_page_title %>
+
+<%= render "login_form_header" %>
+<%== rodauth.render_multi_phase_login_forms %>
+<%= render "login_form_footer" %>

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

@@ -1,4 +1,17 @@
-<%%= form_tag <%= rodauth %>.otp_auth_path, method: :post do %>
-  <%%= render "otp_auth_code_field" %>
-  <%%= render "submit", value: "Authenticate Using TOTP" %>
-<%% end %>
+<% content_for :title, rodauth.otp_auth_page_title %>
+
+<%= form_with url: rodauth.otp_auth_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "otp-auth-code", rodauth.otp_auth_label, class: "form-label" %>
+    <div class="row">
+      <div class="col-sm-3">
+        <%= form.text_field rodauth.otp_auth_param, value: "", id: "otp-auth-code", autocomplete: "off", inputmode: "numeric", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.otp_auth_param)}", aria: ({ invalid: true, describedby: "otp-auth-code_error_message" } if rodauth.field_error(rodauth.otp_auth_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.otp_auth_param), class: "invalid-feedback", id: "otp-auth-code_error_message") if rodauth.field_error(rodauth.otp_auth_param) %>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.otp_auth_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,4 +1,15 @@
-<%%= form_tag <%= rodauth %>.otp_disable_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
-  <%%= render "submit", value: "Disable TOTP Authentication", class: "btn btn-warning" %>
-<%% end %>
+<% content_for :title, rodauth.otp_disable_page_title %>
+
+<%= form_with url: rodauth.otp_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.otp_disable_button, class: "btn btn-warning" %>
+  </div>
+<% end %>

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

@@ -1,23 +1,43 @@
-<%%= form_tag <%= rodauth %>.otp_setup_path, method: :post do %>
-  <%%= hidden_field_tag <%= rodauth %>.otp_setup_param, <%= rodauth %>.otp_user_key, id: "otp-key" %>
-  <%%= hidden_field_tag <%= rodauth %>.otp_setup_raw_param, <%= rodauth %>.otp_key, id: "otp-hmac-secret" if <%= rodauth %>.otp_keys_use_hmac? %>
+<% content_for :title, rodauth.otp_setup_page_title %>
+
+<%= form_with url: rodauth.otp_setup_path, method: :post do |form| %>
+  <%= form.hidden_field rodauth.otp_setup_param, value: rodauth.otp_user_key, id: "otp-key" %>
+  <%= form.hidden_field rodauth.otp_setup_raw_param, value: rodauth.otp_key, id: "otp-hmac-secret" if rodauth.otp_keys_use_hmac? %>
 
   <div class="form-group mb-3">
-    <p>Secret: <%%= <%= rodauth %>.otp_user_key %></p>
-    <p>Provisioning URL: <%%= <%= rodauth %>.otp_provisioning_uri %></p>
+    <p><%= rodauth.otp_secret_label %>: <%= rodauth.otp_user_key %></p>
+    <p><%= rodauth.otp_provisioning_uri_label %>: <%= rodauth.otp_provisioning_uri %></p>
   </div>
 
   <div class="row">
     <div class="col-lg-6 col-lg">
       <div class="form-group mb-3">
-        <p><%%= <%= rodauth %>.otp_qr_code.html_safe %></p>
+        <p><%== rodauth.otp_qr_code %></p>
       </div>
     </div>
 
     <div class="col-lg-6 col-lg">
-      <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
-      <%%= render "otp_auth_code_field" %>
-      <%%= render "submit", value: "Setup TOTP Authentication" %>
+      <% 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 "otp-auth-code", rodauth.otp_auth_label, class: "form-label" %>
+        <div class="row">
+          <div class="col-sm-3">
+            <%= form.text_field rodauth.otp_auth_param, value: "", id: "otp-auth-code", autocomplete: "off", inputmode: "numeric", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.otp_auth_param)}", aria: ({ invalid: true, describedby: "otp-auth-code_error_message" } if rodauth.field_error(rodauth.otp_auth_param)) %>
+            <%= content_tag(:span, rodauth.field_error(rodauth.otp_auth_param), class: "invalid-feedback", id: "otp-auth-code_error_message") if rodauth.field_error(rodauth.otp_auth_param) %>
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group mb-3">
+        <%= form.submit rodauth.otp_setup_button, class: "btn btn-primary" %>
+      </div>
     </div>
   </div>
-<%% end %>
+<% end %>

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

@@ -1,4 +1,13 @@
-<%%= form_tag <%= rodauth %>.recovery_auth_path, method: :post do %>
-  <%%= render "recovery_code_field" %>
-  <%%= render "submit", value: "Authenticate via Recovery Code" %>
-<%% end %>
+<% content_for :title, rodauth.recovery_auth_page_title %>
+
+<%= form_with url: rodauth.recovery_auth_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "recovery-code", rodauth.recovery_codes_label, class: "form-label" %>
+    <%= form.text_field rodauth.recovery_codes_param, value: "", id: "recovery-code", autocomplete: "off", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.recovery_codes_param)}", aria: ({ invalid: true, describedby: "recovery-code_error_message" } if rodauth.field_error(rodauth.recovery_codes_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.recovery_codes_param), class: "invalid-feedback", id: "recovery-code_error_message") if rodauth.field_error(rodauth.recovery_codes_param) %>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.recovery_auth_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1 +1,15 @@
-<%%= render "recovery_codes_form" %>
+<% content_for :title, rodauth.recovery_codes_page_title %>
+
+<%= form_with url: rodauth.recovery_codes_path, method: :post, data: { turbo: false } 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.recovery_codes_button || rodauth.view_recovery_codes_button, name: (rodauth.add_recovery_codes_param if rodauth.recovery_codes_button), class: "btn btn-primary" %>
+  </div>
+<% end %>

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 %>