diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/api/v1/accounts/relationship.rabl | 1 | ||||
| -rw-r--r-- | app/views/api/v1/accounts/show.rabl | 6 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 12 |
3 files changed, 11 insertions, 8 deletions
diff --git a/app/views/api/v1/accounts/relationship.rabl b/app/views/api/v1/accounts/relationship.rabl index 84043e9cd..22b37586e 100644 --- a/app/views/api/v1/accounts/relationship.rabl +++ b/app/views/api/v1/accounts/relationship.rabl @@ -4,3 +4,4 @@ attribute :id node(:following) { |account| @following[account.id] || false } node(:followed_by) { |account| @followed_by[account.id] || false } node(:blocking) { |account| @blocking[account.id] || false } +node(:requested) { |account| @requested[account.id] || false } diff --git a/app/views/api/v1/accounts/show.rabl b/app/views/api/v1/accounts/show.rabl index 22cb87f6c..151a5080d 100644 --- a/app/views/api/v1/accounts/show.rabl +++ b/app/views/api/v1/accounts/show.rabl @@ -1,11 +1,11 @@ object @account -attributes :id, :username, :acct, :display_name +attributes :id, :username, :acct, :display_name, :locked node(:note) { |account| Formatter.instance.simplified_format(account) } node(:url) { |account| TagManager.instance.url_for(account) } -node(:avatar) { |account| full_asset_url(account.avatar.url( :original)) } -node(:header) { |account| full_asset_url(account.header.url( :original)) } +node(:avatar) { |account| full_asset_url(account.avatar.url(:original)) } +node(:header) { |account| full_asset_url(account.header.url(:original)) } node(:followers_count) { |account| defined?(@followers_counts_map) ? (@followers_counts_map[account.id] || 0) : (account.try(:followers_count) || account.followers.count) } node(:following_count) { |account| defined?(@following_counts_map) ? (@following_counts_map[account.id] || 0) : (account.try(:following_count) || account.following.count) } node(:statuses_count) { |account| defined?(@statuses_counts_map) ? (@statuses_counts_map[account.id] || 0) : (account.try(:statuses_count) || account.statuses.count) } diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index a8ea9bbc4..6bb458aa2 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -4,11 +4,13 @@ = simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f| = render 'shared/error_messages', object: @account - = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name') - = f.input :note, placeholder: t('simple_form.labels.defaults.note') - = f.input :avatar, wrapper: :with_label - = f.input :header, wrapper: :with_label - = f.input :locked, as: :boolean, wrapper: :with_label + .fields-group + = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name') + = f.input :note, placeholder: t('simple_form.labels.defaults.note') + = f.input :avatar, wrapper: :with_label + = f.input :header, wrapper: :with_label + + = 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 |