diff --git a/Gemfile.lock b/Gemfile.lock
index cef42c9e123d826a731a95c14714b93f5b670abb..9f592a935a1f994876242086d21af4c394213197 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,6 +309,8 @@ GEM
nio4r (2.5.8)
nokogiri (1.13.6-x86_64-darwin)
racc (~> 1.4)
+ nokogiri (1.13.6-x86_64-linux)
+ racc (~> 1.4)
oauth2 (1.4.9)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
@@ -489,6 +491,7 @@ GEM
PLATFORMS
x86_64-darwin-21
+ x86_64-linux
DEPENDENCIES
angularjs-rails
diff --git a/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb b/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb
index 753770e0e674a347ba7f087509f7d457484a4693..d58e664b43329c05fb45dcb0dabf56f0a909621d 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb
@@ -2,8 +2,8 @@
<%= block_component_add_element t('.add_definition') %>
-<draggable :list="data.elements" handle=".dragHandle" class="row">
- <div v-for="(element, index) in data.elements" class="col-md-4">
+<draggable :list="data.elements" handle=".dragHandle">
+ <div v-for="(element, index) in data.elements">
<div class="card">
<div class="card-body">
<div class="d-flex">
@@ -13,8 +13,14 @@
</a>
</div>
<div class="flex-fill">
- <%= block_component_edit :title, template: element %>
- <%= block_component_edit :description, template: element %>
+ <div class="row mb-n3">
+ <div class="col-lg-5">
+ <%= block_component_edit :title, template: element %>
+ </div>
+ <div class="col-lg-7">
+ <%= block_component_edit :description, template: element %>
+ </div>
+ </div>
</div>
<div>
<a class="btn btn-sm btn-danger ms-3"
diff --git a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
index 3c9ec02b6c46b617dde103eb86d5597bd3766a9c..369dc350caf570e7012452e8d5097a6d76cbda23 100644
--- a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
@@ -9,9 +9,8 @@
<%= block_component_add_element t('.add_image') %>
-<draggable :list="data.elements" handle=".imageHandle" class="row">
- <div v-for="(element, index) in data.elements"
- class="col-xxl-3 col-md-4 col-6">
+<draggable :list="data.elements" handle=".imageHandle">
+ <div v-for="(element, index) in data.elements">
<div class="card">
<div class="card-header border-bottom">
<a class="btn ps-0 pt-0 imageHandle">
@@ -26,20 +25,28 @@
</div>
</div>
<div class="card-body">
- <%= block_component_edit :image,
- template: @element,
- label: t('admin.communication.blocks.components.image.input.label'),
- placeholder: t('admin.communication.blocks.components.image.input.placeholder') %>
- <%= block_component_edit :alt,
- template: @element,
- label: t('admin.communication.blocks.components.image.alt.label'),
- placeholder: t('admin.communication.blocks.components.image.alt.placeholder') %>
- <%= block_component_edit :credit,
- template: @element,
- label: t('admin.communication.blocks.components.image.credit.label'),
- placeholder: t('admin.communication.blocks.components.image.credit.placeholder') %>
- <%= block_component_edit :text,
- template: @element %>
+ <div class="flex-fill">
+ <div class="row">
+ <div class="col-lg-6">
+ <%= block_component_edit :image,
+ template: @element,
+ label: t('admin.communication.blocks.components.image.input.label'),
+ placeholder: t('admin.communication.blocks.components.image.input.placeholder') %>
+ </div>
+ <div class="col-lg-6">
+ <%= block_component_edit :alt,
+ template: @element,
+ label: t('admin.communication.blocks.components.image.alt.label'),
+ placeholder: t('admin.communication.blocks.components.image.alt.placeholder') %>
+ <%= block_component_edit :credit,
+ template: @element,
+ label: t('admin.communication.blocks.components.image.credit.label'),
+ placeholder: t('admin.communication.blocks.components.image.credit.placeholder') %>
+ <%= block_component_edit :text,
+ template: @element %>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb
index d9cac6f61eef01081a4b93105901813b3d83ed37..b40f32f6d23a1019c7ebe22c63cae8d110618ce2 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb
@@ -2,8 +2,8 @@
<%= block_component_add_element t('.add_key') %>
-<draggable :list="data.elements" handle=".dragHandle" class="row">
- <div v-for="(element, index) in data.elements" class="col-md-4">
+<draggable :list="data.elements" handle=".dragHandle">
+ <div v-for="(element, index) in data.elements">
<div class="card">
<div class="card-body">
<div class="d-flex">
@@ -13,9 +13,17 @@
</a>
</div>
<div class="flex-fill">
- <%= block_component_edit :number, template: element %>
- <%= block_component_edit :unit, template: element %>
- <%= block_component_edit :description, template: element %>
+ <div class="row mb-n3">
+ <div class="col-lg-2">
+ <%= block_component_edit :number, template: element %>
+ </div>
+ <div class="col-lg-3">
+ <%= block_component_edit :unit, template: element %>
+ </div>
+ <div class="col-lg-7">
+ <%= block_component_edit :description, template: element, rows: 1 %>
+ </div>
+ </div>
</div>
<div>
<a class="btn btn-sm btn-danger ms-3"
diff --git a/db/schema.rb b/db/schema.rb
index 4b426c3cc8f5e1b21d319c0b7333f27962e6d60d..cfc5d60d161a43297dfe3a6aff25452b85d55d63 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -504,23 +504,6 @@ ActiveRecord::Schema.define(version: 2022_06_09_085535) do
t.index ["university_id"], name: "index_education_schools_on_university_id"
end
- create_table "external_organizations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
- t.string "title"
- t.text "description"
- t.string "address"
- t.string "zipcode"
- t.string "city"
- t.string "country"
- t.string "website"
- t.string "phone"
- t.string "mail"
- t.boolean "active"
- t.string "sirene"
- t.integer "kind"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
- end
-
create_table "imports", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.integer "number_of_lines"
t.jsonb "processing_errors"
@@ -715,8 +698,8 @@ ActiveRecord::Schema.define(version: 2022_06_09_085535) do
t.string "linkedin"
t.boolean "is_alumnus", default: false
t.text "description_short"
- t.string "name"
t.boolean "is_author"
+ t.string "name"
t.integer "gender"
t.date "birthdate"
t.string "phone_professional"