diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-17 18:09:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 18:09:30 +0200 |
| commit | 32075fe27f699d5a586e6ecf26c172550f9d4086 (patch) | |
| tree | 61f48fa2dee608f72990f76a8f0497d670339252 /app/views/settings | |
| parent | 4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff) | |
| parent | a16ff45d81d77d93f33ad57e746c780392ab1a1c (diff) | |
Merge pull request #642 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/exports/show.html.haml | 14 | ||||
| -rw-r--r-- | app/views/settings/imports/show.html.haml | 11 |
2 files changed, 18 insertions, 7 deletions
diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml index 30cd26914..ef2d2b894 100644 --- a/app/views/settings/exports/show.html.haml +++ b/app/views/settings/exports/show.html.haml @@ -9,16 +9,24 @@ %td= number_to_human_size @export.total_storage %td %tr + %th= t('accounts.statuses') + %td= number_with_delimiter @export.total_statuses + %td + %tr %th= t('exports.follows') - %td= number_to_human @export.total_follows + %td= number_with_delimiter @export.total_follows %td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv) %tr + %th= t('accounts.followers') + %td= number_with_delimiter @export.total_followers + %td + %tr %th= t('exports.blocks') - %td= number_to_human @export.total_blocks + %td= number_with_delimiter @export.total_blocks %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv) %tr %th= t('exports.mutes') - %td= number_to_human @export.total_mutes + %td= number_with_delimiter @export.total_mutes %td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv) %p.muted-hint= t('exports.archive_takeout.hint_html') diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml index 991dd4e94..2b43cb134 100644 --- a/app/views/settings/imports/show.html.haml +++ b/app/views/settings/imports/show.html.haml @@ -1,11 +1,14 @@ - 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}") }, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' - = f.input :data, wrapper: :with_label, hint: t('simple_form.hints.imports.data') + %p.hint= t('imports.preface') + + .field-group + = f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + + .field-group + = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data') .actions = f.button :button, t('imports.upload'), type: :submit |