From 3bee24d222760b36a5912eb35a509bc1a0120787 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Thu, 30 Jun 2022 18:48:46 +0200 Subject: [PATCH] refactor preview --- .../communication/blocks/_preview.html.erb | 20 ++++++++++--------- .../websites/pages/preview.html.erb | 4 +--- .../websites/posts/preview.html.erb | 4 +--- .../admin/education/programs/preview.html.erb | 4 +--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/views/admin/communication/blocks/_preview.html.erb b/app/views/admin/communication/blocks/_preview.html.erb index 2275deafc..d58b3fae3 100644 --- a/app/views/admin/communication/blocks/_preview.html.erb +++ b/app/views/admin/communication/blocks/_preview.html.erb @@ -1,11 +1,13 @@ -<section class="block-<%= block.template_kind %>"> - <div class="container"> - <div class="block-content"> - <div class="top"> - <h2><%= block.title %></h2> +<% about.blocks.ordered.each do |block| %> + <section class="block-<%= block.template_kind %>"> + <div class="container"> + <div class="block-content"> + <div class="top"> + <h2><%= block.title %></h2> + </div> + <% @block = block %> + <%= render "admin/communication/blocks/templates/#{@block.template_kind}/preview" %> </div> - <% @block = block %> - <%= render "admin/communication/blocks/templates/#{@block.template_kind}/preview" %> </div> - </div> -</section> \ No newline at end of file + </section> +<% end %> \ No newline at end of file diff --git a/app/views/admin/communication/websites/pages/preview.html.erb b/app/views/admin/communication/websites/pages/preview.html.erb index b1f6cd670..2350e7912 100644 --- a/app/views/admin/communication/websites/pages/preview.html.erb +++ b/app/views/admin/communication/websites/pages/preview.html.erb @@ -1,6 +1,4 @@ <div class="container"> <%= @page.text.to_s %> </div> -<% @page.blocks.ordered.each do |block| %> - <%= render 'admin/communication/blocks/preview', block: block %> -<% end %> \ No newline at end of file +<%= render 'admin/communication/blocks/preview', 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 2e02e0662..a390bba28 100644 --- a/app/views/admin/communication/websites/posts/preview.html.erb +++ b/app/views/admin/communication/websites/posts/preview.html.erb @@ -1,6 +1,4 @@ <div class="container"> <%= @post.text.to_s %> </div> -<% @post.blocks.ordered.each do |block| %> - <%= render 'admin/communication/blocks/preview', block: block %> -<% end %> \ No newline at end of file +<%= render 'admin/communication/blocks/preview', about: @post %> diff --git a/app/views/admin/education/programs/preview.html.erb b/app/views/admin/education/programs/preview.html.erb index 1826c48e8..baeda9acb 100644 --- a/app/views/admin/education/programs/preview.html.erb +++ b/app/views/admin/education/programs/preview.html.erb @@ -5,9 +5,7 @@ <%= @program.send(property).to_s %> <% end %> -<% @program.blocks.ordered.each do |block| %> - <%= render 'admin/communication/blocks/preview', block: block %> -<% end %> +<%= render 'admin/communication/blocks/preview', about: @program %> <% [ :opportunities, -- GitLab