From 69473c4fbec7775cae2badfeb16990aa0e9e85a4 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Sun, 20 Sep 2020 03:37:04 -0500 Subject: [Feature] Community-managed custom emoji --- .../admin/custom_emojis/_custom_emoji.html.haml | 35 --------- app/views/admin/custom_emojis/index.html.haml | 85 ---------------------- app/views/admin/custom_emojis/new.html.haml | 13 ---- 3 files changed, 133 deletions(-) delete mode 100644 app/views/admin/custom_emojis/_custom_emoji.html.haml delete mode 100644 app/views/admin/custom_emojis/index.html.haml delete mode 100644 app/views/admin/custom_emojis/new.html.haml (limited to 'app/views/admin') diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml deleted file mode 100644 index 526c844e9..000000000 --- a/app/views/admin/custom_emojis/_custom_emoji.html.haml +++ /dev/null @@ -1,35 +0,0 @@ -.batch-table__row - %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox - = f.check_box :custom_emoji_ids, { multiple: true, include_hidden: false }, custom_emoji.id - .batch-table__row__content.batch-table__row__content--with-image - .batch-table__row__content__image - = custom_emoji_tag(custom_emoji, animate = current_account&.user&.setting_auto_play_gif) - - .batch-table__row__content__text - %samp= ":#{custom_emoji.shortcode}:" - - - if custom_emoji.local? - %span.account-role.bot= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized') - - .batch-table__row__content__extra - - if custom_emoji.local? - = t('admin.accounts.location.local') - - else - = custom_emoji.domain - - - if custom_emoji.local_counterpart.present? - • - = t('admin.accounts.location.local') - - %br/ - - - if custom_emoji.disabled? - = t('admin.custom_emojis.disabled') - - else - = t('admin.custom_emojis.enabled') - - if custom_emoji.local? - • - - if custom_emoji.visible_in_picker? - = t('admin.custom_emojis.listed') - - else - = t('admin.custom_emojis.unlisted') diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml deleted file mode 100644 index b6cf7ba64..000000000 --- a/app/views/admin/custom_emojis/index.html.haml +++ /dev/null @@ -1,85 +0,0 @@ -- content_for :page_title do - = t('admin.custom_emojis.title') - -- if can?(:create, :custom_emoji) - - content_for :heading_actions do - = link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button' - -.filters - .filter-subset - %strong= t('admin.accounts.location.title') - %ul - %li= filter_link_to t('admin.accounts.location.all'), local: nil, remote: nil - %li - - if selected? local: '1', remote: nil - = filter_link_to t('admin.accounts.location.local'), {local: nil, remote: nil}, {local: '1', remote: nil} - - else - = filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil - %li - - if selected? remote: '1', local: nil - = filter_link_to t('admin.accounts.location.remote'), {remote: nil, local: nil}, {remote: '1', local: nil} - - else - = filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil - -= form_tag admin_custom_emojis_url, method: 'GET', class: 'simple_form' do - .fields-group - - CustomEmojiFilter::KEYS.each do |key| - = hidden_field_tag key, params[key] if params[key].present? - - - %i(shortcode by_domain).each do |key| - .input.string.optional - = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.custom_emojis.#{key}") - - .actions - %button.button= t('admin.accounts.search') - = link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative' - -= form_for(@form, url: batch_admin_custom_emojis_path) do |f| - = hidden_field_tag :page, params[:page] || 1 - - - CustomEmojiFilter::KEYS.each do |key| - = hidden_field_tag key, params[key] if params[key].present? - - .batch-table - .batch-table__toolbar - %label.batch-table__toolbar__select.batch-checkbox-all - = check_box_tag :batch_checkbox_all, nil, false - .batch-table__toolbar__actions - - if params[:local] == '1' - = f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - = f.button safe_join([fa_icon('eye'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - = f.button safe_join([fa_icon('eye-slash'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - - if can?(:destroy, :custom_emoji) - = f.button safe_join([fa_icon('times'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - - if can?(:copy, :custom_emoji) && params[:local] != '1' - = f.button safe_join([fa_icon('copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } - - - if params[:local] == '1' - .batch-table__form.simple_form - .fields-row - .fields-group.fields-row__column.fields-row__column-6 - .input.select.optional - .label_input - = f.select :category_id, options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'), prompt: t('admin.custom_emojis.assign_category'), class: 'select optional', 'aria-label': t('admin.custom_emojis.assign_category') - - .fields-group.fields-row__column.fields-row__column-6 - .input.string.optional - .label_input - = f.text_field :category_name, class: 'string optional', placeholder: t('admin.custom_emojis.create_new_category'), 'aria-label': t('admin.custom_emojis.create_new_category') - - .batch-table__body - - if @custom_emojis.empty? - = nothing_here 'nothing-here--under-tabs' - - else - = render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f } - -= paginate @custom_emojis - diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml deleted file mode 100644 index e15a07cb8..000000000 --- a/app/views/admin/custom_emojis/new.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -- content_for :page_title do - = t('.title') - -= simple_form_for @custom_emoji, url: admin_custom_emojis_path do |f| - = render 'shared/error_messages', object: @custom_emoji - - .fields-group - = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint') - .fields-group - = f.input :image, wrapper: :with_label, input_html: { accept: 'image/png' }, hint: t('admin.custom_emojis.image_hint') - - .actions - = f.button :button, t('admin.custom_emojis.upload'), type: :submit -- cgit