diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb
index fccc299d67f547e0bf870797e1eba461ac4d3657..c08bf99f4bdde3020910262cb0e268db7377b9bd 100644
--- a/app/controllers/admin/university/organizations_controller.rb
+++ b/app/controllers/admin/university/organizations_controller.rb
@@ -69,7 +69,7 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio
def organization_params
params.require(:university_organization)
.permit(
- :name, :long_name, :slug, :description, :active, :siren, :kind,
+ :name, :long_name, :slug, :description, :description_short, :active, :siren, :kind,
:address, :zipcode, :city, :country, :text,
:url, :phone, :email,
:logo, :logo_delete, :logo_infos,
diff --git a/app/models/university/organization.rb b/app/models/university/organization.rb
index 31c57551e4fcb3762a7855bde913e3d9558f5cdd..e3119d42a2eaea768a62406ea0abd08e2a4781c5 100644
--- a/app/models/university/organization.rb
+++ b/app/models/university/organization.rb
@@ -2,26 +2,27 @@
#
# Table name: university_organizations
#
-# id :uuid not null, primary key
-# active :boolean default(TRUE)
-# address :string
-# city :string
-# country :string
-# description :text
-# email :string
-# kind :integer default("company")
-# long_name :string
-# name :string
-# nic :string
-# phone :string
-# siren :string
-# slug :string
-# text :text
-# url :string
-# zipcode :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# active :boolean default(TRUE)
+# address :string
+# city :string
+# country :string
+# description :text
+# description_short :text
+# email :string
+# kind :integer default("company")
+# long_name :string
+# name :string
+# nic :string
+# phone :string
+# siren :string
+# slug :string
+# text :text
+# url :string
+# zipcode :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/app/views/admin/university/organizations/_form.html.erb b/app/views/admin/university/organizations/_form.html.erb
index 7b6a761bcde90713cdf6ce065addeda08d63270f..8ed0a659f2b896e86b598f70f86a7878b351e4a1 100644
--- a/app/views/admin/university/organizations/_form.html.erb
+++ b/app/views/admin/university/organizations/_form.html.erb
@@ -10,7 +10,12 @@
</div>
<div class="card-body">
<%= f.input :name %>
- <%= f.input :text, as: :summernote %>
+ <%= f.input :description_short %>
+ <%= f.input :text,
+ as: :summernote,
+ input_html: {
+ data: { 'summernote-config' => 'mini-list' }
+ } %>
</div>
</div>
<div class="card flex-fill w-100">
diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb
index fd731d10cbe00e2db3325a28a92c39ed2433764d..d86da0cbad2468e1cbbcf7766b3e4962f5a39ae2 100644
--- a/app/views/admin/university/organizations/show.html.erb
+++ b/app/views/admin/university/organizations/show.html.erb
@@ -1,19 +1,17 @@
<% content_for :title, @organization %>
<div class="row">
<div class="col-md-8">
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h5 class="card-title mb-0"><%= t('content') %></h5>
- </div>
- <div class="card-body">
- <% [:name].each do |property| %>
- <h3 class="h5"><%= University::Organization.human_attribute_name(property) %></h3>
- <p><%= @organization.send property %></p>
- <% end %>
- <h3 class="h5"><%= University::Organization.human_attribute_name(:text) %></h3>
- <%= @organization.text.to_s.html_safe %>
+ <%= render 'admin/application/chapo/show', about: @organization %>
+ <% if strip_tags(@organization.text.to_html).present? %>
+ <div class="card">
+ <div class="card-header">
+ <h5 class="card-title mb-0"><%= University::Organization.human_attribute_name(:text) %></h5>
+ </div>
+ <div class="card-body">
+ <%= @organization.text.to_s.html_safe %>
+ </div>
</div>
- </div>
+ <% end %>
<div class="card flex-fill w-100">
<div class="card-header">
<h5 class="card-title mb-0">
diff --git a/app/views/admin/university/organizations/static.html.erb b/app/views/admin/university/organizations/static.html.erb
index 90b742e3e49665db7c58dbc6cfd5c147d5d59c17..2a42d094104a948956795922460cd5fbccd8a561 100644
--- a/app/views/admin/university/organizations/static.html.erb
+++ b/app/views/admin/university/organizations/static.html.erb
@@ -2,6 +2,8 @@
title: >
<%= @about.to_s %>
<%= render 'admin/application/static/permalink' %>
+<%= render 'admin/application/chapo/static' %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
long_name: >
<%= @about.long_name %>
kind: "<%= @about.kind %>"
diff --git a/app/views/admin/university/people/_main_infos.html.erb b/app/views/admin/university/people/_main_infos.html.erb
index 7cf40ec7ee120522ba65357cb6e82b32f57acba1..50528559592ca92c0c0303d39c1fbc4a7d34ad87 100644
--- a/app/views/admin/university/people/_main_infos.html.erb
+++ b/app/views/admin/university/people/_main_infos.html.erb
@@ -1,5 +1,7 @@
<div class="row">
<div class="col-md-8 col-xl-9">
+ <%= render 'admin/application/chapo/show', about: person %>
+
<div class="card flex-fill w-100">
<div class="card-header">
<h2 class="card-title mb-0 h5"><%= t('content') %></h2>
diff --git a/app/views/admin/university/people/static.html.erb b/app/views/admin/university/people/static.html.erb
index 8b28e9fa43a4e8981042cc7a70a5dc3f5b5d5d45..c6b15cb1357300e884dc613a65364dbd414f7a2f 100644
--- a/app/views/admin/university/people/static.html.erb
+++ b/app/views/admin/university/people/static.html.erb
@@ -2,6 +2,7 @@
title: >
<%= @about.to_s %>
<%= render 'admin/application/static/permalink' %>
+<%= render 'admin/application/chapo/static' %>
<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
first_name: >
<%= @about.first_name %>
@@ -22,7 +23,6 @@ image: "<%= @about.best_picture.blob.id %>"
<% end %>
description: >
<%= prepare_text_for_static @about.description %>
-<%= render 'admin/application/chapo/static' %>
roles:
<% if @about.author.for_website?(@website) %>
- author
diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml
index 9660c466a78a12a13c8c13c7bcc5747ae9dedc92..52fd1f628ded4205cd82c740106f9cecac60b69f 100644
--- a/config/locales/university/en.yml
+++ b/config/locales/university/en.yml
@@ -34,7 +34,7 @@ en:
communication_website_posts: Posts
contacts: Contact information
country: Country
- description: Meta Description
+ description: Meta description
description_short: Lead text
education_programs: Programs
email: Email
@@ -83,7 +83,8 @@ en:
university/organization:
name: Name
long_name: Long name
- description: Meta Description
+ description: Meta description
+ description_short: Lead text
text: Text
contact: Contact information
legal: Legal information
diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml
index 50d45dc5145c22bd2fedc956a99c57a2816cff37..f97f306a5f22dbcec6dad7d3de8838fe377bbe19 100644
--- a/config/locales/university/fr.yml
+++ b/config/locales/university/fr.yml
@@ -34,7 +34,7 @@ fr:
communication_website_posts: Actualités
contacts: Coordonnées
country: Pays
- description: Meta Description
+ description: Meta description
description_short: Chapô
education_programs: Formations
email: Email
@@ -83,7 +83,8 @@ fr:
university/organization:
name: Nom
long_name: Nom complet
- description: Meta Description
+ description: Meta description
+ description_short: Chapô
text: Texte
contact: Informations de contact
legal: Informations légales
diff --git a/db/migrate/20230102173952_add_description_short_to_university_organization.rb b/db/migrate/20230102173952_add_description_short_to_university_organization.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6daddf34290d8ddad002da3d9e74bbe459aa1cfc
--- /dev/null
+++ b/db/migrate/20230102173952_add_description_short_to_university_organization.rb
@@ -0,0 +1,5 @@
+class AddDescriptionShortToUniversityOrganization < ActiveRecord::Migration[7.0]
+ def change
+ add_column :university_organizations, :description_short, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index dd8b5176e102821f5cea9c2fc13f71a3262595cd..72f4fdcefac602a7a4d36da7f13c4626e1e04fa4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2022_12_29_103238) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_02_173952) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -713,6 +713,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_29_103238) do
t.string "slug"
t.text "text"
t.string "nic"
+ t.text "description_short"
t.index ["university_id"], name: "index_university_organizations_on_university_id"
end
diff --git a/test/fixtures/university/organizations.yml b/test/fixtures/university/organizations.yml
index e692022061fa2b47eeeeb8670b045dcaeeb51371..6643990449ea289284e78cdfd7d0fc3bc2434af7 100644
--- a/test/fixtures/university/organizations.yml
+++ b/test/fixtures/university/organizations.yml
@@ -2,26 +2,27 @@
#
# Table name: university_organizations
#
-# id :uuid not null, primary key
-# active :boolean default(TRUE)
-# address :string
-# city :string
-# country :string
-# description :text
-# email :string
-# kind :integer default("company")
-# long_name :string
-# name :string
-# nic :string
-# phone :string
-# siren :string
-# slug :string
-# text :text
-# url :string
-# zipcode :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# active :boolean default(TRUE)
+# address :string
+# city :string
+# country :string
+# description :text
+# description_short :text
+# email :string
+# kind :integer default("company")
+# long_name :string
+# name :string
+# nic :string
+# phone :string
+# siren :string
+# slug :string
+# text :text
+# url :string
+# zipcode :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/test/models/university/organization_test.rb b/test/models/university/organization_test.rb
index a57d401f936874cbe119b9daf79fbf03d9ee4f78..bb3781c188907a250c42061a4923957c56fc6ab2 100644
--- a/test/models/university/organization_test.rb
+++ b/test/models/university/organization_test.rb
@@ -2,26 +2,27 @@
#
# Table name: university_organizations
#
-# id :uuid not null, primary key
-# active :boolean default(TRUE)
-# address :string
-# city :string
-# country :string
-# description :text
-# email :string
-# kind :integer default("company")
-# long_name :string
-# name :string
-# nic :string
-# phone :string
-# siren :string
-# slug :string
-# text :text
-# url :string
-# zipcode :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# active :boolean default(TRUE)
+# address :string
+# city :string
+# country :string
+# description :text
+# description_short :text
+# email :string
+# kind :integer default("company")
+# long_name :string
+# name :string
+# nic :string
+# phone :string
+# siren :string
+# slug :string
+# text :text
+# url :string
+# zipcode :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#