mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 05:13:01 +00:00
1fbd1fa5c4
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.
78 lines
3.4 KiB
Plaintext
78 lines
3.4 KiB
Plaintext
- content_for :page_title do
|
|
= t('settings.edit_profile')
|
|
|
|
- content_for :heading_actions do
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_profile'
|
|
|
|
= simple_form_for @account, url: settings_profile_path, html: { method: :put, id: 'edit_profile' } do |f|
|
|
= render 'shared/error_messages', object: @account
|
|
|
|
.fields-row
|
|
.fields-row__column.fields-group.fields-row__column-6
|
|
= f.input :display_name, wrapper: :with_label, input_html: { maxlength: Account::MAX_DISPLAY_NAME_LENGTH, data: { default: @account.username } }, hint: false
|
|
= f.input :note, wrapper: :with_label, input_html: { maxlength: Account::MAX_NOTE_LENGTH }, hint: false
|
|
|
|
.fields-row
|
|
.fields-row__column.fields-row__column-6
|
|
= render 'application/card', account: @account
|
|
|
|
.fields-row__column.fields-group.fields-row__column-6
|
|
= f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)), @account.header)
|
|
|
|
= f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)), @account.avatar)
|
|
|
|
%hr.spacer/
|
|
|
|
.fields-group
|
|
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
|
|
|
|
.fields-group
|
|
= f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
|
|
|
|
.fields-group
|
|
= f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
|
|
|
|
.fields-group
|
|
= f.input :hide_collections, as: :boolean, wrapper: :with_label, label: t('simple_form.labels.defaults.setting_hide_network'), hint: t('simple_form.hints.defaults.setting_hide_network')
|
|
|
|
%hr.spacer/
|
|
|
|
.fields-row
|
|
.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.defaults.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: 255 }
|
|
= fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }
|
|
|
|
.fields-row__column.fields-group.fields-row__column-6
|
|
%h6= t('verification.verification')
|
|
%p.hint= t('verification.explanation_html')
|
|
|
|
.input-copy
|
|
.input-copy__wrapper
|
|
%input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: 'me').to_str }
|
|
%button{ type: :button }= t('generic.copy')
|
|
|
|
.actions
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|
|
|
|
%hr/
|
|
|
|
%h6= t('auth.migrate_account')
|
|
%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
|
|
|
|
%hr.spacer/
|
|
|
|
%h6= t 'migrations.incoming_migrations'
|
|
%p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
|
|
|
|
- if open_deletion?
|
|
%hr.spacer/
|
|
|
|
%h6= t('auth.delete_account')
|
|
%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
|