diff --git a/app/views/admin/communication/blocks/_block.html.erb b/app/views/admin/communication/blocks/_block.html.erb
index bd15d7409b10c74aed01a15fbfbff65bc0b7f1d3..071966af91676062bf750b6233dbd8e23b907450 100644
--- a/app/views/admin/communication/blocks/_block.html.erb
+++ b/app/views/admin/communication/blocks/_block.html.erb
@@ -1,16 +1,22 @@
<div class="row" data-id="block_<%= block.id %>">
<div class="offset-lg-4 col-lg-8">
- <article class="blocks__list__element mt-4 <%= 'draft' unless block.published? %>">
- <div class="float-end">
- <%= duplicate_link block %>
- <%= edit_link block %>
+ <article class="blocks__list__element mt-5 <%= 'draft' unless block.published? %>">
+ <div class="mb-2">
+ <div class="float-end">
+ <%= duplicate_link block %>
+ <%= edit_link block %>
+ </div>
+ <span class="small text-muted mb-2"><%= block.template_kind_i18n %></span>
+ <span class="blocks__list__handle"><i class="<%= Icon::SORT %> handle"></i></span>
</div>
- <span class="small text-muted"><%= block.template_kind_i18n %></span>
- <span class="blocks__list__handle"><i class="<%= Icon::SORT %> handle"></i></span>
- <div class="blocks__list__name">
- <%= block.to_s.truncate(50) %><br>
- <%= render 'admin/application/a11y/status', about: block unless block.accessible? %>
+ <div class="blocks__list__preview">
+ <%
+ @block = block
+ @template = @block.template
+ %>
+ <%= render "admin/communication/blocks/templates/#{@block.template_kind}/preview" %>
</div>
+ <%= render 'admin/application/a11y/status', about: block unless block.accessible? %>
</article>
</div>
</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/_preview.html.erb b/app/views/admin/communication/blocks/_show.html.erb
similarity index 86%
rename from app/views/admin/communication/blocks/_preview.html.erb
rename to app/views/admin/communication/blocks/_show.html.erb
index 49e415f91dcd0642602e0a2fc322e4d18d7c0dd2..6f847236455240041ef17659ce14d6add0ea3d96 100644
--- a/app/views/admin/communication/blocks/_preview.html.erb
+++ b/app/views/admin/communication/blocks/_show.html.erb
@@ -1,4 +1,4 @@
<% about.blocks.published.ordered.each do |block| %>
<% @block = block %>
- <%= render "admin/communication/blocks/templates/#{@block.template_kind}/preview" %>
+ <%= render "admin/communication/blocks/templates/#{@block.template_kind}/show" %>
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
index 06a081142d9601c9c79a8fee47e088915554a69e..609392d63a966d0739dbc3b0e84e0b77cc462ebd 100644
--- a/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
@@ -1,48 +1,6 @@
-<%
-class_name = "block block-call_to_action"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-
-image_class = "call_to_action--with" + (@block.template.image.empty? ? "out" : "") + "-image"
-
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <div class="call_to_action <%= image_class %>">
- <div>
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% if @block.template.text %>
- <div class="description">
- <%= block_component_preview :text %>
- </div>
- <% end %>
- <% if @block.template.elements %>
- <div class="actions" <% if @block.template.elements.count > 1 %>role="group"<% end %>>
- <% @block.template.elements.each do |element| %>
- <% if element.title %>
- <a href="<%= block_component_preview :url, template: element %>"
- <% if element.target_blank %>
- title="<%= block_component_preview :title, template: element %>"
- target="_blank"
- <% else %>
- title="<%= block_component_preview :title, template: element %>"
- <% end %>
- ><%= block_component_preview :title, template: element %></a>
- <% end %>
- <% end %>
- </div>
- <% end %>
- </div>
- <% component = @block.template.image_component %>
- <% if component.blob %>
- <%= kamifusen_tag component.blob, width: 600, class: 'img-fluid mb-1', alt: @block.template.alt %>
- <% end %>
- </div>
- </div>
- </div>
-</section>
\ No newline at end of file
+<p class="mb-1"><%= strip_tags(block_component_preview :text).truncate(250) %></p>
+<% @template.elements.each_with_index do |element, index| %>
+ <a class="btn <%= index.zero? ? 'btn-primary' : 'btn-light' %>">
+ <%= block_component_preview :title, template: element %>
+ </a>
+<% end %>
diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..06a081142d9601c9c79a8fee47e088915554a69e
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb
@@ -0,0 +1,48 @@
+<%
+class_name = "block block-call_to_action"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+
+image_class = "call_to_action--with" + (@block.template.image.empty? ? "out" : "") + "-image"
+
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <div class="call_to_action <%= image_class %>">
+ <div>
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% if @block.template.text %>
+ <div class="description">
+ <%= block_component_preview :text %>
+ </div>
+ <% end %>
+ <% if @block.template.elements %>
+ <div class="actions" <% if @block.template.elements.count > 1 %>role="group"<% end %>>
+ <% @block.template.elements.each do |element| %>
+ <% if element.title %>
+ <a href="<%= block_component_preview :url, template: element %>"
+ <% if element.target_blank %>
+ title="<%= block_component_preview :title, template: element %>"
+ target="_blank"
+ <% else %>
+ title="<%= block_component_preview :title, template: element %>"
+ <% end %>
+ ><%= block_component_preview :title, template: element %></a>
+ <% end %>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% component = @block.template.image_component %>
+ <% if component.blob %>
+ <%= kamifusen_tag component.blob, width: 600, class: 'img-fluid mb-1', alt: @block.template.alt %>
+ <% end %>
+ </div>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
index 838aa58f37f665c868037905aa36990f93b8c255..61285f89bc56a61afcfed764a71096aa5df1b763 100644
--- a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
@@ -1,41 +1 @@
-<%
-class_name = "block block-chapter"
-
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-
-if @block.template.image[:id] #TODO comment vérifier proprement la présence de l'image?
- class_name += " block-chapter--with-image"
-end
-
-class_name += " block-chapter--" + @block.template.layout
-
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <div class="chapter">
- <div class="text">
- <% unless @block.title.blank? %>
- <div class="top">
- <h2><%= @block.title %></h2>
- </div>
- <% end %>
- <% unless @block.template.text.blank? %>
- <div class="rich-text">
- <%= block_component_preview :text %>
- </div>
- <% end %>
- <% unless @block.template.notes.blank? %>
- <div class="notes">
- <%= block_component_preview :notes %>
- </div>
- <% end %>
- </div>
- <%= block_component_preview :image %>
- </div>
- </div>
- </div>
-</section>
+<p class="mb-0"><%= strip_tags(block_component_preview :text).truncate(250) %></p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/chapter/_show.html.erb b/app/views/admin/communication/blocks/templates/chapter/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..838aa58f37f665c868037905aa36990f93b8c255
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/chapter/_show.html.erb
@@ -0,0 +1,41 @@
+<%
+class_name = "block block-chapter"
+
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+
+if @block.template.image[:id] #TODO comment vérifier proprement la présence de l'image?
+ class_name += " block-chapter--with-image"
+end
+
+class_name += " block-chapter--" + @block.template.layout
+
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <div class="chapter">
+ <div class="text">
+ <% unless @block.title.blank? %>
+ <div class="top">
+ <h2><%= @block.title %></h2>
+ </div>
+ <% end %>
+ <% unless @block.template.text.blank? %>
+ <div class="rich-text">
+ <%= block_component_preview :text %>
+ </div>
+ <% end %>
+ <% unless @block.template.notes.blank? %>
+ <div class="notes">
+ <%= block_component_preview :notes %>
+ </div>
+ <% end %>
+ </div>
+ <%= block_component_preview :image %>
+ </div>
+ </div>
+ </div>
+</section>
diff --git a/app/views/admin/communication/blocks/templates/contact/_preview.html.erb b/app/views/admin/communication/blocks/templates/contact/_preview.html.erb
index 5c37e6e40126cab800221fa2d984ebb908175d53..73cd9185da18533b325e659200c206bff37ea99c 100644
--- a/app/views/admin/communication/blocks/templates/contact/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/contact/_preview.html.erb
@@ -1,65 +1,32 @@
-<%
-class_name = "block block-contact"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
-
- <div class="informations">
- <address itemscope itemtype="https://schema.org/Organization">
- <% unless @block.template.name.blank? %>
- <p><%= block_component_preview :name %></p>
- <% end %>
- <div itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
- <span itemprop="streetAddress">
- <%= block_component_preview :address %>
- </span>
- <span itemprop="addressLocality">
- <%= block_component_preview :city %>
- </span>
- <span itemprop="postalCode">
- <%= block_component_preview :zipcode %>
- </span>
- <span itemprop="addressCountry">
- <%= block_component_preview :country %>
- </span>
- </div>
-
- <p>
- <% @block.template.phone_numbers.each do |phone_number| %>
- <a itemprop="telephone" href="tel:<%= phone_number %>%>"><%= phone_number %></a><br>
- <% end %>
- <% @block.template.emails.each do |email| %>
- <a itemprop="email" href="mailto:<%= email %>%>"><%= email %></a><br>
- <% end %>
- </p>
- </address>
- <ul>
- <% @block.template.elements.each do |element| %>
- <li>
- <span><%= block_component_preview :title, template: element %></span>
- <span><time datetime="<%= block_component_preview :time_slot_morning, template: element %>"><%= block_component_preview :time_slot_morning, template: element %></time></span>
- <span><time datetime="<%= block_component_preview :time_slot_afternoon, template: element %>"><%= block_component_preview :time_slot_afternoon, template: element %></time></span>
- </li>
- <% end %>
- </ul>
- </div>
- </div>
- </div>
-</section>
+<address itemscope itemtype="https://schema.org/Organization" class="mb-0">
+ <%= strip_tags block_component_preview :name %>
+ <span itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+ <span itemprop="streetAddress">
+ <%= strip_tags block_component_preview :address %>
+ </span>
+ <span itemprop="addressLocality">
+ <%= strip_tags block_component_preview :city %>
+ </span>
+ <span itemprop="postalCode">
+ <%= strip_tags block_component_preview :zipcode %>
+ </span>
+ <span itemprop="addressCountry">
+ <%= strip_tags block_component_preview :country %>
+ </span>
+ </span>
+ <% @block.template.phone_numbers.each do |phone_number| %>
+ <%= phone_number %>
+ <% end %>
+ <% @block.template.emails.each do |email| %>
+ <%= email %>
+ <% end %>
+</address>
+<ul class="list-unstyled">
+ <% @block.template.elements.each do |element| %>
+ <li>
+ <span><%= block_component_preview :title, template: element %></span>
+ <span><time datetime="<%= block_component_preview :time_slot_morning, template: element %>"><%= block_component_preview :time_slot_morning, template: element %></time></span>
+ <span><time datetime="<%= block_component_preview :time_slot_afternoon, template: element %>"><%= block_component_preview :time_slot_afternoon, template: element %></time></span>
+ </li>
+ <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/contact/_show.html.erb b/app/views/admin/communication/blocks/templates/contact/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..5c37e6e40126cab800221fa2d984ebb908175d53
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/contact/_show.html.erb
@@ -0,0 +1,65 @@
+<%
+class_name = "block block-contact"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+
+ <div class="informations">
+ <address itemscope itemtype="https://schema.org/Organization">
+ <% unless @block.template.name.blank? %>
+ <p><%= block_component_preview :name %></p>
+ <% end %>
+ <div itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+ <span itemprop="streetAddress">
+ <%= block_component_preview :address %>
+ </span>
+ <span itemprop="addressLocality">
+ <%= block_component_preview :city %>
+ </span>
+ <span itemprop="postalCode">
+ <%= block_component_preview :zipcode %>
+ </span>
+ <span itemprop="addressCountry">
+ <%= block_component_preview :country %>
+ </span>
+ </div>
+
+ <p>
+ <% @block.template.phone_numbers.each do |phone_number| %>
+ <a itemprop="telephone" href="tel:<%= phone_number %>%>"><%= phone_number %></a><br>
+ <% end %>
+ <% @block.template.emails.each do |email| %>
+ <a itemprop="email" href="mailto:<%= email %>%>"><%= email %></a><br>
+ <% end %>
+ </p>
+ </address>
+ <ul>
+ <% @block.template.elements.each do |element| %>
+ <li>
+ <span><%= block_component_preview :title, template: element %></span>
+ <span><time datetime="<%= block_component_preview :time_slot_morning, template: element %>"><%= block_component_preview :time_slot_morning, template: element %></time></span>
+ <span><time datetime="<%= block_component_preview :time_slot_afternoon, template: element %>"><%= block_component_preview :time_slot_afternoon, template: element %></time></span>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+ </div>
+</section>
diff --git a/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb b/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
index f1df7239485769a17ed013d1a5f3ab414b250324..ee86cc8b40e97798720165057c5301153d8e1d3a 100644
--- a/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
@@ -1,43 +1,19 @@
-<%
-class_name = "block block-datatable"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
+<div class="table-responsive">
+ <table class="table table-sm">
+ <% unless @block.template.caption.blank? %>
+ <caption><%= block_component_preview :caption %></caption>
+ <% end %>
+ <thead>
+ <tr>
+ <%= block_component_preview :columns %>
+ </tr>
+ </thead>
+ <tbody>
+ <% @block.template.elements.first(1).each do |row| %>
+ <tr>
+ <%= block_component_preview :cells, template: row %>
+ </tr>
<% end %>
- <div class="table-responsive">
- <table>
- <% unless @block.template.caption.blank? %>
- <caption><%= block_component_preview :caption %></caption>
- <% end %>
- <thead>
- <tr>
- <%= block_component_preview :columns %>
- </tr>
- </thead>
- <tbody>
- <% @block.template.elements.each do |row| %>
- <tr>
- <%= block_component_preview :cells, template: row %>
- </tr>
- <% end %>
- </tbody>
- </table>
- </div>
- </div>
- </div>
-</section>
\ No newline at end of file
+ </tbody>
+ </table>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/datatable/_show.html.erb b/app/views/admin/communication/blocks/templates/datatable/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f1df7239485769a17ed013d1a5f3ab414b250324
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/datatable/_show.html.erb
@@ -0,0 +1,43 @@
+<%
+class_name = "block block-datatable"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ <div class="table-responsive">
+ <table>
+ <% unless @block.template.caption.blank? %>
+ <caption><%= block_component_preview :caption %></caption>
+ <% end %>
+ <thead>
+ <tr>
+ <%= block_component_preview :columns %>
+ </tr>
+ </thead>
+ <tbody>
+ <% @block.template.elements.each do |row| %>
+ <tr>
+ <%= block_component_preview :cells, template: row %>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
index 0673ec78f459ffbb22726e9d679b4812547841ff..c5cf27c7d833c0dee00291705d186c80364de4cf 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
@@ -1,34 +1,5 @@
-<%
- class_name = "block block-definitions"
- unless @block.title.blank?
- class_name += " block-with-title"
- end
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
- <div class="definitions">
- <% @block.template.elements.each do |element| %>
- <details itemscope itemtype="https://schema.org/DefinedTerm">
- <summary itemprop="name">
- <%= block_component_preview :title, template: element %>
- </summary>
- <p itemprop="description"><%= block_component_preview :description, template: element %></p>
- </details>
- <% end %>
- </div>
- </div>
-</section>
+<p>
+ <%= @block.template.elements.first(2).map { |element|
+ strip_tags(block_component_preview :title, template: element).strip
+ }.join(', ') %>...
+</p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/definitions/_show.html.erb b/app/views/admin/communication/blocks/templates/definitions/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..0673ec78f459ffbb22726e9d679b4812547841ff
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/definitions/_show.html.erb
@@ -0,0 +1,34 @@
+<%
+ class_name = "block block-definitions"
+ unless @block.title.blank?
+ class_name += " block-with-title"
+ end
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ <div class="definitions">
+ <% @block.template.elements.each do |element| %>
+ <details itemscope itemtype="https://schema.org/DefinedTerm">
+ <summary itemprop="name">
+ <%= block_component_preview :title, template: element %>
+ </summary>
+ <p itemprop="description"><%= block_component_preview :description, template: element %></p>
+ </details>
+ <% end %>
+ </div>
+ </div>
+</section>
diff --git a/app/views/admin/communication/blocks/templates/embed/_edit.html.erb b/app/views/admin/communication/blocks/templates/embed/_edit.html.erb
index b653c9f7346ec2574797192fdb6c3ec4fb97dbd6..e1824fa85d0930c12ea5b3fa865fdcee6572b2b1 100644
--- a/app/views/admin/communication/blocks/templates/embed/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/embed/_edit.html.erb
@@ -3,13 +3,9 @@
<p class="text-danger lead"><%= t '.warning' %></p>
</div>
</div>
-<div class="row pure__row--small">
- <div class="col-md-6">
- <%= block_component_edit :code %>
- </div>
- <div class="col-md-6">
- <%= block_component_edit :transcription,
- label: t('admin.communication.blocks.components.text.transcription.label'),
- placeholder: t('admin.communication.blocks.components.text.transcription.placeholder') %>
- </div>
+<div class="mb-4">
+ <%= block_component_edit :code %>
</div>
+<%= block_component_edit :transcription,
+ label: t('admin.communication.blocks.components.text.transcription.label'),
+ placeholder: t('admin.communication.blocks.components.text.transcription.placeholder') %>
diff --git a/app/views/admin/communication/blocks/templates/embed/_preview.html.erb b/app/views/admin/communication/blocks/templates/embed/_preview.html.erb
index d6bc1a1e6c77cd1d6c901c0085b98a7adfcdb5c0..9dd8ff9b7c8ac886687433b87553ec66f31c6302 100644
--- a/app/views/admin/communication/blocks/templates/embed/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/embed/_preview.html.erb
@@ -1,34 +1 @@
-<%
- class_name = "block block-embed"
- unless @block.title.blank?
- class_name += " block-with-title"
- end
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? %>
- <div class="top">
- <h2><%= @block.title %></h2>
- </div>
- <% end %>
-
- <%= block_component_preview :code %>
-
- <% unless @block.template.transcription.blank? %>
- <div class="transcription">
- <details>
- <summary>Transcription</summary>
- <p>
- <%= block_component_preview :transcription %>
- </p>
- </details>
- </div>
- <% end %>
- </div>
- </div>
-</section>
-
-
-
+<p><%= block_component_preview :transcription %></p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/embed/_show.html.erb b/app/views/admin/communication/blocks/templates/embed/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..d6bc1a1e6c77cd1d6c901c0085b98a7adfcdb5c0
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/embed/_show.html.erb
@@ -0,0 +1,34 @@
+<%
+ class_name = "block block-embed"
+ unless @block.title.blank?
+ class_name += " block-with-title"
+ end
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? %>
+ <div class="top">
+ <h2><%= @block.title %></h2>
+ </div>
+ <% end %>
+
+ <%= block_component_preview :code %>
+
+ <% unless @block.template.transcription.blank? %>
+ <div class="transcription">
+ <details>
+ <summary>Transcription</summary>
+ <p>
+ <%= block_component_preview :transcription %>
+ </p>
+ </details>
+ </div>
+ <% end %>
+ </div>
+ </div>
+</section>
+
+
+
diff --git a/app/views/admin/communication/blocks/templates/files/_preview.html.erb b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
index f9ebe021d0db9bb41f3a4614bea4539abd712014..cf6c347d9c73fb6ba4a35586480c9c8c0ac9c151 100644
--- a/app/views/admin/communication/blocks/templates/files/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
@@ -1,41 +1,6 @@
-<%
-class_name = "block block-files"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
-
- <ul class="files">
- <% @block.template.elements.each do |element| %>
- <% next unless element.blob %>
- <li>
- <figure>
- <a href="<%= element.blob.url %>" target="_blank" title="<%= element.title %>"><%= element.title %></a>
- <figcaption>
- <abbr title=""><%= element.blob.filename.extension.upcase %></abbr>
- - <abbr title=""><%= number_to_human_size element.blob.byte_size %></abbr>
- </figcaption>
- </a>
- </figure>
- </li>
- <% end %>
- </ul>
- </div>
- </div>
-</section>
\ No newline at end of file
+<ul class="list-unstyled">
+ <% @block.template.elements.first(2).each do |element| %>
+ <% next unless element.blob %>
+ <li><%= element.title %></li>
+ <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/files/_show.html.erb b/app/views/admin/communication/blocks/templates/files/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f9ebe021d0db9bb41f3a4614bea4539abd712014
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/files/_show.html.erb
@@ -0,0 +1,41 @@
+<%
+class_name = "block block-files"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+
+ <ul class="files">
+ <% @block.template.elements.each do |element| %>
+ <% next unless element.blob %>
+ <li>
+ <figure>
+ <a href="<%= element.blob.url %>" target="_blank" title="<%= element.title %>"><%= element.title %></a>
+ <figcaption>
+ <abbr title=""><%= element.blob.filename.extension.upcase %></abbr>
+ - <abbr title=""><%= number_to_human_size element.blob.byte_size %></abbr>
+ </figcaption>
+ </a>
+ </figure>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb b/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb
index c392691021f29c9ce39d518c0ae3ccf97f55d52d..2ff2e3b29a57d7fb1eb4ac1c112212db7bea69a2 100644
--- a/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb
@@ -1,49 +1,8 @@
-<%
-class_name = "block block-gallery"
-if @block.title.present?
- class_name += " block-with-title"
-end
-
-class_name += " block-gallery--" + @block.template.layout
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% if @block.title.present? || @block.template.description.present? %>
- <div class="top">
- <% if @block.title.present? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% if @block.template.description.present? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
-
- <% if @block.template.layout === "carousel" %>
- <% if !@block.template.elements.one? %>
- <div class="splide" role="group" data-splide='{"arrows":true,"pagination":false,"autoWidth":true,"autoplay":false}'>
- <div class="splide__track">
- <div class="splide__list">
- <% end %>
- <% @block.template.elements.each do |element| %>
- <%= block_component_preview :image, template: element %>
- <% end %>
- <% if !@block.template.elements.one? %>
- </div>
- </div>
- </div>
- <% end %>
- <% else %>
- <div class="gallery" role="group">
- <% @block.template.elements.each do |element| %>
- <%= block_component_preview :image, template: element %>
- <% end %>
- </div>
- <% end %>
- </div>
- </div>
- </section>
\ No newline at end of file
+<% @block.template.elements.first(4).each do |element| %>
+ <%
+ component = element.image_component
+ blob = component.blob
+ next unless blob
+ %>
+ <%= image_tag blob.variant(resize: 'x180'), height: 90, alt: '', class: 'me-2' %>
+<% end %>
diff --git a/app/views/admin/communication/blocks/templates/gallery/_show.html.erb b/app/views/admin/communication/blocks/templates/gallery/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..c392691021f29c9ce39d518c0ae3ccf97f55d52d
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/gallery/_show.html.erb
@@ -0,0 +1,49 @@
+<%
+class_name = "block block-gallery"
+if @block.title.present?
+ class_name += " block-with-title"
+end
+
+class_name += " block-gallery--" + @block.template.layout
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% if @block.title.present? || @block.template.description.present? %>
+ <div class="top">
+ <% if @block.title.present? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% if @block.template.description.present? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+
+ <% if @block.template.layout === "carousel" %>
+ <% if !@block.template.elements.one? %>
+ <div class="splide" role="group" data-splide='{"arrows":true,"pagination":false,"autoWidth":true,"autoplay":false}'>
+ <div class="splide__track">
+ <div class="splide__list">
+ <% end %>
+ <% @block.template.elements.each do |element| %>
+ <%= block_component_preview :image, template: element %>
+ <% end %>
+ <% if !@block.template.elements.one? %>
+ </div>
+ </div>
+ </div>
+ <% end %>
+ <% else %>
+ <div class="gallery" role="group">
+ <% @block.template.elements.each do |element| %>
+ <%= block_component_preview :image, template: element %>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ </section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/image/_preview.html.erb b/app/views/admin/communication/blocks/templates/image/_preview.html.erb
index 622c48b2622e888d83869233070bd71aeca2f71c..48104b4c81294c56b11b87c4c9d7c89f539824b9 100644
--- a/app/views/admin/communication/blocks/templates/image/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/image/_preview.html.erb
@@ -1,21 +1,2 @@
-<%
-class_name = "block block-image"
-
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? %>
- <div class="top">
- <h2><%= @block.title %></h2>
- </div>
- <% end %>
- <% if @block.template.image %>
- <%= block_component_preview :image %>
- <% end %>
- </div>
- </div>
-</section>
\ No newline at end of file
+<% blob = @template.image_component.blob %>
+<%= image_tag blob.variant(resize: 'x180'), height: 90, alt: '', class: 'me-2' if blob %>
diff --git a/app/views/admin/communication/blocks/templates/image/_show.html.erb b/app/views/admin/communication/blocks/templates/image/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..622c48b2622e888d83869233070bd71aeca2f71c
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/image/_show.html.erb
@@ -0,0 +1,21 @@
+<%
+class_name = "block block-image"
+
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? %>
+ <div class="top">
+ <h2><%= @block.title %></h2>
+ </div>
+ <% end %>
+ <% if @block.template.image %>
+ <%= block_component_preview :image %>
+ <% end %>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
index 27615c8ef0dec5bbc05b650d4595453da39d95db..8ca91acc003ee601b33a588a51d9ab409720a6a6 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
@@ -1,34 +1,5 @@
-<%
-class_name = "block block-key_figures"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
- <ul class="<%= @block.template.elements.count.even? ? "even-items" : "odd-items" %>">
- <% @block.template.elements.each do |element| %>
- <li>
- <dl>
- <dt><strong><%= block_component_preview :number, template: element %></strong><%= block_component_preview :unit, template: element %></dt>
- <dd><%= block_component_preview :description, template: element %></dd>
- </dl>
- </li>
- <% end %>
- </ul>
- </div>
- </div>
-</section>
+<p class="mb-0">
+ <%= @block.template.elements.first(2).map { |element|
+ "#{block_component_preview :number, template: element} #{block_component_preview :unit, template: element}".strip
+ }.join(', ') %>...
+</p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_show.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..27615c8ef0dec5bbc05b650d4595453da39d95db
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/key_figures/_show.html.erb
@@ -0,0 +1,34 @@
+<%
+class_name = "block block-key_figures"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ <ul class="<%= @block.template.elements.count.even? ? "even-items" : "odd-items" %>">
+ <% @block.template.elements.each do |element| %>
+ <li>
+ <dl>
+ <dt><strong><%= block_component_preview :number, template: element %></strong><%= block_component_preview :unit, template: element %></dt>
+ <dd><%= block_component_preview :description, template: element %></dd>
+ </dl>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+</section>
diff --git a/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb b/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb
index 7dae993fea68d01ee3438556aeb1026ab95a56c1..af63c0eb5c0214e0e6b11f9daabe78b87f61da3f 100644
--- a/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb
@@ -1,52 +1,12 @@
-<%
-class_name = "block block-organization_chart"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
-
- <div class="persons">
- <% @block.template.elements.each do |element|
- person = element.person
- next if person.nil?
- %>
- <article class="person" itemscope itemtype="https://schema.org/Person">
- <div class="description">
- <h3 class="name" itemprop="name">
- <% if @block.template.with_link %>
- <%= link_to person, [:admin, person] %>
- <% else %>
- <%= element.person %>
- <% end %>
- </h3>
- <p itemprop="jobTitle"><%= element.role %></p>
- </div>
- <% if @block.template.with_photo %>
- <div class="avatar" itemprop="image">
- <% if person.best_picture.attached? %>
- <%= kamifusen_tag person.best_picture, class: 'img-fluid rounded-circle' %>
- <% end %>
- </div>
- <% end %>
- </article>
- <% end %>
- </div>
-
- </div>
- </div>
-</section>
+<% @block.template.elements.each do |element|
+ person = element.person
+ next if person.nil?
+ %>
+ <span class="me-2">
+ <% if person.best_picture.attached? %>
+ <%= image_tag person.best_picture.variant(resize: '180x180'), width: 90, class: 'img-fluid rounded-circle' %>
+ <% else %>
+ <%= element.person %>
+ <% end %>
+ </span>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/organization_chart/_show.html.erb b/app/views/admin/communication/blocks/templates/organization_chart/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..7dae993fea68d01ee3438556aeb1026ab95a56c1
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/organization_chart/_show.html.erb
@@ -0,0 +1,52 @@
+<%
+class_name = "block block-organization_chart"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+
+ <div class="persons">
+ <% @block.template.elements.each do |element|
+ person = element.person
+ next if person.nil?
+ %>
+ <article class="person" itemscope itemtype="https://schema.org/Person">
+ <div class="description">
+ <h3 class="name" itemprop="name">
+ <% if @block.template.with_link %>
+ <%= link_to person, [:admin, person] %>
+ <% else %>
+ <%= element.person %>
+ <% end %>
+ </h3>
+ <p itemprop="jobTitle"><%= element.role %></p>
+ </div>
+ <% if @block.template.with_photo %>
+ <div class="avatar" itemprop="image">
+ <% if person.best_picture.attached? %>
+ <%= kamifusen_tag person.best_picture, class: 'img-fluid rounded-circle' %>
+ <% end %>
+ </div>
+ <% end %>
+ </article>
+ <% end %>
+ </div>
+
+ </div>
+ </div>
+</section>
diff --git a/app/views/admin/communication/blocks/templates/pages/_preview.html.erb b/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
index 42f0873509ba6bec96c72a782d8ebf2352379e5e..f394a9424cb508481082ca203a019ae066eaa6fe 100644
--- a/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
@@ -1,60 +1,3 @@
-<%
-class_name = "block block-pages"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-class_name += " block-pages--" + @block.template.layout
-%>
-<section class="<%= class_name %>" style="display: none;">
- <div class="container">
- <div class="block-content">
- <% if @block.data %>
- <% if @block.template.page %>
- <%#= @block.template.page.slug %>
- <% end %>
-
- <% if @block.template.show_main_description %>
- <p></p>
- <% end %>
-
- <% if @block.template.layout === "list" %>
-
- <ul>
- <% @block.template.elements.each do |element| %>
- <li>
- <%#= element %>
- </li>
- <% end %>
- </ul>
-
- <% elsif @block.template.layout === "cards" %>
-
- <div class="cards">
- <% @block.template.elements.each do |element| %>
- <article class="card">
- <%# <%= element %>
- <% if @block.template.show_description %>
- <p><%#= element.summary %></p>
- <% end %>
- </article>
- <% end %>
- </div>
-
- <% else %>
-
- <div class="grid">
- <% @block.template.elements.each do |element| %>
- <article>
- <%# <%= element %>
- <% if @block.template.show_description %>
- <p><%#= element.summary %></p>
- <% end %>
- </article>
- <% end %>
- </div>
- <% end %>
-
- <% end %>
- </div>
- </div>
-</section>
\ No newline at end of file
+<p class="mb-0">
+ <%= @template.selected_pages.first(2).collect(&:to_s).join(', ') %>...
+</p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/pages/_show.html.erb b/app/views/admin/communication/blocks/templates/pages/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..42f0873509ba6bec96c72a782d8ebf2352379e5e
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/pages/_show.html.erb
@@ -0,0 +1,60 @@
+<%
+class_name = "block block-pages"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+class_name += " block-pages--" + @block.template.layout
+%>
+<section class="<%= class_name %>" style="display: none;">
+ <div class="container">
+ <div class="block-content">
+ <% if @block.data %>
+ <% if @block.template.page %>
+ <%#= @block.template.page.slug %>
+ <% end %>
+
+ <% if @block.template.show_main_description %>
+ <p></p>
+ <% end %>
+
+ <% if @block.template.layout === "list" %>
+
+ <ul>
+ <% @block.template.elements.each do |element| %>
+ <li>
+ <%#= element %>
+ </li>
+ <% end %>
+ </ul>
+
+ <% elsif @block.template.layout === "cards" %>
+
+ <div class="cards">
+ <% @block.template.elements.each do |element| %>
+ <article class="card">
+ <%# <%= element %>
+ <% if @block.template.show_description %>
+ <p><%#= element.summary %></p>
+ <% end %>
+ </article>
+ <% end %>
+ </div>
+
+ <% else %>
+
+ <div class="grid">
+ <% @block.template.elements.each do |element| %>
+ <article>
+ <%# <%= element %>
+ <% if @block.template.show_description %>
+ <p><%#= element.summary %></p>
+ <% end %>
+ </article>
+ <% end %>
+ </div>
+ <% end %>
+
+ <% end %>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/partners/_preview.html.erb b/app/views/admin/communication/blocks/templates/partners/_preview.html.erb
index 34110c536bb3e56c60530999f5c84ccf8a2941d0..5ce92b9925a28232d49d7dbac22bf0939d8e233d 100644
--- a/app/views/admin/communication/blocks/templates/partners/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/partners/_preview.html.erb
@@ -1,46 +1,9 @@
-<%
-class_name = "block block-partners"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-class_name += " block-partners--" + @block.template.layout
-%>
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
-
- <% unless @block.title.blank? && @block.template.description.blank? %>
- <div class="top">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <% unless @block.template.description.blank? %>
- <div class="description">
- <p><%= block_component_preview :description %></p>
- </div>
- <% end %>
- </div>
- <% end %>
-
- <div class="grid organizations">
- <% @block.template.elements.each do |element| %>
- <article class="organization">
- <h3>
- <% if element.best_url %>
- <a href="<%= element.best_url %>" target="_blank">
- <% end %>
- <%= element.best_name %>
- <% if element.best_url%>
- </a>
- <% end %>
- </h3>
- <div class="media">
- <%= kamifusen_tag element.best_logo, width: 600%>
- </div>
- </article>
- <% end %>
- </div>
-
- </div>
- </div>
-</section>
\ No newline at end of file
+<% @block.template.elements.each do |element| %>
+ <span class="me-2">
+ <% if element.best_logo %>
+ <%= image_tag element.best_logo, width: 90 %>
+ <% else %>
+ <%= element.best_name %>
+ <% end %>
+ </span>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/partners/_show.html.erb b/app/views/admin/communication/blocks/templates/partners/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..85482048240fc6d8830d5f6ec70d054efea9b859
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/partners/_show.html.erb
@@ -0,0 +1,46 @@
+<%
+class_name = "block block-partners"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+class_name += " block-partners--" + @block.template.layout
+%>
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+
+ <% unless @block.title.blank? && @block.template.description.blank? %>
+ <div class="top">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <% unless @block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_preview :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+
+ <div class="grid organizations">
+ <% @block.template.elements.each do |element| %>
+ <article class="organization">
+ <h3>
+ <% if element.best_url %>
+ <a href="<%= element.best_url %>" target="_blank">
+ <% end %>
+ <%= element.best_name %>
+ <% if element.best_url%>
+ </a>
+ <% end %>
+ </h3>
+ <div class="media">
+ <%= kamifusen_tag element.best_logo, width: 600 if element.best_logo %>
+ </div>
+ </article>
+ <% end %>
+ </div>
+
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/posts/_preview.html.erb b/app/views/admin/communication/blocks/templates/posts/_preview.html.erb
index 0d73386078540ecaa076a29d2db3ed8cbbeb7d8f..a5271035bd5f3dc3bd9df8e66fbbea56a2d5c50a 100644
--- a/app/views/admin/communication/blocks/templates/posts/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/posts/_preview.html.erb
@@ -1,38 +1,3 @@
-<%
-$class = "block block-posts"
-unless @block.title.blank?
- $class += " block-with-title"
-end
-$class += " block-posts--" + @block.template.layout
-%>
-<section class="<%= $class %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? %>
- <div class="top">
- <h2><%= @block.title %></h2>
- </div>
- <% end %>
- <div class="list">
- <% if @block.data %>
- <% @block.template.selected_posts.each do |post| %>
- <article class="post" itemprop="blogPosts" itemscope itemtype="http://schema.org/BlogPosting">
- <div class="post-content">
- <a href="#"><%= post %></a>
- <p itemprop="articleBody"><%= post.summary %></p>
- </div>
- <div class="post-meta">
- <time itemprop="datePublished" datetime="<%= post.published_at %>"><%= post.published_at.to_date %></time>
- </div>
- <% if post.best_featured_image.attached? %>
- <div class="media">
- <%= kamifusen_tag post.best_featured_image %>
- </div>
- <% end %>
- </article>
- <% end %>
- <% end %>
- </div>
- </div>
- </div>
-</section>
\ No newline at end of file
+<p class="mb-0">
+ <%= @template.selected_posts.first(2).collect(&:to_s).join(', ') %>...
+</p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/posts/_show.html.erb b/app/views/admin/communication/blocks/templates/posts/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..0d73386078540ecaa076a29d2db3ed8cbbeb7d8f
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/posts/_show.html.erb
@@ -0,0 +1,38 @@
+<%
+$class = "block block-posts"
+unless @block.title.blank?
+ $class += " block-with-title"
+end
+$class += " block-posts--" + @block.template.layout
+%>
+<section class="<%= $class %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? %>
+ <div class="top">
+ <h2><%= @block.title %></h2>
+ </div>
+ <% end %>
+ <div class="list">
+ <% if @block.data %>
+ <% @block.template.selected_posts.each do |post| %>
+ <article class="post" itemprop="blogPosts" itemscope itemtype="http://schema.org/BlogPosting">
+ <div class="post-content">
+ <a href="#"><%= post %></a>
+ <p itemprop="articleBody"><%= post.summary %></p>
+ </div>
+ <div class="post-meta">
+ <time itemprop="datePublished" datetime="<%= post.published_at %>"><%= post.published_at.to_date %></time>
+ </div>
+ <% if post.best_featured_image.attached? %>
+ <div class="media">
+ <%= kamifusen_tag post.best_featured_image %>
+ </div>
+ <% end %>
+ </article>
+ <% end %>
+ <% end %>
+ </div>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/programs/_preview.html.erb b/app/views/admin/communication/blocks/templates/programs/_preview.html.erb
index adda2a10c96ddae8c77b783cac0f71414345269d..19479fe9ac71b65a31af8c55ae3982a634db1634 100644
--- a/app/views/admin/communication/blocks/templates/programs/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/programs/_preview.html.erb
@@ -1,19 +1,3 @@
-<%
-$class = "block block-programs"
-unless @block.title.blank?
- $class += " block-with-title"
-end
-%>
-<section class="<%= $class %>" style="display: none;">
- <div class="container">
- <div class="block-content">
- <ol class="programs">
- <% @block.template.selected_programs.each do |program| %>
- <li>
- <%= program %></p>
- </li>
- <% end %>
- </ol>
- </div>
- </div>
-</section>
\ No newline at end of file
+<p class="mb-0">
+ <%= @template.selected_programs.first(2).collect(&:to_s).join(', ') %>...
+</p>
diff --git a/app/views/admin/communication/blocks/templates/programs/_show.html.erb b/app/views/admin/communication/blocks/templates/programs/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..adda2a10c96ddae8c77b783cac0f71414345269d
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/programs/_show.html.erb
@@ -0,0 +1,19 @@
+<%
+$class = "block block-programs"
+unless @block.title.blank?
+ $class += " block-with-title"
+end
+%>
+<section class="<%= $class %>" style="display: none;">
+ <div class="container">
+ <div class="block-content">
+ <ol class="programs">
+ <% @block.template.selected_programs.each do |program| %>
+ <li>
+ <%= program %></p>
+ </li>
+ <% end %>
+ </ol>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb b/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
index 8bc4c337f1455b78f9a78c212ba58695ef909f7d..65a09c65b5f52f21f25b933b799bb3827185b5bb 100644
--- a/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
@@ -1,69 +1,5 @@
-<%
- class_name = "block block-testimonials"
- unless @block.title.blank?
- class_name += " block-with-title"
- end
- if !@block.template.elements.one?
- class_name += " with-carousel"
- end
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <div class="testimonials">
- <% if !@block.template.elements.one? %>
- <div class="splide"
- data-splide='{
- "arrows":false,
- "autoplay":true,
- "pauseOnHover":false,
- "pauseOnFocus":true,
- "type":"loop",
- "autoHeight":true,
- "interval":8000
- }'
- >
- <div class="splide__slider">
- <div class="splide__track">
- <div class="splide__list">
- <% end %>
-
- <% @block.template.elements.each do |element| %>
- <% element_blob = element.photo_component.blob %>
- <figure <% if !@block.template.elements.one? %> class="splide__slide" <% end %>>
- <blockquote>
- <p><%= block_component_preview :text, template: element %></p>
- </blockquote>
- <figcaption>
- <% if element_blob.present? %>
- <div class="avatar">
- <%= kamifusen_tag element_blob, width: 600, class: 'img-fluid mb-1', alt: element.author %>
- </div>
- <% end %>
- <p>
- <% if element.author %>
- <span class="signature"><%= block_component_preview :author, template: element %></span>
- <% end %>
- <% if element.job %>
- <span class="meta"><%= block_component_preview :job, template: element %></span>
- <% end %>
- </p>
- </figcaption>
- </figure>
- <% end %>
- <% if !@block.template.elements.one? %>
- </div>
- </div>
- </div>
-
- <div class="splide__autoplay is-active">
- <button class="splide__play"></button>
- <button class="splide__pause"></button>
- </div>
- </div>
- <% end %>
- </div>
- </div>
- </div>
-</section>
\ No newline at end of file
+<p class="mb-0">
+ <% @block.template.elements.first(1).each do |element| %>
+ <%= strip_tags block_component_preview :text, template: element %>
+ <% end %>
+</p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/testimonials/_show.html.erb b/app/views/admin/communication/blocks/templates/testimonials/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..8bc4c337f1455b78f9a78c212ba58695ef909f7d
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/testimonials/_show.html.erb
@@ -0,0 +1,69 @@
+<%
+ class_name = "block block-testimonials"
+ unless @block.title.blank?
+ class_name += " block-with-title"
+ end
+ if !@block.template.elements.one?
+ class_name += " with-carousel"
+ end
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <div class="testimonials">
+ <% if !@block.template.elements.one? %>
+ <div class="splide"
+ data-splide='{
+ "arrows":false,
+ "autoplay":true,
+ "pauseOnHover":false,
+ "pauseOnFocus":true,
+ "type":"loop",
+ "autoHeight":true,
+ "interval":8000
+ }'
+ >
+ <div class="splide__slider">
+ <div class="splide__track">
+ <div class="splide__list">
+ <% end %>
+
+ <% @block.template.elements.each do |element| %>
+ <% element_blob = element.photo_component.blob %>
+ <figure <% if !@block.template.elements.one? %> class="splide__slide" <% end %>>
+ <blockquote>
+ <p><%= block_component_preview :text, template: element %></p>
+ </blockquote>
+ <figcaption>
+ <% if element_blob.present? %>
+ <div class="avatar">
+ <%= kamifusen_tag element_blob, width: 600, class: 'img-fluid mb-1', alt: element.author %>
+ </div>
+ <% end %>
+ <p>
+ <% if element.author %>
+ <span class="signature"><%= block_component_preview :author, template: element %></span>
+ <% end %>
+ <% if element.job %>
+ <span class="meta"><%= block_component_preview :job, template: element %></span>
+ <% end %>
+ </p>
+ </figcaption>
+ </figure>
+ <% end %>
+ <% if !@block.template.elements.one? %>
+ </div>
+ </div>
+ </div>
+
+ <div class="splide__autoplay is-active">
+ <button class="splide__play"></button>
+ <button class="splide__pause"></button>
+ </div>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb b/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
index acbde3057d1016f290d11505a273d7966dbe4fed..327b790be0c2e11efb38b0b270f3e0913689ee01 100644
--- a/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
@@ -1,55 +1,6 @@
-<%
- class_name = "block block-timeline"
- unless @block.title.blank?
- class_name += " block-with-title"
- end
- class_name += " block-timeline--" + @block.template.layout
-%>
-
-<section class="<%= class_name %>">
- <div class="container">
- <% if @block.template.layout == "vertical" %>
- <div class="block-content">
- <% unless @block.title.blank? %>
- <div class="top">
- <h2><%= @block.title %></h2>
- </div>
- <% end %>
- <div class="events">
- <% @block.template.elements.each do |element| %>
- <article class="event">
- <h3 class="event-title">
- <%= block_component_preview :title, template: element %>
- </h3>
-
- <%# TODO: gérer les sauts de ligne %>
- <p><%= element.text %></p>
- </article>
- <% end %>
- </div>
- </div>
- <% else %>
- <div class="timeline">
- <% unless @block.title.blank? %>
- <h2><%= @block.title %></h2>
- <% end %>
- <div class="events">
- <ol>
- <% @block.template.elements.each do |element| %>
- <li class="event">
- <p class="title"><%= block_component_preview :title, template: element %><p>
- <div class="line"></div>
- <div class="description"><%= block_component_preview :text, template: element %></div>
- </li>
- <% end %>
- </ol>
- <% if !@block.template.elements.one? %>
- <div class="timeline-arrows">
- <button class="previous" disabled></button>
- <button class="next"></button>
- </div>
- <% end %>
- </div>
- <% end %>
- </div>
-</section>
+<p class="mb-0">
+ <%= @block.template.elements.first(2).map { |element|
+ strip_tags(block_component_preview :title, template: element).strip
+ }.join(', ')
+ %>...
+</p>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/timeline/_show.html.erb b/app/views/admin/communication/blocks/templates/timeline/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..acbde3057d1016f290d11505a273d7966dbe4fed
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/timeline/_show.html.erb
@@ -0,0 +1,55 @@
+<%
+ class_name = "block block-timeline"
+ unless @block.title.blank?
+ class_name += " block-with-title"
+ end
+ class_name += " block-timeline--" + @block.template.layout
+%>
+
+<section class="<%= class_name %>">
+ <div class="container">
+ <% if @block.template.layout == "vertical" %>
+ <div class="block-content">
+ <% unless @block.title.blank? %>
+ <div class="top">
+ <h2><%= @block.title %></h2>
+ </div>
+ <% end %>
+ <div class="events">
+ <% @block.template.elements.each do |element| %>
+ <article class="event">
+ <h3 class="event-title">
+ <%= block_component_preview :title, template: element %>
+ </h3>
+
+ <%# TODO: gérer les sauts de ligne %>
+ <p><%= element.text %></p>
+ </article>
+ <% end %>
+ </div>
+ </div>
+ <% else %>
+ <div class="timeline">
+ <% unless @block.title.blank? %>
+ <h2><%= @block.title %></h2>
+ <% end %>
+ <div class="events">
+ <ol>
+ <% @block.template.elements.each do |element| %>
+ <li class="event">
+ <p class="title"><%= block_component_preview :title, template: element %><p>
+ <div class="line"></div>
+ <div class="description"><%= block_component_preview :text, template: element %></div>
+ </li>
+ <% end %>
+ </ol>
+ <% if !@block.template.elements.one? %>
+ <div class="timeline-arrows">
+ <button class="previous" disabled></button>
+ <button class="next"></button>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+</section>
diff --git a/app/views/admin/communication/blocks/templates/video/_preview.html.erb b/app/views/admin/communication/blocks/templates/video/_preview.html.erb
index 5876a6ccb8503c3bfff23607bad534040799b0d8..b05923de320980a81e818164a40a9917e0b685cf 100644
--- a/app/views/admin/communication/blocks/templates/video/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/video/_preview.html.erb
@@ -1,33 +1 @@
-<%
-class_name = "block block-video"
-unless @block.title.blank?
- class_name += " block-with-title"
-end
-%>
-<section class="<%= class_name %>">
- <div class="container">
- <div class="block-content">
- <% unless @block.title.blank? %>
- <div class="top">
- <h2><%= @block.title %></h2>
- </div>
- <% end %>
- <% if @block.template.url.present? %>
- <div class="video">
- <%= @block.template.video_iframe %>
- </div>
- <% end %>
- <% if @block.template.video_title %>
- <p><%= block_component_preview :video_title %></p>
- <% end %>
- <% unless @block.template.transcription.blank? %>
- <div class="transcription">
- <details>
- <summary><%= t 'accessibility.transcription' %></summary>
- <p><%= block_component_preview :transcription %></p>
- </details>
- </div>
- <% end %>
- </div>
- </div>
-</section>
\ No newline at end of file
+<%= @block.template.video_iframe %>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/video/_show.html.erb b/app/views/admin/communication/blocks/templates/video/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..5876a6ccb8503c3bfff23607bad534040799b0d8
--- /dev/null
+++ b/app/views/admin/communication/blocks/templates/video/_show.html.erb
@@ -0,0 +1,33 @@
+<%
+class_name = "block block-video"
+unless @block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+<section class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <% unless @block.title.blank? %>
+ <div class="top">
+ <h2><%= @block.title %></h2>
+ </div>
+ <% end %>
+ <% if @block.template.url.present? %>
+ <div class="video">
+ <%= @block.template.video_iframe %>
+ </div>
+ <% end %>
+ <% if @block.template.video_title %>
+ <p><%= block_component_preview :video_title %></p>
+ <% end %>
+ <% unless @block.template.transcription.blank? %>
+ <div class="transcription">
+ <details>
+ <summary><%= t 'accessibility.transcription' %></summary>
+ <p><%= block_component_preview :transcription %></p>
+ </details>
+ </div>
+ <% end %>
+ </div>
+ </div>
+</section>
\ No newline at end of file
diff --git a/app/views/admin/communication/extranets/posts/categories/preview.html.erb b/app/views/admin/communication/extranets/posts/categories/preview.html.erb
index 14bd7cd482e0666eb021ef6bb70d0732497bf91f..b776b4a0815d7a519fb984dd80a7d28d9af1bb62 100644
--- a/app/views/admin/communication/extranets/posts/categories/preview.html.erb
+++ b/app/views/admin/communication/extranets/posts/categories/preview.html.erb
@@ -1,3 +1,3 @@
<% content_for :title, @post.title %>
<% content_for :image, kamifusen_tag(@post.featured_image) if @post.featured_image.attached? %>
-<%= render 'admin/communication/blocks/preview', about: @post %>
+<%= render 'admin/communication/blocks/show', about: @post %>
diff --git a/app/views/admin/communication/extranets/posts/preview.html.erb b/app/views/admin/communication/extranets/posts/preview.html.erb
index 14bd7cd482e0666eb021ef6bb70d0732497bf91f..b776b4a0815d7a519fb984dd80a7d28d9af1bb62 100644
--- a/app/views/admin/communication/extranets/posts/preview.html.erb
+++ b/app/views/admin/communication/extranets/posts/preview.html.erb
@@ -1,3 +1,3 @@
<% content_for :title, @post.title %>
<% content_for :image, kamifusen_tag(@post.featured_image) if @post.featured_image.attached? %>
-<%= render 'admin/communication/blocks/preview', about: @post %>
+<%= render 'admin/communication/blocks/show', about: @post %>
diff --git a/app/views/admin/communication/websites/pages/preview.html.erb b/app/views/admin/communication/websites/pages/preview.html.erb
index 76adfeda0b7b937f3ab69b97c5a3cf99e84a29e0..e25884b6c56a83f82e10be46fd51f759ba4dfeed 100644
--- a/app/views/admin/communication/websites/pages/preview.html.erb
+++ b/app/views/admin/communication/websites/pages/preview.html.erb
@@ -1,3 +1,3 @@
<% content_for :title, @page.title %>
<% content_for :image, kamifusen_tag(@page.best_featured_image) if @page.best_featured_image.attached? %>
-<%= render 'admin/communication/blocks/preview', about: @page %>
+<%= render 'admin/communication/blocks/show', about: @page %>
diff --git a/app/views/admin/communication/websites/posts/preview.html.erb b/app/views/admin/communication/websites/posts/preview.html.erb
index 14bd7cd482e0666eb021ef6bb70d0732497bf91f..b776b4a0815d7a519fb984dd80a7d28d9af1bb62 100644
--- a/app/views/admin/communication/websites/posts/preview.html.erb
+++ b/app/views/admin/communication/websites/posts/preview.html.erb
@@ -1,3 +1,3 @@
<% content_for :title, @post.title %>
<% content_for :image, kamifusen_tag(@post.featured_image) if @post.featured_image.attached? %>
-<%= render 'admin/communication/blocks/preview', about: @post %>
+<%= render 'admin/communication/blocks/show', about: @post %>
diff --git a/app/views/admin/education/programs/preview.html.erb b/app/views/admin/education/programs/preview.html.erb
index 44ced32c00a74e313797584e89903d7c791a0a25..f694e83e7e4a64a5f742b2540a2b5564091d981a 100644
--- a/app/views/admin/education/programs/preview.html.erb
+++ b/app/views/admin/education/programs/preview.html.erb
@@ -49,7 +49,7 @@
</section>
<div class="blocks">
- <%= render 'admin/communication/blocks/preview', about: @program %>
+ <%= render 'admin/communication/blocks/show', about: @program %>
</div>
<section id="pedagogy">
diff --git a/app/views/extranet/posts/posts/show.html.erb b/app/views/extranet/posts/posts/show.html.erb
index df92a2c85ad8cf28f31d9afac3f6801ebb902505..57cade679a6e828cadc86da6d1fcd9475f329e64 100644
--- a/app/views/extranet/posts/posts/show.html.erb
+++ b/app/views/extranet/posts/posts/show.html.erb
@@ -16,5 +16,5 @@
<%= link_to @post.category, posts_category_path(slug: @post.category.slug) if @post.category %>
</main>
-<%= render 'admin/communication/blocks/preview', about: @post %>
+<%= render 'admin/communication/blocks/show', about: @post %>
<main>