diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 | ||||
| -rw-r--r-- | app/presenters/instance_presenter.rb | 1 | ||||
| -rw-r--r-- | app/views/admin/settings/edit.html.haml | 3 | ||||
| -rw-r--r-- | app/views/application/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_og.html.haml | 2 |
7 files changed, 9 insertions, 4 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 723da665e..35ee5cca9 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -52,7 +52,7 @@ class AccountsController < ApplicationController private def show_pinned_statuses? - [replies_requested?, media_requested?, params[:max_id].present?, params[:since_id].present?].none? + [replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none? end def filtered_statuses diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 75d00326c..3234b194f 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -6,6 +6,7 @@ module Admin site_contact_username site_contact_email site_title + site_short_description site_description site_extended_description site_terms diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 723480bdd..010cf7fc3 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -10,6 +10,8 @@ class Form::AdminSettings :site_contact_email=, :site_title, :site_title=, + :site_short_description, + :site_short_description=, :site_description, :site_description=, :site_extended_description, diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb index db288d5db..d14836b9d 100644 --- a/app/presenters/instance_presenter.rb +++ b/app/presenters/instance_presenter.rb @@ -6,6 +6,7 @@ class InstancePresenter :site_contact_email, :open_registrations, :site_title, + :site_short_description, :site_description, :site_extended_description, :site_terms, diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index f5c5deca8..fda6b00f4 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -7,7 +7,8 @@ .fields-group = f.input :site_title, placeholder: t('admin.settings.site_title') - = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 8 } + = f.input :site_short_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_short_description.title'), hint: t('admin.settings.site_short_description.desc_html'), input_html: { rows: 2 } + = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 4 } = f.input :site_contact_username, placeholder: t('admin.settings.contact_information.username') = f.input :site_contact_email, placeholder: t('admin.settings.contact_information.email') diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml index 3d8832bb4..2ff14b252 100644 --- a/app/views/application/_sidebar.html.haml +++ b/app/views/application/_sidebar.html.haml @@ -3,4 +3,4 @@ = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('preview.jpg'), alt: @instance_presenter.site_title .hero-widget__text - %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) + %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml index a6d805bea..76db511cd 100644 --- a/app/views/shared/_og.html.haml +++ b/app/views/shared/_og.html.haml @@ -3,7 +3,7 @@ = opengraph 'og:url', url_for(only_path: false) = opengraph 'og:type', 'website' = opengraph 'og:title', @instance_presenter.site_title -= opengraph 'og:description', strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html')) += opengraph 'og:description', strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html')) = opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('preview.jpg', protocol: :request)) = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200' = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630' |