Profile editing: Removes old profile editing page (#38584)

2026-04-07 13:52:04 +00:00
1 parent db13dddcf9
commit e4e7e679b3
@@ -5,19 +5,4 @@
  %h1= t('settings.profile')
  = render partial: 'settings/shared/profile_navigation'

-= simple_form_for @featured_tag, url: settings_featured_tags_path do |f|
-  = render 'shared/error_messages', object: @featured_tag
-
-  %p.lead= t('featured_tags.hint_html')
-
-  .fields-group
-    = f.input :name,
-              hint: featured_tags_hint(@recently_used_tags),
-              wrapper: :with_block_label
-
-  .actions
-    = f.button :button, t('featured_tags.add_new'), type: :submit
-
-%hr.spacer/
-
-= render collection: @featured_tags, partial: 'settings/featured_tags/featured_tag'
+= render partial: 'settings/shared/profile_new_notice'
@@ -5,76 +5,4 @@
  %h1= t('settings.profile')
  = render partial: 'settings/shared/profile_navigation'

- if Mastodon::Feature.profile_redesign_enabled?
-  %aside.callout
-    = material_symbol 'info'
-    .content
-      .body
-        %p.title= t('edit_profile.redesign_title')
-        %p= t('edit_profile.redesign_body')
-      = link_to t('edit_profile.redesign_button'), '/profile/edit'
-
-= simple_form_for @account, url: settings_profile_path, html: { id: :edit_profile } do |f|
-  = render 'shared/error_messages', object: @account
-
-  %p.lead= t('edit_profile.hint_html')
-
-  %h2= t('edit_profile.basic_information')
-
-  .fields-row
-    .fields-row__column.fields-row__column-6
-      .fields-group
-        = f.input :display_name, wrapper: :with_block_label, input_html: { maxlength: Account::DISPLAY_NAME_LENGTH_LIMIT, data: { default: @account.username } }
-
-      .fields-group
-        = f.input :note, wrapper: :with_block_label, input_html: { maxlength: Account::NOTE_LENGTH_LIMIT }
-
-    .fields-row__column.fields-group.fields-row__column-6
-      .input.with_block_label
-        %label= t('simple_form.labels.defaults.fields')
-        %span.hint= t('simple_form.hints.account.fields')
-
-        = f.simple_fields_for :fields do |fields_f|
-          .row
-            = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name'), input_html: { maxlength: Account::Field::MAX_CHARACTERS_LOCAL }
-            = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value'), input_html: { maxlength: Account::Field::MAX_CHARACTERS_LOCAL }
-
-  .fields-row
-    .fields-row__column.fields-row__column-6
-      .fields-group
-        = f.input :avatar,
-                  hint: t('simple_form.hints.defaults.avatar', dimensions: Account::Avatar::AVATAR_GEOMETRY, size: number_to_human_size(Account::Avatar::AVATAR_LIMIT)),
-                  input_html: { accept: Account::Avatar::AVATAR_IMAGE_MIME_TYPES },
-                  wrapper: :with_block_label
-
-    .fields-row__column.fields-row__column-6
-      .fields-group
-        = image_tag @account.avatar.url, class: 'fields-group__thumbnail', id: 'account_avatar-preview'
-        - if @account.avatar.present?
-          = link_to settings_profile_picture_path('avatar'), data: { method: :delete }, class: 'link-button link-button--destructive' do
-            = material_symbol 'delete'
-            = t('generic.delete')
-
-  .fields-row
-    .fields-row__column.fields-row__column-6
-      .fields-group
-        = f.input :header,
-                  hint: t('simple_form.hints.defaults.header', dimensions: Account::Header::HEADER_GEOMETRY, size: number_to_human_size(Account::Header::HEADER_LIMIT)),
-                  input_html: { accept: Account::Header::HEADER_IMAGE_MIME_TYPES },
-                  wrapper: :with_block_label
-
-    .fields-row__column.fields-row__column-6
-      .fields-group
-        = image_tag @account.header.url, class: 'fields-group__thumbnail', id: 'account_header-preview'
-        - if @account.header.present?
-          = link_to settings_profile_picture_path('header'), data: { method: :delete }, class: 'link-button link-button--destructive' do
-            = material_symbol 'delete'
-            = t('generic.delete')
-
-  %h2= t('edit_profile.other')
-
-  .fields-group
-    = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
-
-  .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+= render partial: 'settings/shared/profile_new_notice'
@@ -0,0 +1,7 @@
+%aside.callout
+  = material_symbol 'info'
+  .content
+    .body
+      %p.title= t('edit_profile.redesign_title')
+      %p= t('edit_profile.redesign_body')
+    = link_to t('edit_profile.redesign_button'), '/profile/edit'
@@ -5,6 +5,8 @@
  %h1= t('settings.profile')
  = render partial: 'settings/shared/profile_navigation'

+= render partial: 'settings/shared/profile_new_notice'
+
 .simple_form.form-section
  %h2.heading-medium= t('verification.website_verification')