Download as
Browse Code »

Commit 53c76729fced2e974abfafb065ac2397d7ef6faa

Authored by Rodrigo Souto
1 parent 5ddb93d8
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

content-viewer: use lead instead of straight abstract

Showing 3 changed files with 7 additions and 6 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @53c7672
... ... @@ -724,8 +724,9 @@ class Article < ActiveRecord::Base
724 724 paragraphs.empty? ? '' : paragraphs.first.to_html
725 725 end
726 726  
727   - def lead
728   - abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
  727 + def lead(length = nil)
  728 + content = abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
  729 + length.present? ? content.truncate(length) : content
729 730 end
730 731  
731 732 def short_lead
... ...
app/views/content_viewer/_article_title.html.erb
  Diff comments   View file @53c7672
1 1 <% if @page.belongs_to_blog? || @page.belongs_to_forum?%>
2 2 <h1 class="title">
3   - <% if no_link %>
  3 + <% if no_link %>
4 4 <%= h(@page.title) %>
5   - <% else %>
  5 + <% else %>
6 6 <%= link_to(@page.name, @page.url) %>
7   - <% end %>
  7 + <% end %>
8 8 </h1>
9 9 <%= render :partial => "publishing_info" %>
10 10 <% unless @page.abstract.blank? %>
... ...
app/views/content_viewer/_display_compact_format.html.erb
  Diff comments   View file @53c7672
... ... @@ -16,6 +16,6 @@
16 16 </div>
17 17 <% end %>
18 18 <div class = <%= className %> >
19   - <%= article.abstract.truncate(400) %>
  19 + <%= article.lead(400) %>
20 20 </div>
21 21 </div>
... ...