From 53c76729fced2e974abfafb065ac2397d7ef6faa Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 17 Jun 2015 15:14:53 -0300
Subject: [PATCH] content-viewer: use lead instead of straight abstract

---
 app/models/article.rb                                     | 5 +++--
 app/views/content_viewer/_article_title.html.erb          | 6 +++---
 app/views/content_viewer/_display_compact_format.html.erb | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models/article.rb b/app/models/article.rb
index 2a97e99..6899eac 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -724,8 +724,9 @@ class Article < ActiveRecord::Base
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
 
-  def lead
-    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+  def lead(length = nil)
+    content = abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+    length.present? ? content.truncate(length) : content
   end
 
   def short_lead
diff --git a/app/views/content_viewer/_article_title.html.erb b/app/views/content_viewer/_article_title.html.erb
index 36eaea9..240b8b7 100644
--- a/app/views/content_viewer/_article_title.html.erb
+++ b/app/views/content_viewer/_article_title.html.erb
@@ -1,10 +1,10 @@
 <% if @page.belongs_to_blog? || @page.belongs_to_forum?%>
   <h1 class="title">
-  <% if no_link %>
+    <% if no_link %>
       <%= h(@page.title) %>
-  <% else %>
+    <% else %>
       <%= link_to(@page.name, @page.url) %>
-  <% end %>
+    <% end %>
   </h1>
   <%= render :partial => "publishing_info" %>
   <% unless @page.abstract.blank? %>
diff --git a/app/views/content_viewer/_display_compact_format.html.erb b/app/views/content_viewer/_display_compact_format.html.erb
index 32d3f11..02b83ac 100644
--- a/app/views/content_viewer/_display_compact_format.html.erb
+++ b/app/views/content_viewer/_display_compact_format.html.erb
@@ -16,6 +16,6 @@
     </div>
   <% end %>
   <div class = <%= className %> >
-      <%= article.abstract.truncate(400) %>
+      <%= article.lead(400) %>
   </div>
 </div>
--
libgit2 0.21.2