diff --git a/app/controllers/extranet/posts/posts_controller.rb b/app/controllers/extranet/posts/posts_controller.rb
index 3705bd3fb3c5a9c7c43c1880d2bf9c888de5b922..bf0493e278097ad9ef667d8219fd0d2b4a01debd 100644
--- a/app/controllers/extranet/posts/posts_controller.rb
+++ b/app/controllers/extranet/posts/posts_controller.rb
@@ -10,6 +10,7 @@ class Extranet::Posts::PostsController < Extranet::Posts::ApplicationController
def show
@post = current_extranet.posts.find_by! slug: params[:slug]
+ @disable_container = true
breadcrumb
end
diff --git a/app/views/admin/communication/blocks/headings/_show.html.erb b/app/views/admin/communication/blocks/headings/_show.html.erb
index 1b03ddd3a07b5a4d3f9fbbb2a1a05423dd492333..236eaa9f5add13e8df7be9d8f104d9ed50fded2b 100644
--- a/app/views/admin/communication/blocks/headings/_show.html.erb
+++ b/app/views/admin/communication/blocks/headings/_show.html.erb
@@ -1,8 +1,5 @@
-<%
-html_tag = "h#{heading.level}"
-%>
-<div class="container">
- <<%= html_tag %>><%= heading %></<%= html_tag %>>
+<div class="heading container">
+ <h2><%= heading %></h2>
</div>
<% heading.blocks.published.ordered.each do |block| %>
<%= render "admin/communication/blocks/templates/#{block.template_kind}/show", block: block %>
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
index 7d3fad7c901cc712a433d060ea6b8be62166e45b..fd307ded528ff835cda677524b25cab63c9959ed 100644
--- 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
@@ -8,13 +8,13 @@ image_class = "call_to_action--with" + (block.template.image.empty? ? "out" : ""
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% if block.template.text %>
<div class="description">
@@ -45,4 +45,4 @@ image_class = "call_to_action--with" + (block.template.image.empty? ? "out" : ""
</div>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ 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
index 707e34befc7c1e50933a030e7026da273d19dc64..58e518ce9e79bc81013e170bb1b3189c0be65df9 100644
--- a/app/views/admin/communication/blocks/templates/chapter/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/chapter/_show.html.erb
@@ -5,14 +5,14 @@ class_name += " block-with-title" unless block.title.blank?
class_name += " block-chapter--with-image" if block.template.image[:id]
class_name += " block-chapter--" + block.template.layout
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<div class="chapter">
<div class="text">
<% if block.title.present? %>
<div class="top">
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
<% if block.template.text.present? %>
@@ -30,4 +30,4 @@ class_name += " block-chapter--" + block.template.layout
</div>
</div>
</div>
-</section>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/contact/_show.html.erb b/app/views/admin/communication/blocks/templates/contact/_show.html.erb
index 70dcd21575dcd6bde8d6a5d6840db6d68f1bc7fc..ff0377df38021dbfedbffdc3f04a9d81f2d1c7f4 100644
--- a/app/views/admin/communication/blocks/templates/contact/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/contact/_show.html.erb
@@ -5,13 +5,13 @@ unless block.title.blank?
end
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -62,4 +62,4 @@ end
</div>
</div>
</div>
-</section>
+</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
index 3a404a14cf68f546f10d4f042435899502e79dcd..7dc7d13bb5db1ef95f53b6e40a7f227ff7e28d91 100644
--- a/app/views/admin/communication/blocks/templates/datatable/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/datatable/_show.html.erb
@@ -4,13 +4,13 @@ unless block.title.blank?
class_name += " block-with-title"
end
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -40,4 +40,4 @@ end
</div>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ 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
index a7377917ae7ea8b16aeadb46d25ab5d66bb55b61..d6418de0c9818e379598e7413f9a8c06bd16efc5 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_show.html.erb
@@ -5,13 +5,13 @@
end
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -31,4 +31,4 @@
<% end %>
</div>
</div>
-</section>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/embed/_show.html.erb b/app/views/admin/communication/blocks/templates/embed/_show.html.erb
index 192db41c23c5ec47bd6df3ad0119274321aaebd1..78e33a0e233e70545c2fede36a8c123dbe807763 100644
--- a/app/views/admin/communication/blocks/templates/embed/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/embed/_show.html.erb
@@ -5,12 +5,12 @@
end
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
<div class="top">
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
@@ -28,7 +28,7 @@
<% end %>
</div>
</div>
-</section>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/features/_show.html.erb b/app/views/admin/communication/blocks/templates/features/_show.html.erb
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..646d55cc8b2dec3a32e606b4a6f7152d6acb66b2 100644
--- a/app/views/admin/communication/blocks/templates/features/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/features/_show.html.erb
@@ -0,0 +1,33 @@
+<%
+class_name = "block block-features"
+unless block.title.blank?
+ class_name += " block-with-title"
+end
+%>
+<div class="<%= class_name %>">
+ <div class="container">
+ <div class="block-content">
+ <div class="top">
+ <% unless block.title.blank? %>
+ <p class="block-title"><%= block.title %></p>
+ <% end %>
+ <% unless block.template.description.blank? %>
+ <div class="description">
+ <p><%= block_component_show block, :description %></p>
+ </div>
+ <% end %>
+ </div>
+ <ul>
+ <% block.template.elements.each do |element| %>
+ <li>
+ <div>
+ <h3><%= element.title %></h3>
+ <p><%= element.description %></p>
+ </div>
+ <%= block_component_show block, :image, template: element %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/files/_show.html.erb b/app/views/admin/communication/blocks/templates/files/_show.html.erb
index 8b34187b888b032a1f79a97a048baca78437b370..1fadd76b9b502c7512474376809744aa7034761c 100644
--- a/app/views/admin/communication/blocks/templates/files/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/files/_show.html.erb
@@ -5,13 +5,13 @@ unless block.title.blank?
end
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -38,4 +38,4 @@ end
</ul>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/gallery/_show.html.erb b/app/views/admin/communication/blocks/templates/gallery/_show.html.erb
index 60ec10386b55e6dae5a688125b026052e78058d1..ae34f38827642da3bb164b00b01c307762f15040 100644
--- a/app/views/admin/communication/blocks/templates/gallery/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/gallery/_show.html.erb
@@ -7,13 +7,13 @@ end
class_name += " block-gallery--" + block.template.layout
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% if block.template.description.present? %>
<div class="description">
@@ -46,4 +46,4 @@ class_name += " block-gallery--" + block.template.layout
<% end %>
</div>
</div>
- </section>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/image/_show.html.erb b/app/views/admin/communication/blocks/templates/image/_show.html.erb
index 2e6d009ec1ab75d799057f00e0a5c8d1c61c0aa2..f77fda978719c38290ff1deb9d01fbfbc8140c86 100644
--- a/app/views/admin/communication/blocks/templates/image/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/image/_show.html.erb
@@ -5,12 +5,12 @@ unless block.title.blank?
class_name += " block-with-title"
end
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
<div class="top">
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
<% if block.template.image %>
@@ -18,4 +18,4 @@ end
<% end %>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ 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
index a4eae29b9bf4b8f3bafb0207df7dff62af0e74af..f248e4ac523db69ede1a24316d4bb69c0cd8a3e8 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_show.html.erb
@@ -4,13 +4,13 @@ unless block.title.blank?
class_name += " block-with-title"
end
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -31,4 +31,4 @@ end
</ul>
</div>
</div>
-</section>
+</div>
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
index 3ad8c06373f9843e1b249a5cf0b6ac9359baf538..5d657bb35178208f048fe2f11711539b223b2e37 100644
--- a/app/views/admin/communication/blocks/templates/organization_chart/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/organization_chart/_show.html.erb
@@ -4,13 +4,13 @@ unless block.title.blank?
class_name += " block-with-title"
end
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -49,4 +49,4 @@ end
</div>
</div>
-</section>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/pages/_show.html.erb b/app/views/admin/communication/blocks/templates/pages/_show.html.erb
index ce069e9ecf7f57d01e773db293f73a57d310f2b7..f7e3e8965196d4ac4f87f998595a45662e2aec18 100644
--- a/app/views/admin/communication/blocks/templates/pages/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_show.html.erb
@@ -5,24 +5,24 @@ unless block.title.blank?
end
class_name += " block-pages--" + block.template.layout
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
- <div class="top">rail
+ <div class="top">
<% unless block.title.blank? %>
<% if block.template.layout === "cards" || block.template.layout === "list" %>
<% if block.template.page %>
- <h2><%= link_to block.template.page, block.template.page.url %></h2>
+ <p class="block-title"><%= link_to block.template.page, block.template.page.url %></p>
<% end %>
<% elsif block.template.layout === "grid" && block.template.page && block.template.show_main_description %>
- <h2><%= link_to block.title, block.template.page.url %></h2>
+ <p class="block-title"><%= link_to block.title, block.template.page.url %></p>
<p class="description"><%= block.template.page&.summary %></p>
<% else %>
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% end %>
@@ -100,4 +100,4 @@ class_name += " block-pages--" + block.template.layout
<% end %>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ 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
index 6b6b8fb693c876e58049665d71becbad25d1ed52..a7c24b1347d67fd4f623719fb115647c5dc56284 100644
--- a/app/views/admin/communication/blocks/templates/partners/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/partners/_show.html.erb
@@ -6,13 +6,13 @@
class_name += " block-partners--" + block.template.layout
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<% unless block.template.description.blank? %>
<div class="description">
@@ -57,4 +57,4 @@
</div>
</div>
</div>
-</section>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/posts/_show.html.erb b/app/views/admin/communication/blocks/templates/posts/_show.html.erb
index 35491fe8cc2946a9ba6c37a15748e4d019c8e60f..608985acf12479513b93d1469225c819f9dca395 100644
--- a/app/views/admin/communication/blocks/templates/posts/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/posts/_show.html.erb
@@ -7,12 +7,12 @@ class_name += " block-posts--" + block.template.layout
date_format = "%e %B %Y"
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
<div class="top">
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
@@ -159,4 +159,4 @@ date_format = "%e %B %Y"
<% end %>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/programs/_show.html.erb b/app/views/admin/communication/blocks/templates/programs/_show.html.erb
index a61df01a240ba15fbdee1c18ecc2e7da3bc7462d..f52f8d1d946ee21eeb6c0e19cc22714b17d21b11 100644
--- a/app/views/admin/communication/blocks/templates/programs/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/programs/_show.html.erb
@@ -5,13 +5,13 @@ unless block.title.blank?
end
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
<div class="top">
<% unless block.title.blank? %>
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
<% end %>
</div>
<% end %>
@@ -27,4 +27,4 @@ end
</ol>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/sound/_show.html.erb b/app/views/admin/communication/blocks/templates/sound/_show.html.erb
index 274447d6cb2a90c72869eec9ee1ec8a064f782a2..492e77c388fb25a06e0ef163bceaf3d6d4469337 100644
--- a/app/views/admin/communication/blocks/templates/sound/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/sound/_show.html.erb
@@ -4,12 +4,12 @@ unless block.title.blank?
class_name += " block-with-title"
end
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
<div class="top">
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
<% if block.template.file.present? %>
@@ -31,4 +31,4 @@ end
<% end %>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ 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
index 14db41e84ebc6c46ca1342ed8e28fa902319bfc0..4a7c205cfd5fe996ed92b61db2ef451c45f72abf 100644
--- a/app/views/admin/communication/blocks/templates/testimonials/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/testimonials/_show.html.erb
@@ -8,7 +8,7 @@
end
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<div class="testimonials">
@@ -66,4 +66,4 @@
</div>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ 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
index e91e43895462108fa8bb251cb0b89c15bb14a8c7..5260194843dd78c6a2d8cec1269a7f3c477b72c6 100644
--- a/app/views/admin/communication/blocks/templates/timeline/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/timeline/_show.html.erb
@@ -6,13 +6,13 @@
class_name += " block-timeline--" + block.template.layout
%>
-<section class="<%= class_name %>">
+<div 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>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
<div class="events">
@@ -31,7 +31,7 @@
<% else %>
<div class="timeline">
<% unless block.title.blank? %>
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
<% end %>
<div class="events">
<ol>
@@ -50,6 +50,7 @@
</div>
<% end %>
</div>
+ </div>
<% end %>
</div>
-</section>
+</div>
diff --git a/app/views/admin/communication/blocks/templates/video/_show.html.erb b/app/views/admin/communication/blocks/templates/video/_show.html.erb
index 62ddf854d761684b6ccd8c135ad5f0ce15dbc319..0ddc018ff096d749b594fec835ff84b1301ea915 100644
--- a/app/views/admin/communication/blocks/templates/video/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/video/_show.html.erb
@@ -4,12 +4,12 @@ unless block.title.blank?
class_name += " block-with-title"
end
%>
-<section class="<%= class_name %>">
+<div class="<%= class_name %>">
<div class="container">
<div class="block-content">
<% unless block.title.blank? %>
<div class="top">
- <h2><%= block.title %></h2>
+ <p class="block-title"><%= block.title %></p>
</div>
<% end %>
<% if block.template.url.present? %>
@@ -30,4 +30,4 @@ end
<% end %>
</div>
</div>
-</section>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/extranet/layouts/application.html.erb b/app/views/extranet/layouts/application.html.erb
index ccad435576b5eec0aea0abed45ea8745def16a78..1a43b0f03be7f1811e0e01325048e6d58c3437bc 100644
--- a/app/views/extranet/layouts/application.html.erb
+++ b/app/views/extranet/layouts/application.html.erb
@@ -7,7 +7,7 @@
<%= render 'application/notice' %>
<%= render 'extranet/application/nav' %>
<%= render 'extranet/application/header' %>
- <main class="container">
+ <main<% unless @disable_container %> class="container"<% end %>>
<%= yield %>
</main>
<%= render 'extranet/application/footer' %>
diff --git a/app/views/extranet/posts/posts/show.html.erb b/app/views/extranet/posts/posts/show.html.erb
index 1ee9f606421359f8a8e3a5967011301f94247be3..07c5ff7976ddd066cfb4a1e465cd898e81e8085b 100644
--- a/app/views/extranet/posts/posts/show.html.erb
+++ b/app/views/extranet/posts/posts/show.html.erb
@@ -27,6 +27,4 @@
</div>
<% end %>
-</main>
<%= render 'admin/communication/blocks/content/show', about: @post %>
-<main>