diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-19 09:46:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 09:46:26 +0200 |
| commit | 484b9314e351fcab9e25b04c0024598433d2d688 (patch) | |
| tree | 301ba59a7d214d5cf655263c95d731b9f18b6566 /app/views | |
| parent | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (diff) | |
| parent | 88a0395a58739ff0a4bc8ff79bc0b60ac2c0f736 (diff) | |
Merge pull request #652 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/invites/index.html.haml | 28 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 |
2 files changed, 18 insertions, 12 deletions
diff --git a/app/views/admin/invites/index.html.haml b/app/views/admin/invites/index.html.haml index 944a60471..42159e9f3 100644 --- a/app/views/admin/invites/index.html.haml +++ b/app/views/admin/invites/index.html.haml @@ -9,22 +9,28 @@ %li= filter_link_to t('admin.invites.filter.available'), available: 1, expired: nil %li= filter_link_to t('admin.invites.filter.expired'), available: nil, expired: 1 +%hr.spacer/ + - if policy(:invite).create? %p= t('invites.prompt') = render 'invites/form' - %hr/ + %hr.spacer/ -%table.table - %thead - %tr - %th - %th= t('invites.table.uses') - %th= t('invites.table.expires_at') - %th - %th - %tbody - = render @invites +.table-wrapper + %table.table + %thead + %tr + %th + %th= t('invites.table.uses') + %th= t('invites.table.expires_at') + %th + %th + %tbody + = render @invites = paginate @invites + +- if policy(:invite).deactivate_all? + = link_to t('admin.invites.deactivate_all'), deactivate_all_admin_invites_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 098262b2e..24911bb1e 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -42,6 +42,6 @@ %h4= t 'footer.more' %ul %li= link_to t('about.source_code'), Mastodon::Version.source_url - %li= link_to 'joinmastodon.org', 'https://joinmastodon.org' + %li= link_to t('about.apps'), 'https://joinmastodon.org/apps' = render template: 'layouts/application' |