diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-19 03:52:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 03:52:38 +0200 |
| commit | 09a94b575e90dc7f6e179a1ec717156e725f915a (patch) | |
| tree | f7b3ccd6e4e7fe91ce9e86c649345ee0c83bfbfa /config | |
| parent | d43944143af079017c494f046aa171b797f5e680 (diff) | |
Admin interface for listing, adding and removing custom emojis (#5002)
* Admin interface for listing, adding and removing custom emojis * Only display local ones in the list
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 12 | ||||
| -rw-r--r-- | config/navigation.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0f6bac9e1..9013f0ac9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -108,6 +108,18 @@ en: unsubscribe: Unsubscribe username: Username web: Web + custom_emojis: + created_msg: Emoji successfully created! + delete: Delete + destroyed_msg: Emojo successfully destroyed! + emoji: Emoji + image_hint: PNG up to 50KB + new: + title: Add new custom emoji + shortcode: Shortcode + shortcode_hint: At least 2 characters, only alphanumeric characters and underscores + title: Custom emojis + upload: Upload domain_blocks: add_new: Add new created_msg: Domain block is now being processed diff --git a/config/navigation.rb b/config/navigation.rb index 4b454b3fc..0a6ab6d3d 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -28,6 +28,7 @@ SimpleNavigation::Configuration.run do |navigation| admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' } admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' } admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url + admin.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis} end primary.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' } diff --git a/config/routes.rb b/config/routes.rb index bf5428869..d38f5308a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -136,6 +136,8 @@ Rails.application.routes.draw do resources :users, only: [] do resource :two_factor_authentication, only: [:destroy] end + + resources :custom_emojis, only: [:index, :new, :create, :destroy] end get '/admin', to: redirect('/admin/settings/edit', status: 302) |