Merge branch 'extranet/blocks' of github.com:noesya/osuny into extranet/blocks

app/views/admin/communication/blocks/components/image/_preview.html.erb

@@ -4,7 +4,7 @@ return unless blob
 %>
 
 <figure>
-  <%= kamifusen_tag blob, width: 600, class: 'img-fluid mb-1', alt: component.template.alt %>
+  <%= kamifusen_tag blob, width: 600, class: 'img-fluid mb-1', alt: component.template.try(:alt).blank? ? "" : component.template.alt %>
   <figcaption>
     <%= sanitize component.template.credit if component.template.try(:credit).present? %>
   </figcaption>

app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb

 <%
-  $class = "block block-testimonials"
+  class_name = "block block-testimonials"
   unless @block.title.blank?
-    $class += " block-with-title"
+    class_name += " block-with-title"
   end
   if !@block.template.elements.one?
-    $class += " with-carousel"
+    class_name += " with-carousel"
   end
 %>
 
-<section class="<%= $class %>">
+<section class="<%= class_name %>">
   <div class="container">
     <div class="block-content">
       <div class="testimonials">
@@ -41,12 +41,14 @@
                   <%= kamifusen_tag element_blob, width: 600, class: 'img-fluid mb-1', alt: element.author %>
                 </div>
               <% end %>
-              <% 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>
+                <% 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 %>

app/views/admin/communication/blocks/templates/timeline/_preview.html.erb

@@ -20,8 +20,10 @@
             <article class="event">
               <h3 class="event-title">
                 <%= block_component_preview :title, template: element %>
-              <h3>
-              <p><%= block_component_preview :text, template: element %></p>
+              </h3>
+
+              <%# TODO: gérer les sauts de ligne %>
+              <p><%= element.text %></p>
             </article>
           <% end %>
         </div>
@@ -37,7 +39,7 @@
               <li class="event">
                 <p class="title"><%= block_component_preview :title, template: element %><p>
                 <div class="line"></div>
-                <p class="description"><%= block_component_preview :text, template: element %></p>
+                <div class="description"><%= block_component_preview :text, template: element %></div>
               </li>
             <% end %>
           </ol>