diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-22 16:10:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-22 16:10:44 +0100 |
| commit | 9abb227250bd2b377d96626122d431ba30c5f5e0 (patch) | |
| tree | c3072e0098155cbb7b6f86830cfd0b174703f23e /app/views/admin/warning_presets/_warning_preset.html.haml | |
| parent | 7115b0b8c99b7e88aee264be75945e592dec33e4 (diff) | |
| parent | cd6d851d83c38c4f160ae939e08a913bd98fbd8f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.
Diffstat (limited to 'app/views/admin/warning_presets/_warning_preset.html.haml')
| -rw-r--r-- | app/views/admin/warning_presets/_warning_preset.html.haml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/admin/warning_presets/_warning_preset.html.haml b/app/views/admin/warning_presets/_warning_preset.html.haml new file mode 100644 index 000000000..a58199c80 --- /dev/null +++ b/app/views/admin/warning_presets/_warning_preset.html.haml @@ -0,0 +1,10 @@ +.announcements-list__item + = link_to edit_admin_warning_preset_path(warning_preset), class: 'announcements-list__item__title' do + = warning_preset.title.presence || truncate(warning_preset.text) + + .announcements-list__item__action-bar + .announcements-list__item__meta + = truncate(warning_preset.text) + + %div + = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset) |