Merge remote-tracking branch 'parent/main' into upstream-20241216

app/views/auth/registrations/new.html.haml

@@ -37,7 +37,7 @@
               required: true
     = f.input :password_confirmation,
               hint: false,
-              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password' },
+              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password', maxlength: User.password_length.last },
               placeholder: t('simple_form.labels.defaults.confirm_password'),
               required: true
     = f.input :confirm_password,
@@ -72,8 +72,8 @@
   .fields-group
     = f.input :agreement,
               as: :boolean,
-              label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path),
-              required: true,
+              label: t('auth.user_agreement_html', privacy_policy_path: privacy_policy_path, terms_of_service_path: terms_of_service_path),
+              required: false,
               wrapper: :with_label
 
   - if Setting.registration_button_message.present?
@@ -82,5 +82,3 @@
 
   .actions
     = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
-
-.form-footer= render 'auth/shared/links'

app/views/auth/registrations/rules.html.haml

@@ -27,5 +27,3 @@
     - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
     = link_to t('auth.rules.accept'), accept_path, class: 'button'
     = link_to t('auth.rules.back'), root_path, class: 'button button-tertiary'
-
-.form-footer= render 'auth/shared/links'

app/views/auth/setup/show.html.haml

@@ -11,17 +11,17 @@
 
   = render 'shared/error_messages', object: @user
 
-  %p.lead
-    %strong= t('auth.setup.link_not_received')
-  %p.lead= t('auth.setup.email_below_hint_html')
+  %details
+    %summary.lead
+      %strong= t('auth.setup.link_not_received')
 
-  .fields-group
-    = f.input :email,
-              hint: false,
-              input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' },
-              required: true
+    %p.lead= t('auth.setup.email_below_hint_html')
 
-  .actions
-    = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true
+    .fields-group
+      = f.input :email,
+                hint: false,
+                input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.email') },
+                required: true
 
-.form-footer= render 'auth/shared/links'
+    .actions
+      = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true