diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-15 18:17:37 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 14:50:42 +0200 |
commit | f26f1145ac0fab4a657ee1fc784e824858601bd3 (patch) | |
tree | 3980b53a1440a8e6d4ee8c539668c3c190363017 /app/views/admin/relays/index.html.haml | |
parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
parent | 7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
Diffstat (limited to 'app/views/admin/relays/index.html.haml')
-rw-r--r-- | app/views/admin/relays/index.html.haml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/app/views/admin/relays/index.html.haml b/app/views/admin/relays/index.html.haml new file mode 100644 index 000000000..1636a53f8 --- /dev/null +++ b/app/views/admin/relays/index.html.haml @@ -0,0 +1,20 @@ +- content_for :page_title do + = t('admin.relays.title') + +.simple_form + %p.hint= t('admin.relays.description_html') + = link_to @relays.empty? ? t('admin.relays.setup') : t('admin.relays.add_new'), new_admin_relay_path, class: 'block-button' + +- unless @relays.empty? + %hr.spacer + + .table-wrapper + %table.table + %thead + %tr + %th= t('admin.relays.inbox_url') + %th= t('admin.relays.status') + %th + %tbody + = render @relays + |