2016-03-14 18:41:13 +02:00
|
|
|
- content_for :page_title do
|
2016-11-16 00:02:57 +02:00
|
|
|
= t('settings.edit_profile')
|
2016-03-14 18:41:13 +02:00
|
|
|
|
2020-03-08 17:04:03 +02:00
|
|
|
- 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|
|
2016-10-18 17:37:15 +03:00
|
|
|
= render 'shared/error_messages', object: @account
|
|
|
|
|
|
2018-09-18 17:45:58 +03:00
|
|
|
.fields-row
|
|
|
|
|
.fields-row__column.fields-group.fields-row__column-6
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
Upstream disabled the embed controller for reblogs.
Not a real conflict, but glitch-soc has an extra line to deal
with its theming system.
Ported upstream changes.
- `app/javascript/packs/public.js`:
Upstream made changes to get rid of most inline CSS, this changes
javascript for public pages, which in glitch are split between
different files. Ported those changes.
- `app/models/status.rb`:
Upstream changed the block check in `Status#permitted_for` to
include domain-block checks. Not a real conflict with glitch-soc,
but our scope is slightly different, as our scope for
unauthenticated access do not include instance-local toots.
Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
Not a real conflict, upstream added a new field to the instance
serializer, the conflict is one line above since we added more of
that.
Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
Upstream got rid of most inline CSS and moved hidden elements
to data attributes in the process, in fields were we have
different values.
Ported upstream changes while keeping our glitch-specific
values.
- `app/views/statuses/_simple_status.html.haml`:
Upstream got rid of inline CSS on an HAML line we treat
differently, stripping empty text nodes.
Ported upstream changes to the style attribute, keeping
the empty text node stripping behavior.
2020-05-03 22:20:42 +03:00
|
|
|
= f.input :display_name, wrapper: :with_label, input_html: { maxlength: Account::MAX_DISPLAY_NAME_LENGTH, data: { default: @account.username } }, hint: false
|
2018-10-22 03:57:25 +03:00
|
|
|
= f.input :note, wrapper: :with_label, input_html: { maxlength: Account::MAX_NOTE_LENGTH }, hint: false
|
2017-07-21 06:28:51 +03:00
|
|
|
|
2018-09-18 17:45:58 +03:00
|
|
|
.fields-row
|
|
|
|
|
.fields-row__column.fields-row__column-6
|
|
|
|
|
= render 'application/card', account: @account
|
2017-07-21 06:28:51 +03:00
|
|
|
|
2018-09-18 17:45:58 +03:00
|
|
|
.fields-row__column.fields-group.fields-row__column-6
|
2020-04-20 15:03:03 +03:00
|
|
|
= 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)
|
2018-11-29 03:56:09 +02:00
|
|
|
|
2020-04-20 15:03:03 +03:00
|
|
|
= 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)
|
2018-09-18 17:45:58 +03:00
|
|
|
|
|
|
|
|
%hr.spacer/
|
2016-12-23 00:03:57 +02:00
|
|
|
|
2017-07-21 06:28:51 +03:00
|
|
|
.fields-group
|
|
|
|
|
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
|
2016-03-14 18:41:13 +02:00
|
|
|
|
2018-05-07 10:31:07 +03:00
|
|
|
.fields-group
|
|
|
|
|
= f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
|
|
|
|
|
|
2018-12-11 20:18:29 +02:00
|
|
|
- if Setting.profile_directory
|
|
|
|
|
.fields-group
|
2019-08-30 01:14:36 +03:00
|
|
|
= f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
|
2018-12-06 18:36:11 +02:00
|
|
|
|
2018-09-18 17:45:58 +03:00
|
|
|
%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')
|
2018-04-14 13:41:08 +03:00
|
|
|
|
2018-09-18 17:45:58 +03:00
|
|
|
= f.simple_fields_for :fields do |fields_f|
|
|
|
|
|
.row
|
2018-10-26 02:55:24 +03:00
|
|
|
= 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 }
|
2018-09-18 17:45:58 +03:00
|
|
|
|
|
|
|
|
.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')
|
2018-04-14 13:41:08 +03:00
|
|
|
|
2016-09-25 16:48:20 +03:00
|
|
|
.actions
|
2016-11-16 00:02:57 +02:00
|
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|
2017-11-27 23:47:06 +02:00
|
|
|
|
|
|
|
|
%hr/
|
|
|
|
|
|
|
|
|
|
%h6= t('auth.migrate_account')
|
|
|
|
|
%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
|
2018-09-18 17:45:58 +03:00
|
|
|
|
2019-09-19 21:58:19 +03:00
|
|
|
%hr.spacer/
|
|
|
|
|
|
|
|
|
|
%h6= t 'migrations.incoming_migrations'
|
|
|
|
|
%p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
|
|
|
|
|
|
2018-09-18 17:45:58 +03:00
|
|
|
- if open_deletion?
|
|
|
|
|
%hr.spacer/
|
|
|
|
|
|
|
|
|
|
%h6= t('auth.delete_account')
|
|
|
|
|
%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
|
