[Git][noosfero/noosfero][master] 2 commits: Extracts article body to partial in view_page

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
4870ad47 by Gabriel Silva at 2018-02-28T17:38:48Z
Extracts article body to partial in view_page

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
a7956e5e by Rodrigo Souto at 2018-03-27T13:24:21Z
Merge branch 'view-page-partial' into 'master'

Extracts article body to partial in view_page

See merge request noosfero/noosfero!1411
- - - - -


2 changed files:

- + app/views/content_viewer/_article_body.html.erb
- app/views/content_viewer/view_page.html.erb


Changes:

=====================================
app/views/content_viewer/_article_body.html.erb
=====================================
--- /dev/null
+++ b/app/views/content_viewer/_article_body.html.erb
@@ -0,0 +1,14 @@
+<% cache(page.cache_key(params, user, language)) do %>
+  <div class="<%="article-body article-body-" + page.css_class_name %>">
+    <% if page.image.present? && !page.event? && !page.blog? %>
+      <div class="article-body-img">
+        <%= image_tag(page.image.public_filename) %>
+        <p><%= page.image.label %></p>
+      </div>
+    <% end %>
+
+    <% options = page.image? ? { gallery_view: true } : {} %>
+    <%= article_to_html(page, options) %>
+    <br style="clear:both" />
+  </div>
+<% end %>


=====================================
app/views/content_viewer/view_page.html.erb
=====================================
--- a/app/views/content_viewer/view_page.html.erb
+++ b/app/views/content_viewer/view_page.html.erb
@@ -30,19 +30,7 @@
   <%= render :partial => 'addthis' %>
 <% end %>
 
-<% cache(@page.cache_key(params, user, language)) do %>
-  <div class="<%="article-body article-body-" + @page.css_class_name %>">
-    <% options = @page.image? ? {:gallery_view => true} : {} %>
-    <% if @page.image.present? && !@page.event? && !@page.blog? %>
-      <div class="article-body-img">
-        <%= image_tag(@page.image.public_filename) %>
-        <p><%= @page.image.label%></p>
-      </div>
-    <% end %>
-    <%= article_to_html(@page, options) %>
-    <br style="clear:both" />
-  </div> <!-- end class="article-body" -->
-<% end %>
+<%= render partial: 'article_body', locals: { page: @page } %>
 
 <% if ! @page.categories.empty? %>
 <div id="article-cat">



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/23aaaa811ae15c344fe9e8fa6d027b20a2108438...a7956e5e46c45f46d55c6d2130fb71e399374ffc

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/23aaaa811ae15c344fe9e8fa6d027b20a2108438...a7956e5e46c45f46d55c6d2130fb71e399374ffc
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180327/b2414068/attachment-0001.html>