diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-30 19:42:33 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-30 19:42:33 +0200 |
| commit | e8875c6046615778c7ae6f1fc0c4a195fb5d3a03 (patch) | |
| tree | f3323758f605bbf792fd422d04d86636e64f0345 /app/views | |
| parent | 03fb6c16ecc3c36104185507d601af87edecc655 (diff) | |
Import feature for following/blocking lists (addresses #62, #177, #201, #454)
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/admin.html.haml | 9 | ||||
| -rw-r--r-- | app/views/settings/imports/show.html.haml | 11 |
2 files changed, 20 insertions, 0 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 750d6036f..59fe078df 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -12,6 +12,15 @@ .content-wrapper .content %h2= yield :page_title + + - if flash[:notice] + .flash-message.notice + %strong= flash[:notice] + + - if flash[:alert] + .flash-message.alert + %strong= flash[:alert] + = yield = render template: "layouts/application", locals: { body_classes: 'admin' } diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml new file mode 100644 index 000000000..8502913dc --- /dev/null +++ b/app/views/settings/imports/show.html.haml @@ -0,0 +1,11 @@ +- content_for :page_title do + = t('settings.import') + +%p.hint= t('imports.preface') + += simple_form_for @import, url: settings_import_path do |f| + = f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") } + = f.input :data, wrapper: :with_label, hint: t('simple_form.hints.imports.data') + + .actions + = f.button :button, t('imports.upload'), type: :submit |