Add new visualization option for blog posts.

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Add new visualization option for blog posts.
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
David Silva · Rodrigo Souto
1 parent a349d8fa
Showing 9 changed files with 108 additions and 9 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/blog_helper.rb
app/models/blog.rb
app/views/cms/_blog.html.erb
app/views/content_viewer/_display_compact_format.html.erb
app/views/content_viewer/blog_page.html.erb
public/stylesheets/application.css
test/functional/content_viewer_controller_test.rb
test/unit/blog_test.rb
@@ -11,6 +11,7 @@ class ContentViewerController &lt; ApplicationController
     path = get_path(params[:page], params[:format])
     @version = params[:version].to_i
+    @npage = params[:npage] || '1'
     if path.blank?
       @page = profile.home_page
@@ -2,6 +2,7 @@ module BlogHelper
   include ArticleHelper
+
   def custom_options_for_article(article,tokenized_children)
     @article = article
     hidden_field_tag('article[published]', 1) +
@@ -22,7 +23,9 @@ module BlogHelper
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
-      :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
+      :params => {:action=>"view_page",
+                  :page=>articles.first.parent.path.split('/'),
+                  :controller=>"content_viewer"}
     }) if articles.present? && conf[:paginate]
     content = []
     artic_len = articles.length
@@ -44,7 +47,7 @@ module BlogHelper
   end
   def display_post(article, format = 'full')
-    no_comments = (format == 'full') ? false : true
+    no_comments = (format == 'full' || format == 'compact' ) ? false : true
     title = article_title(article, :no_comments => no_comments)
     method = "display_#{format.split('+')[0]}_format"
     html = send(method, FilePresenter.for(article)).html_safe
@@ -55,8 +58,12 @@ module BlogHelper
       else
         '<div class="post-pic" style="background-image:url('+img+')"></div>'
       end
-    end.to_s +
-    title + html
+    end.to_s + title + html
+  end
+
+  def display_compact_format(article)
+    render :file => 'content_viewer/_display_compact_format',
+           :locals => { :article => article, :format => "compact" }
   end
   def display_full_format(article)
@@ -76,9 +76,12 @@ class Blog &lt; Folder
   end
   settings_items :visualization_format, :type => :string, :default => 'full'
-  validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
+  validates_inclusion_of :visualization_format,
+                         :in => [ 'full', 'short', 'short+pic', 'compact'],
+                         :if => :visualization_format
-  settings_items :display_posts_in_current_language, :type => :boolean, :default => false
+  settings_items :display_posts_in_current_language,
+                 :type => :boolean, :default => false
   alias :display_posts_in_current_language? :display_posts_in_current_language
@@ -67,7 +67,8 @@
 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [
   [ _('Full post'), 'full'],
   [ _('First paragraph'), 'short'],
-  [ _('First paragraph, with post picture'), 'short+pic']
+  [ _('First paragraph, with post picture'), 'short+pic'],
+  [ _("Title, Image, Lead"), 'compact']
 ])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -0,0 +1,21 @@
+<% if article.image %>
+  <% className = "article-compact-abstract-with-image" %>
+  <% if article.image.thumbnails_processed? %>
+    <% image_file = article.image.thumbnails[4].public_filename %>
+  <% else %>
+    <% image_file = "/images/icons-app/image-loading-thumb.png" %>
+  <% end %>
+<% else %>
+  <% className = "article-compact-abstract" %>
+<% end %>
+
+<div>
+  <% if article.image %>
+    <div class = "article-compact-image">
+      <%= image_tag(image_file) %>
+    </div>
+  <% end %>
+  <div class = <%= className %> >
+      <%= article.abstract.truncate(400) %>
+  </div>
+</div>
@@ -8,7 +8,7 @@
   </div>
 </div>
 <hr class="pre-posts"/>
-<div class="blog-posts">
+<div class="blog-posts page-<%= @npage %>">
   <% paginate = true %>
   <%=
    posts = @posts
@@ -1559,6 +1559,32 @@ div.article-body p img {
 #content .blog-post .read-more a {
   margin: 0 10px;
 }
+
+#content #article .blog-posts .blog-post .article-compact-abstract{
+  position: relative;
+  float:left;
+  margin-left: 10px;
+  width: 100%;
+  word-wrap: break-word;
+}
+
+#content #article .blog-posts .blog-post .article-compact-image{
+  position:relative;
+  float:left;
+  width: 27%;
+  display: table-cell;
+  vertical-align: middle;
+  text-align: center;
+  margin-top: 15px;
+}
+
+#content #article .blog-posts .blog-post .article-compact-abstract-with-image{
+  position: relative;
+  float:left;
+  margin-left: 10px;
+  width: 70%;
+  word-wrap: break-word;
+}
 /* NOT PUBLISHED BLOG POSTS */
 .blog-post.not-published {
@@ -1547,4 +1547,31 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/anotherurl" }}
   end
+  should  'show lead,image and title in compact blog visualization' do
+    community = Community.create(:name => 'test-community')
+    community.add_member(@profile)
+    community.save!
+
+    blog = community.articles.find_by_name("Blog")
+    blog.visualization_format = 'compact'
+    blog.save!
+
+    article = TinyMceArticle.create(:name => 'Article to be shared with images',
+                                    :body => 'This article should be shared with all social networks',
+                                    :profile => @profile,
+                                    :published => false,
+                                    :abstract => "teste teste teste",
+                                    :show_to_followers => true,
+                                    :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')} )
+    article.parent = blog
+    article.save!
+
+    login_as(@profile.identifier)
+
+
+    get :view_page, :profile => community.identifier, "page" => 'blog'
+
+    assert_tag :tag => 'div', :attributes => { :class => 'article-compact-image' }
+    assert_tag :tag => 'div', :attributes => { :class => 'article-compact-abstract-with-image' }
+  end
 end
@@ -161,7 +161,16 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert_equal 'short', p.blog.visualization_format
   end
-  should 'allow only full and short as visualization_format' do
+  should 'update visualization_format setting to compact' do
+    p = create_user('testuser').person
+    p.articles << build(Blog, :profile => p, :name => 'Blog test')
+    blog = p.blog
+    blog.visualization_format = 'compact'
+    assert blog.save!
+    assert_equal 'compact', p.blog.visualization_format
+  end
+
+  should 'allow only full, short or compact as visualization_format' do
     blog = build(Blog, :name => 'blog')
     blog.visualization_format = 'wrong_format'
     blog.valid?
@@ -174,6 +183,10 @@ class BlogTest &lt; ActiveSupport::TestCase
     blog.visualization_format = 'full'
     blog.valid?
     assert !blog.errors[:visualization_format.to_s].present?
+
+    blog.visualization_format = 'compact'
+    blog.valid?
+    assert !blog.errors[:visualization_format.to_s].present?
   end
   should 'have posts' do
	@@ -11,6 +11,7 @@ class ContentViewerController < ApplicationController		@@ -11,6 +11,7 @@ class ContentViewerController < ApplicationController
11	path = get_path(params[:page], params[:format])	11	path = get_path(params[:page], params[:format])
12		12
13	@version = params[:version].to_i	13	@version = params[:version].to_i
		14	+ @npage = params[:npage] \|\| '1'
14		15
15	if path.blank?	16	if path.blank?
16	@page = profile.home_page	17	@page = profile.home_page
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+<% if article.image %>
	2	+ <% className = "article-compact-abstract-with-image" %>
	3	+ <% if article.image.thumbnails_processed? %>
	4	+ <% image_file = article.image.thumbnails[4].public_filename %>
	5	+ <% else %>
	6	+ <% image_file = "/images/icons-app/image-loading-thumb.png" %>
	7	+ <% end %>
	8	+<% else %>
	9	+ <% className = "article-compact-abstract" %>
	10	+<% end %>
	11	+
	12	+<div>
	13	+ <% if article.image %>
	14	+ <div class = "article-compact-image">
	15	+ <%= image_tag(image_file) %>
	16	+ </div>
	17	+ <% end %>
	18	+ <div class = <%= className %> >
	19	+ <%= article.abstract.truncate(400) %>
	20	+ </div>
	21	+</div>
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	</div>	8	</div>
9	</div>	9	</div>
10	<hr class="pre-posts"/>	10	<hr class="pre-posts"/>
11	-<div class="blog-posts">	11	+<div class="blog-posts page-<%= @npage %>">
12	<% paginate = true %>	12	<% paginate = true %>
13	<%=	13	<%=
14	posts = @posts	14	posts = @posts
	@@ -1559,6 +1559,32 @@ div.article-body p img {		@@ -1559,6 +1559,32 @@ div.article-body p img {
1559	#content .blog-post .read-more a {	1559	#content .blog-post .read-more a {
1560	margin: 0 10px;	1560	margin: 0 10px;
1561	}	1561	}
		1562	+
		1563	+#content #article .blog-posts .blog-post .article-compact-abstract{
		1564	+ position: relative;
		1565	+ float:left;
		1566	+ margin-left: 10px;
		1567	+ width: 100%;
		1568	+ word-wrap: break-word;
		1569	+}
		1570	+
		1571	+#content #article .blog-posts .blog-post .article-compact-image{
		1572	+ position:relative;
		1573	+ float:left;
		1574	+ width: 27%;
		1575	+ display: table-cell;
		1576	+ vertical-align: middle;
		1577	+ text-align: center;
		1578	+ margin-top: 15px;
		1579	+}
		1580	+
		1581	+#content #article .blog-posts .blog-post .article-compact-abstract-with-image{
		1582	+ position: relative;
		1583	+ float:left;
		1584	+ margin-left: 10px;
		1585	+ width: 70%;
		1586	+ word-wrap: break-word;
		1587	+}
1562	/* NOT PUBLISHED BLOG POSTS */	1588	/* NOT PUBLISHED BLOG POSTS */
1563		1589
1564	.blog-post.not-published {	1590	.blog-post.not-published {
	@@ -1547,4 +1547,31 @@ class ContentViewerControllerTest < ActionController::TestCase		@@ -1547,4 +1547,31 @@ class ContentViewerControllerTest < ActionController::TestCase
1547	assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/anotherurl" }}	1547	assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/anotherurl" }}
1548	end	1548	end
1549		1549
		1550	+ should 'show lead,image and title in compact blog visualization' do
		1551	+ community = Community.create(:name => 'test-community')
		1552	+ community.add_member(@profile)
		1553	+ community.save!
		1554	+
		1555	+ blog = community.articles.find_by_name("Blog")
		1556	+ blog.visualization_format = 'compact'
		1557	+ blog.save!
		1558	+
		1559	+ article = TinyMceArticle.create(:name => 'Article to be shared with images',
		1560	+ :body => 'This article should be shared with all social networks',
		1561	+ :profile => @profile,
		1562	+ :published => false,
		1563	+ :abstract => "teste teste teste",
		1564	+ :show_to_followers => true,
		1565	+ :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')} )
		1566	+ article.parent = blog
		1567	+ article.save!
		1568	+
		1569	+ login_as(@profile.identifier)
		1570	+
		1571	+
		1572	+ get :view_page, :profile => community.identifier, "page" => 'blog'
		1573	+
		1574	+ assert_tag :tag => 'div', :attributes => { :class => 'article-compact-image' }
		1575	+ assert_tag :tag => 'div', :attributes => { :class => 'article-compact-abstract-with-image' }
		1576	+ end
1550	end	1577	end
	@@ -161,7 +161,16 @@ class BlogTest < ActiveSupport::TestCase		@@ -161,7 +161,16 @@ class BlogTest < ActiveSupport::TestCase
161	assert_equal 'short', p.blog.visualization_format	161	assert_equal 'short', p.blog.visualization_format
162	end	162	end
163		163
164	- should 'allow only full and short as visualization_format' do	164	+ should 'update visualization_format setting to compact' do
		165	+ p = create_user('testuser').person
		166	+ p.articles << build(Blog, :profile => p, :name => 'Blog test')
		167	+ blog = p.blog
		168	+ blog.visualization_format = 'compact'
		169	+ assert blog.save!
		170	+ assert_equal 'compact', p.blog.visualization_format
		171	+ end
		172	+
		173	+ should 'allow only full, short or compact as visualization_format' do
165	blog = build(Blog, :name => 'blog')	174	blog = build(Blog, :name => 'blog')
166	blog.visualization_format = 'wrong_format'	175	blog.visualization_format = 'wrong_format'
167	blog.valid?	176	blog.valid?
	@@ -174,6 +183,10 @@ class BlogTest < ActiveSupport::TestCase		@@ -174,6 +183,10 @@ class BlogTest < ActiveSupport::TestCase
174	blog.visualization_format = 'full'	183	blog.visualization_format = 'full'
175	blog.valid?	184	blog.valid?
176	assert !blog.errors[:visualization_format.to_s].present?	185	assert !blog.errors[:visualization_format.to_s].present?
		186	+
		187	+ blog.visualization_format = 'compact'
		188	+ blog.valid?
		189	+ assert !blog.errors[:visualization_format.to_s].present?
177	end	190	end
178		191
179	should 'have posts' do	192	should 'have posts' do