Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Images de partage par défaut #1627

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Images de partage par défaut #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3548fc1
Clean
arnaudlevy Feb 14, 2024
c9fd6c4
fix
arnaudlevy Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/admin/communication/websites_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def website_params
:git_provider, :git_endpoint, :git_branch, :plausible_url,
:feature_posts, :feature_agenda,
:default_time_zone,
:deuxfleurs_hosting, :default_image, :default_image_delete,
:deuxfleurs_hosting, :default_image, :default_image_delete, :default_shared_image, :default_shared_image_delete,
:social_mastodon, :social_x, :social_linkedin, :social_youtube, :social_vimeo, :social_peertube, :social_instagram, :social_facebook, :social_tiktok, :social_email, :social_github,
:deployment_status_badge, :autoupdate_theme, language_ids: []
]
Expand Down
3 changes: 3 additions & 0 deletions app/models/communication/website.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ class Communication::Website < ApplicationRecord
has_one_attached_deletable :default_image
validates :default_image, size: { less_than: 5.megabytes }

has_one_attached_deletable :default_shared_image
validates :default_shared_image, size: { less_than: 5.megabytes }

before_validation :sanitize_fields

scope :ordered, -> { order(:name) }
Expand Down
6 changes: 6 additions & 0 deletions app/views/admin/communication/websites/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
hint: images_formats_accepted_hint,
input_html: { accept: default_images_formats_accepted },
preview: 300 %>
<%= f.input :default_shared_image,
as: :single_deletable_file,
direct_upload: true,
hint: images_formats_accepted_hint,
input_html: { accept: default_images_formats_accepted },
preview: 300 %>
</div>
</div>
<% end %>
Expand Down
9 changes: 7 additions & 2 deletions app/views/admin/communication/websites/static.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
title: >
<%= @about.to_s %>
default:
<% if @website.default_image.attached? %>
default_image:
id: <%= @website.default_image.blob&.id %>
image:
id: <%= @website.default_image.blob&.id %>
<% end %>
<% if @website.default_shared_image.attached? %>
shared_image:
id: <%= @website.default_shared_image.blob&.id %>
<% end %>
social:
<%
Expand Down
4 changes: 3 additions & 1 deletion config/locales/communication/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ en:
created_at: Creation
default_image: Default image
default_language: Default language
default_shared_image: Default shared image
default_time_zone: Default time zone
deployment_status_badge: Deployment status badge
deuxfleurs_hosting: Hébergement avec Deuxfleurs
Expand Down Expand Up @@ -279,7 +280,8 @@ en:
draft: Draft
none: No event yet
formatted_time_zone: "Time zone: %{time_zone}"
default_image: "The default image will be used on pages and posts that do not have an image, if the theme is set to display images in all cases. It is also the default sharing image."
default_image: "The default image will be used on pages and posts that do not have an image, if the theme is set to display images in all cases."
default_shared_image: "The default sharing image, 1200 pixels wide, is a good base because the networks have different standards."
editorial:
label: Editorial
description: Everything related to content
Expand Down
4 changes: 3 additions & 1 deletion config/locales/communication/fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ fr:
created_at: Création
default_image: Image par défaut
default_language: Langue par défaut
default_shared_image: Image de partage par défaut
default_time_zone: Fuseau horaire par défaut
deployment_status_badge: Badge de statut du déploiement
deuxfleurs_hosting: Hébergement avec Deuxfleurs
Expand Down Expand Up @@ -279,7 +280,8 @@ fr:
draft: Brouillon
none: Pas encore d'événements
formatted_time_zone: "Fuseau horaire : %{time_zone}"
default_image: "L'image par défaut sera utilisée dans les pages et actualités qui n'ont pas d'image, si le thème est paramétré pour afficher des images dans tous les cas. C'est aussi l'image de partage par défaut."
default_image: "L'image par défaut sera utilisée dans les pages et actualités qui n'ont pas d'image, si le thème est paramétré pour afficher des images dans tous les cas."
default_shared_image: "Image de partage par défaut, 1200 pixels de large est une bonne base car les réseaux ont des standards différents."
editorial:
label: Éditorial
description: Tout ce qui est lié au contenu
Expand Down
Loading