diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
| commit | b28b405b9763a0bb3df653b51e6d084b42e9a54d (patch) | |
| tree | c69f1ccb99440fea8cc94014e77687238e205160 /app/views | |
| parent | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff) | |
| parent | dc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 6 | ||||
| -rw-r--r-- | app/views/settings/applications/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/applications/show.html.haml | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 47ee02cf0..94ec5ae5b 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -30,8 +30,12 @@ - if account.user_admin? .roles - .account-role + .account-role.admin = t 'accounts.roles.admin' + - elsif account.user_moderator? + .roles + .account-role.moderator + = t 'accounts.roles.moderator' .bio .account__header__content.p-note.emojify!=processed_bio[:text] - if processed_bio[:metadata].length > 0 diff --git a/app/views/settings/applications/new.html.haml b/app/views/settings/applications/new.html.haml index 5274a430c..aa2281fea 100644 --- a/app/views/settings/applications/new.html.haml +++ b/app/views/settings/applications/new.html.haml @@ -3,6 +3,6 @@ = simple_form_for @application, url: settings_applications_path do |f| = render 'fields', f: f - + .actions = f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml index 12baed088..390682d6f 100644 --- a/app/views/settings/applications/show.html.haml +++ b/app/views/settings/applications/show.html.haml @@ -25,7 +25,7 @@ = simple_form_for @application, url: settings_application_path(@application), method: :put do |f| = render 'fields', f: f - + .actions = f.button :button, t('generic.save_changes'), type: :submit |