diff options
| author | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-07-22 01:16:53 +0000 |
|---|---|---|
| committer | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-07-22 01:16:53 +0000 |
| commit | 984d2d4cb626dd3a4da707ecf1e8ad45b476d8fb (patch) | |
| tree | 9a7ba46c448cca4a4a245224bf421941a33c263d /app/views | |
| parent | 0244019ca17288802a144c84b7e0f319f1685695 (diff) | |
| parent | 8d6c3cd48ae4f96752ff6b698bc7244d97aa9a27 (diff) | |
Merge that good fresh upstream shit
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/instances/_instance.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml index 5c6783d06..435cd8f64 100644 --- a/app/views/admin/instances/_instance.html.haml +++ b/app/views/admin/instances/_instance.html.haml @@ -3,3 +3,5 @@ = instance.domain %td.count = instance.accounts_count + %td + = table_link_to 'paper-plane-o', t('admin.accounts.resubscribe'), resubscribe_admin_instances_url(by_domain: instance.domain), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 8dc61fec9..3fa540bba 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -7,10 +7,17 @@ .fields-group = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 500 - @account.note.size).html_safe + + .card.compact{ style: "background-image: url(#{@account.header.url(:original)})" } + .avatar= image_tag @account.avatar.url(:original) + + .fields-group = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar') + = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header') - = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') + .fields-group + = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') .actions = f.button :button, t('generic.save_changes'), type: :submit |