Skip to content

Commit

Permalink
Merge branch 'main' into use-page-names-in-menus
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaudlevy authored Jan 13, 2025
2 parents aab640f + 4773bd2 commit 9f2358f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def categories
def project_params
params.require(:communication_website_portfolio_project)
.permit(
:year,
:year, :full_width,
category_ids: [],
localizations_attributes: [
:id, :title, :subtitle, :meta_description, :summary,
Expand Down
1 change: 1 addition & 0 deletions app/models/communication/website/portfolio/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Table name: communication_website_portfolio_projects
#
# id :uuid not null, primary key
# full_width :boolean default(TRUE)
# year :integer
# created_at :datetime not null
# updated_at :datetime not null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<%= render 'admin/application/slug/form',
f: lf,
source: '#communication_website_portfolio_project_localizations_attributes_0_title' %>
<%= f.input :full_width, wrapper: :custom_boolean_switch %>
<% end %>
<%= render 'admin/application/images/featured/form', about: l10n, f: lf %>
<%= render 'admin/application/images/shared/form', about: l10n, f: lf %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ project = @l10n.about
---
<%= render 'admin/application/static/core', about: @l10n %>
<%= render 'admin/application/static/breadcrumbs', about: @l10n %>
<%= render 'admin/application/static/design',
full_width: true,
toc_offcanvas: false,
about: project,
l10n: @l10n %>
<%= render 'admin/application/static/design', about: project, l10n: @l10n %>
<%= render 'admin/application/l10n/static', about: @l10n %>
<%= render 'admin/application/images/featured/static', about: @l10n %>
<%= render 'admin/application/images/shared/static', about: @l10n %>
Expand Down
3 changes: 3 additions & 0 deletions config/locales/communication/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ en:
path: Path
communication/website/portfolio/project:
categories: Categories
full_width: Full width
year: Year
communication/website/portfolio/project/localization:
featured_image: Featured image
Expand Down Expand Up @@ -603,3 +604,5 @@ en:
communication_website_post:
full_width: On large screens, a full width post uses all available space for the content.
text: This field is deprecated, content will not be displayed on the website.
communication_website_portfolio_project:
full_width: On large screens, a full width project uses all available space for the content.
3 changes: 3 additions & 0 deletions config/locales/communication/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ fr:
path: Chemin
communication/website/portfolio/project:
categories: Catégories
full_width: Pleine largeur
year: Année
communication/website/portfolio/project/localization:
featured_image: Image à la une
Expand Down Expand Up @@ -603,3 +604,5 @@ fr:
communication_website_post:
full_width: Sur de grands écrans, l'actualité en pleine largeur utilisera tout l'espace disponible.
text: Ce champ est déprécié, le contenu ne s'affichera pas sur le site.
communication_website_portfolio_project:
full_width: Sur de grands écrans, le projet en pleine largeur utilisera tout l'espace disponible.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddFullWidthToCommunicationWebsitePortfolioProject < ActiveRecord::Migration[7.2]
def change
add_column :communication_website_portfolio_projects, :full_width, :boolean, default: true
end
end
3 changes: 2 additions & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9f2358f

Please sign in to comment.