ActionItem806: some enhancements in blog

- display comment form opened - links to subscribe rss feed - show 'Edit blog' on view blog - display button to remove article when view - use select box instead of text fields to blog configuration - decreasing size of the field description - use 'New post' instead of 'New article'

ActionItem806: some enhancements in blog
- display comment form opened - links to subscribe rss feed - show 'Edit blog' on view blog - display button to remove article when view - use select box instead of text fields to blog configuration - decreasing size of the field description - use 'New post' instead of 'New article'
Joenio Costa · Antonio Terceiro
1 parent 4b393886
Showing 19 changed files with 161 additions and 28 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/blog_helper.rb
app/helpers/cms_helper.rb
app/helpers/content_viewer_helper.rb
app/models/blog_archives_block.rb
app/views/cms/_blog.rhtml
app/views/cms/view.rhtml
app/views/content_viewer/_comment_form.rhtml
app/views/content_viewer/view_page.rhtml
app/views/layouts/application.rhtml
public/stylesheets/blocks/blog-archives-block.css
test/functional/cms_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/unit/application_helper_test.rb
test/unit/cms_helper_test.rb
test/unit/content_viewer_helper_test.rb
@@ -129,11 +129,12 @@ class CmsController &lt; MyProfileController
     redirect_to :action => 'view', :id => @article.id
   end
-  post_only :destroy
   def destroy
     @article = profile.articles.find(params[:id])
-    @article.destroy
-    redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
+    if request.post?
+      @article.destroy
+      redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
+    end
   end
   def why_categorize
@@ -62,6 +62,8 @@ class ContentViewerController &lt; ApplicationController
       return
     end
+    @form_div = params[:form]
+
     if request.post? && params[:comment] && params[self.icaptcha_field].blank? && @page.accept_comments?
       add_comment
     end
@@ -719,4 +719,33 @@ module ApplicationHelper
     environment.top_url(request.ssl?)
   end
+  def helper_for_article(article)
+    article_helper = ActionView::Base.new
+    article_helper.extend ArticleHelper
+    begin
+      class_name = article.class.name + 'Helper'
+      klass = class_name.constantize
+      article_helper.extend klass
+    rescue
+    end
+    article_helper
+  end
+
+  def label_for_new_article(article)
+    article_helper = helper_for_article(!article.nil? && !article.parent.nil? ? article.parent : article)
+    article_helper.cms_label_for_new_children
+  end
+
+  def label_for_edit_article(article)
+    article_helper = helper_for_article(article)
+    article_helper.cms_label_for_edit
+  end
+
+  def meta_tags_for_article(article)
+    if article and (article.blog? or (article.parent and article.parent.blog?))
+      blog = article.blog? ? article : article.parent
+      "<link rel='alternate' type='application/rss+xml' title='#{blog.feed.title}' href='#{url_for blog.feed.url}' />"
+    end
+  end
+
 end
@@ -11,4 +11,12 @@ module ArticleHelper
     )
   end
+  def cms_label_for_new_children
+    _('New article')
+  end
+
+  def cms_label_for_edit
+    _('Edit')
+  end
+
 end
@@ -6,4 +6,12 @@ module BlogHelper
     hidden_field_tag('article[accept_comments]', 0)
   end
+  def cms_label_for_new_children
+    _('New post')
+  end
+
+  def cms_label_for_edit
+    _('Edit blog')
+  end
+
 end
@@ -12,14 +12,7 @@ module CmsHelper
   attr_reader :environment
   def options_for_article(article)
-    article_helper = ActionView::Base.new
-    article_helper.extend ArticleHelper
-    begin
-      class_name = article.class.name + 'Helper'
-      klass = class_name.constantize
-      article_helper.extend klass
-    rescue
-    end
+    article_helper = helper_for_article(article)
     article_helper.custom_options_for_article(article)
   end
@@ -35,7 +35,7 @@ module ContentViewerHelper
   def display_post(article)
     article_title(article) + content_tag('p', article.to_html) +
-    content_tag('p', link_to( number_of_comments(article), article.url ), :class => 'metadata')
+    content_tag('p', link_to( number_of_comments(article), article.url.merge(:form => 'opened', :anchor => 'comment_form') ), :class => 'metadata')
   end
   def article_to_html(article)
@@ -3,6 +3,7 @@ class BlogArchivesBlock &lt; Block
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::UrlHelper
   include ActionController::UrlWriter
+  include ActionView::Helpers::AssetTagHelper
   def self.description
     _('List posts of your blog')
@@ -25,7 +26,8 @@ class BlogArchivesBlock &lt; Block
       results << "</ul>"
     end
     block_title(title) +
-    content_tag('ul', results, :class => 'blog-archives')
+    content_tag('ul', results, :class => 'blog-archives') +
+    content_tag('div', link_to(_('Subscribe RSS Feed'), owner.blog.feed.url), :class => 'subscribe-feed')
   end
 end
@@ -4,18 +4,14 @@
 <%= f.text_field('title', :size => '64') %>
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64)) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
-<h4><%= _('Settings') %></h4>
-
-<%= f.text_field('posts_per_page') %>
-
-<h5><%= _('Feed options') %></h5>
+<%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
 <% fields_for 'article[feed]', @article.feed do |feed| %>
-<%= labelled_form_field(_('Limit of articles'), feed.text_field(:limit)) %>
+<%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, ['5', '10', '20', '50'])) %>
-<%= labelled_form_field(_('Use as item description:'), feed.select(:feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
+<%= labelled_form_field(_('Use as description in RSS Feed:'), feed.select(:feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
 <% end %>
@@ -22,7 +22,7 @@
   <% if !@article or !@article.blog? %>
     <%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
   <% end %>
-  <%= lightbox_button('new', _('New article'), :action => 'new', :parent_id => parent_id) %>
+  <%= lightbox_button('new', label_for_new_article(@article), :action => 'new', :parent_id => parent_id) %>
 <% end %>
 <table class='cms-articles'>
@@ -15,7 +15,7 @@
            f.commit.focus(); f['comment[<%= focus_on %>]'].focus();
            this.onclick=null">
-<h4><%= _('Post a comment') %></h4>
+<h4><%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %></h4>
 <% form_tag( @page.url, { :id => comment_form_id } ) do %>
@@ -32,15 +32,18 @@
   </script>
   <% if logged_in?  && current_user.person.has_permission?('post_content', profile) %>
     <div id="article-actions" class="hidden">
-      <%= link_to content_tag( 'span', _('Edit') ),
+      <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
           { :controller => 'cms', :action => 'edit', :id => @page },
           :class => 'button with-text icon-edit' %>
+      <%= link_to content_tag( 'span', _('Delete') ),
+          { :controller => 'cms', :action => 'destroy', :id => @page },
+          :class => 'button with-text icon-delete' %>
       <% if profile.kind_of?(Person) %>
         <%= link_to content_tag( 'span', _('Spread this') ),
             { :controller => 'cms', :action => 'publish', :id => @page },
             :class => 'button with-text icon-spread' %>
       <% end %>
-      <%= lightbox_button(:new, _('New publication'), :controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent))) %>
+      <%= lightbox_button(:new, label_for_new_article(@page), :controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent))) %>
     </div>
   <% end %>
 </div>
@@ -11,7 +11,7 @@
     <meta name="description" content="FIXME: Descriptions of Noosfero" />
     <meta name="keywords" content="Noosfero, Community, Open Source" />
     <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
-
+    <%= meta_tags_for_article(@page) if @controller.controller_name == 'content_viewer' %>
     <%= javascript_include_tag 'default-config' %>
     <%= javascript_include_tag :defaults %>
     <%# javascript_include_tag 'animator' %>
@@ -15,3 +15,8 @@
 .blog-archives-block a {
   text-decoration: none;
 }
+
+.blog-archives-block .subscribe-feed {
+  padding: 5px 0px 10px 10px;
+  font-size: small;
+}
@@ -642,7 +642,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   should 'display posts per page input with default value on edit blog' do
     get :new, :profile => profile.identifier, :type => 'Blog'
-    assert_tag :tag => 'input', :attributes => { :name => 'article[posts_per_page]', :type => 'text', :value => '20' }
+    assert_tag :tag => 'select', :attributes => { :name => 'article[posts_per_page]' }, :child => { :tag => 'option', :attributes => {:value => '20', :selected => 'selected'} }
   end
   should 'not offer to create special article types' do
@@ -725,4 +725,25 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'article[title]', :type => 'text' }
   end
+  should "display 'New article' when create children of folder" do
+    a = Folder.new(:name => 'article folder'); profile.articles << a;  a.save!
+    Article.stubs(:short_description).returns('bli')
+    get :view, :profile => profile.identifier, :id => a
+    assert_tag :tag => 'a', :content => 'New article'
+  end
+
+  should "display 'New post' when create children of blog" do
+    a = Blog.create!(:name => 'blog_for_test', :profile => profile)
+    Article.stubs(:short_description).returns('bli')
+    get :view, :profile => profile.identifier, :id => a
+    assert_tag :tag => 'a', :content => 'New post'
+  end
+
+  should 'offer confirmation to remove article' do
+    a = profile.articles.create!(:name => 'my-article')
+    get :destroy, :profile => profile.identifier, :id => a.id
+    assert_response :success
+    assert_tag :tag => 'input', :attributes => {:type => 'submit', :value => 'Yes, I want.' }
+  end
+
 end
@@ -564,4 +564,59 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'div', :attributes => { :class => /main-block/ }, :descendant => { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/cms/new?parent_id=#{folder.id}" } }
   end
+  should "display 'New article' when create children of folder" do
+    login_as(profile.identifier)
+    a = Folder.new(:name => 'article folder'); profile.articles << a;  a.save!
+    Article.stubs(:short_description).returns('bli')
+    get :view_page, :profile => profile.identifier, :page => [a.path]
+    assert_tag :tag => 'a', :content => 'New article'
+  end
+
+  should "display 'New post' when create children of blog" do
+    login_as(profile.identifier)
+    a = Blog.create!(:name => 'article folder', :profile => profile)
+    Article.stubs(:short_description).returns('bli')
+    get :view_page, :profile => profile.identifier, :page => [a.path]
+    assert_tag :tag => 'a', :content => 'New post'
+  end
+
+  should "display same label for new article button of parent" do
+    login_as(profile.identifier)
+    a = Blog.create!(:name => 'article folder', :profile => profile)
+    Article.stubs(:short_description).returns('bli')
+    t = TextileArticle.create!(:name => 'first post', :parent => a, :profile => profile)
+    get :view_page, :profile => profile.identifier, :page => [t.path]
+    assert_tag :tag => 'a', :content => 'New post'
+  end
+
+  should 'display button to remove article' do
+    login_as(profile.identifier)
+    t = TextileArticle.create!(:name => 'article to destroy', :profile => profile)
+    get :view_page, :profile => profile.identifier, :page => [t.path]
+    assert_tag :tag => 'a', :content => 'Delete', :attributes => {:href => "/myprofile/#{profile.identifier}/cms/destroy/#{t.id}"}
+  end
+
+  should 'add meta tag to rss feed on view blog' do
+    login_as(profile.identifier)
+    a = Blog.create!(:name => 'article folder', :profile => profile)
+    get :view_page, :profile => profile.identifier, :page => [a.path]
+    assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'feed', :href => /\/#{profile.identifier}\/blog\/feed/}
+  end
+
+  should 'add meta tag to rss feed on view post blog' do
+    login_as(profile.identifier)
+    a = Blog.create!(:name => 'article folder', :profile => profile)
+    t = TextileArticle.create!(:name => 'first post', :parent => a, :profile => profile)
+    get :view_page, :profile => profile.identifier, :page => [t.path]
+    assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'feed', :href => /\/#{profile.identifier}\/blog\/feed/}
+  end
+
+  should 'link to post with comment form opened' do
+    login_as(profile.identifier)
+    a = Blog.create!(:name => 'article folder', :profile => profile)
+    t = TextileArticle.create!(:name => 'first post', :parent => a, :profile => profile)
+    get :view_page, :profile => profile.identifier, :page => [a.path]
+    assert_tag :tag => 'div', :attributes => { :id => "post-#{t.id}" }, :descendant => { :tag => 'a', :content => 'No comments yet', :attributes => { :href => /#{profile.identifier}\/blog\/first-post\?form=opened#comment_form/ } }
+  end
+
 end
@@ -225,8 +225,17 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_nil select_categories(mock)
   end
+  should 'create rss feed link to blog' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    assert_tag_in_string meta_tags_for_article(b), :tag => 'link', :attributes => {:type => 'application/rss+xml', :title => 'feed'}
+  end
+
   protected
+  def url_for(args = {})
+    args
+  end
   def content_tag(tag, content, options = {})
     content.strip
   end
@@ -4,6 +4,7 @@ class CmsHelperTest &lt; Test::Unit::TestCase
   include CmsHelper
   include BlogHelper
+  include ApplicationHelper
   should 'show default options for article' do
     result = options_for_article(RssFeed.new)
@@ -46,7 +46,7 @@ class ContentViewerHelperTest &lt; Test::Unit::TestCase
   should 'count total of comments from post' do
     article = TextileArticle.new(:name => 'first post for test', :body => 'first post for test', :profile => profile)
-    article.stubs(:url).returns('')
+    article.stubs(:url).returns({})
     article.stubs(:comments).returns([Comment.new(:author => profile, :title => 'test', :body => 'test')])
     result = display_post(article)
     assert_match /One comment/, result
	@@ -719,4 +719,33 @@ module ApplicationHelper		@@ -719,4 +719,33 @@ module ApplicationHelper
719	environment.top_url(request.ssl?)	719	environment.top_url(request.ssl?)
720	end	720	end
721		721
		722	+ def helper_for_article(article)
		723	+ article_helper = ActionView::Base.new
		724	+ article_helper.extend ArticleHelper
		725	+ begin
		726	+ class_name = article.class.name + 'Helper'
		727	+ klass = class_name.constantize
		728	+ article_helper.extend klass
		729	+ rescue
		730	+ end
		731	+ article_helper
		732	+ end
		733	+
		734	+ def label_for_new_article(article)
		735	+ article_helper = helper_for_article(!article.nil? && !article.parent.nil? ? article.parent : article)
		736	+ article_helper.cms_label_for_new_children
		737	+ end
		738	+
		739	+ def label_for_edit_article(article)
		740	+ article_helper = helper_for_article(article)
		741	+ article_helper.cms_label_for_edit
		742	+ end
		743	+
		744	+ def meta_tags_for_article(article)
		745	+ if article and (article.blog? or (article.parent and article.parent.blog?))
		746	+ blog = article.blog? ? article : article.parent
		747	+ "<link rel='alternate' type='application/rss+xml' title='#{blog.feed.title}' href='#{url_for blog.feed.url}' />"
		748	+ end
		749	+ end
		750	+
722	end	751	end
	@@ -11,4 +11,12 @@ module ArticleHelper		@@ -11,4 +11,12 @@ module ArticleHelper
11	)	11	)
12	end	12	end
13		13
		14	+ def cms_label_for_new_children
		15	+ _('New article')
		16	+ end
		17	+
		18	+ def cms_label_for_edit
		19	+ _('Edit')
		20	+ end
		21	+
14	end	22	end
	@@ -6,4 +6,12 @@ module BlogHelper		@@ -6,4 +6,12 @@ module BlogHelper
6	hidden_field_tag('article[accept_comments]', 0)	6	hidden_field_tag('article[accept_comments]', 0)
7	end	7	end
8		8
		9	+ def cms_label_for_new_children
		10	+ _('New post')
		11	+ end
		12	+
		13	+ def cms_label_for_edit
		14	+ _('Edit blog')
		15	+ end
		16	+
9	end	17	end
	@@ -12,14 +12,7 @@ module CmsHelper		@@ -12,14 +12,7 @@ module CmsHelper
12	attr_reader :environment	12	attr_reader :environment
13		13
14	def options_for_article(article)	14	def options_for_article(article)
15	- article_helper = ActionView::Base.new
16	- article_helper.extend ArticleHelper
17	- begin
18	- class_name = article.class.name + 'Helper'
19	- klass = class_name.constantize
20	- article_helper.extend klass
21	- rescue
22	- end	15	+ article_helper = helper_for_article(article)
23	article_helper.custom_options_for_article(article)	16	article_helper.custom_options_for_article(article)
24	end	17	end
25		18
	@@ -35,7 +35,7 @@ module ContentViewerHelper		@@ -35,7 +35,7 @@ module ContentViewerHelper
35		35
36	def display_post(article)	36	def display_post(article)
37	article_title(article) + content_tag('p', article.to_html) +	37	article_title(article) + content_tag('p', article.to_html) +
38	- content_tag('p', link_to( number_of_comments(article), article.url ), :class => 'metadata')	38	+ content_tag('p', link_to( number_of_comments(article), article.url.merge(:form => 'opened', :anchor => 'comment_form') ), :class => 'metadata')
39	end	39	end
40		40
41	def article_to_html(article)	41	def article_to_html(article)
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22	<% if !@article or !@article.blog? %>	22	<% if !@article or !@article.blog? %>
23	<%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>	23	<%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
24	<% end %>	24	<% end %>
25	- <%= lightbox_button('new', _('New article'), :action => 'new', :parent_id => parent_id) %>	25	+ <%= lightbox_button('new', label_for_new_article(@article), :action => 'new', :parent_id => parent_id) %>
26	<% end %>	26	<% end %>
27		27
28	<table class='cms-articles'>	28	<table class='cms-articles'>
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	f.commit.focus(); f['comment[<%= focus_on %>]'].focus();	15	f.commit.focus(); f['comment[<%= focus_on %>]'].focus();
16	this.onclick=null">	16	this.onclick=null">
17		17
18	-<h4><%= _('Post a comment') %></h4>	18	+<h4><%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %></h4>
19		19
20	<% form_tag( @page.url, { :id => comment_form_id } ) do %>	20	<% form_tag( @page.url, { :id => comment_form_id } ) do %>
21		21
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	<meta name="description" content="FIXME: Descriptions of Noosfero" />	11	<meta name="description" content="FIXME: Descriptions of Noosfero" />
12	<meta name="keywords" content="Noosfero, Community, Open Source" />	12	<meta name="keywords" content="Noosfero, Community, Open Source" />
13	<link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />	13	<link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
14	-	14	+ <%= meta_tags_for_article(@page) if @controller.controller_name == 'content_viewer' %>
15	<%= javascript_include_tag 'default-config' %>	15	<%= javascript_include_tag 'default-config' %>
16	<%= javascript_include_tag :defaults %>	16	<%= javascript_include_tag :defaults %>
17	<%# javascript_include_tag 'animator' %>	17	<%# javascript_include_tag 'animator' %>
	@@ -15,3 +15,8 @@		@@ -15,3 +15,8 @@
15	.blog-archives-block a {	15	.blog-archives-block a {
16	text-decoration: none;	16	text-decoration: none;
17	}	17	}
		18	+
		19	+.blog-archives-block .subscribe-feed {
		20	+ padding: 5px 0px 10px 10px;
		21	+ font-size: small;
		22	+}
	@@ -642,7 +642,7 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -642,7 +642,7 @@ class CmsControllerTest < Test::Unit::TestCase
642		642
643	should 'display posts per page input with default value on edit blog' do	643	should 'display posts per page input with default value on edit blog' do
644	get :new, :profile => profile.identifier, :type => 'Blog'	644	get :new, :profile => profile.identifier, :type => 'Blog'
645	- assert_tag :tag => 'input', :attributes => { :name => 'article[posts_per_page]', :type => 'text', :value => '20' }	645	+ assert_tag :tag => 'select', :attributes => { :name => 'article[posts_per_page]' }, :child => { :tag => 'option', :attributes => {:value => '20', :selected => 'selected'} }
646	end	646	end
647		647
648	should 'not offer to create special article types' do	648	should 'not offer to create special article types' do
	@@ -725,4 +725,25 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -725,4 +725,25 @@ class CmsControllerTest < Test::Unit::TestCase
725	assert_tag :tag => 'input', :attributes => { :name => 'article[title]', :type => 'text' }	725	assert_tag :tag => 'input', :attributes => { :name => 'article[title]', :type => 'text' }
726	end	726	end
727		727
		728	+ should "display 'New article' when create children of folder" do
		729	+ a = Folder.new(:name => 'article folder'); profile.articles << a; a.save!
		730	+ Article.stubs(:short_description).returns('bli')
		731	+ get :view, :profile => profile.identifier, :id => a
		732	+ assert_tag :tag => 'a', :content => 'New article'
		733	+ end
		734	+
		735	+ should "display 'New post' when create children of blog" do
		736	+ a = Blog.create!(:name => 'blog_for_test', :profile => profile)
		737	+ Article.stubs(:short_description).returns('bli')
		738	+ get :view, :profile => profile.identifier, :id => a
		739	+ assert_tag :tag => 'a', :content => 'New post'
		740	+ end
		741	+
		742	+ should 'offer confirmation to remove article' do
		743	+ a = profile.articles.create!(:name => 'my-article')
		744	+ get :destroy, :profile => profile.identifier, :id => a.id
		745	+ assert_response :success
		746	+ assert_tag :tag => 'input', :attributes => {:type => 'submit', :value => 'Yes, I want.' }
		747	+ end
		748	+
728	end	749	end