Add: カスタム絵文字の専用編集画面/Fix: リモートの絵文字をローカルにコピー時、ライセンス情報が消失する問題 (#133)
* Add: カスタム絵文字の専用編集画面 * 新規作成画面に項目追加、編集画面に画像表示、旧テキストボックス削除 * Fix: カスタム絵文字のコピー処理で、コピーされていないプロパティがあった
This commit is contained in:
parent
72d18cb16d
commit
4735d23c21
10 changed files with 115 additions and 14 deletions
|
@ -7,11 +7,16 @@
|
|||
|
||||
.batch-table__row__content__text
|
||||
%samp= ":#{custom_emoji.shortcode}:"
|
||||
= link_to safe_join([fa_icon('pencil'), t('admin.custom_emojis.edit.label')]), edit_admin_custom_emoji_path(custom_emoji, local: params[:local], remote: params[:remote], shortcode: params[:shortcode], by_domain: params[:by_domain]), method: :get, class: 'table-action-link'
|
||||
|
||||
- if custom_emoji.local?
|
||||
%span.information-badge= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized')
|
||||
- if custom_emoji.aliases_raw.present?
|
||||
%br/
|
||||
%span= custom_emoji.aliases_raw
|
||||
%span.neutral-hint= custom_emoji.aliases_raw
|
||||
- if custom_emoji.license.present?
|
||||
%br/
|
||||
%span= custom_emoji.license
|
||||
|
||||
.batch-table__row__content__extra
|
||||
- if custom_emoji.local?
|
||||
|
|
42
app/views/admin/custom_emojis/edit.html.haml
Normal file
42
app/views/admin/custom_emojis/edit.html.haml
Normal file
|
@ -0,0 +1,42 @@
|
|||
- content_for :page_title do
|
||||
= t('.title')
|
||||
|
||||
= simple_form_for @custom_emoji, url: admin_custom_emoji_path(@custom_emoji.id), method: :put do |f|
|
||||
= render 'shared/error_messages', object: @custom_emoji
|
||||
- CustomEmojiFilter::KEYS.each do |key|
|
||||
= hidden_field_tag key, params[key] if params[key].present?
|
||||
|
||||
.fields-group
|
||||
= custom_emoji_tag(@custom_emoji)
|
||||
|
||||
%h4= t('admin.custom_emojis.shortcode')
|
||||
|
||||
.fields-group
|
||||
%samp= @custom_emoji.shortcode
|
||||
|
||||
- if !@custom_emoji.local?
|
||||
%h4= t('admin.custom_emojis.domain')
|
||||
|
||||
.fields-group
|
||||
%samp= @custom_emoji.domain
|
||||
|
||||
- if @custom_emoji.local?
|
||||
%h4= t('admin.custom_emojis.edit.label')
|
||||
|
||||
.fields-group
|
||||
= f.input :visible_in_picker, as: :boolean, wrapper: :with_label, label: t('admin.custom_emojis.visible_in_picker')
|
||||
|
||||
.fields-group
|
||||
= f.input :aliases_raw, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.aliases'), hint: t('admin.custom_emojis.aliases_hint')
|
||||
|
||||
.fields-group
|
||||
= f.input :license, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.license'), hint: t('admin.custom_emojis.license_hint')
|
||||
|
||||
.actions
|
||||
= f.button :button, t('generic.save_changes'), type: :submit
|
||||
|
||||
- elsif @custom_emoji.license.present?
|
||||
%h4= t('admin.custom_emojis.license')
|
||||
|
||||
.fields-group
|
||||
%p= @custom_emoji.license
|
|
@ -75,12 +75,6 @@
|
|||
.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')
|
||||
|
||||
.fields-row
|
||||
.fields-group.fields-row__column
|
||||
.input.string.optional
|
||||
.label_input
|
||||
= f.text_field :aliases_raw, class: 'string optional', placeholder: 'Alias names', 'aria-label': 'Alias names'
|
||||
|
||||
.batch-table__body
|
||||
- if @custom_emojis.empty?
|
||||
= nothing_here 'nothing-here--under-tabs'
|
||||
|
|
|
@ -6,8 +6,18 @@
|
|||
|
||||
.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: CustomEmoji::IMAGE_MIME_TYPES.join(' ') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
|
||||
|
||||
.fields-group
|
||||
= f.input :visible_in_picker, as: :boolean, wrapper: :with_label, label: t('admin.custom_emojis.visible_in_picker')
|
||||
|
||||
.fields-group
|
||||
= f.input :aliases_raw, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.aliases'), hint: t('admin.custom_emojis.aliases_hint')
|
||||
|
||||
.fields-group
|
||||
= f.input :license, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.license'), hint: t('admin.custom_emojis.license_hint')
|
||||
|
||||
.actions
|
||||
= f.button :button, t('admin.custom_emojis.upload'), type: :submit
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue