diff --git a/app/helpers/blog_helper.rb b/app/helpers/blog_helper.rb
index 407d399..a74650f 100644
--- a/app/helpers/blog_helper.rb
+++ b/app/helpers/blog_helper.rb
@@ -18,7 +18,8 @@ module BlogHelper
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('« Newer posts'),
-      :next_label => _('Older posts »')
+      :next_label => _('Older posts »'),
+      :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
     })
     content = []
     artic_len = articles.length
diff --git a/app/models/article_block.rb b/app/models/article_block.rb
index 85fb7c2..0fe811e 100644
--- a/app/models/article_block.rb
+++ b/app/models/article_block.rb
@@ -49,4 +49,14 @@ class ArticleBlock < Block
     self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
   end
 
+  def posts_per_page
+    self.settings[:posts_per_page] or 1
+  end
+
+  def posts_per_page= value
+    value = value.to_i
+    self.settings[:posts_per_page] = value if value > 0
+  end
+
+  settings_items :visualization_format, :type => :string, :default => 'short'
 end
diff --git a/app/views/box_organizer/_article_block.rhtml b/app/views/box_organizer/_article_block.rhtml
index 5de82d8..7eccaa1 100644
--- a/app/views/box_organizer/_article_block.rhtml
+++ b/app/views/box_organizer/_article_block.rhtml
@@ -1,10 +1,23 @@
-<div class='article-block-edition'>
+<div class="article-block-edition">
 <% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
-  <p id='no_portal_community'>
+  <p id="no_portal_community">
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <% else %>
-  <% articles = @block.available_articles.select {|article| !article.folder? } %>
-  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
+  <%
+    articles = @block.available_articles.select {|a| !a.folder? || a.blog? }
+    firstText = articles[articles.find_index{|a| a.kind_of?TextArticle}||-1]
+    selected = @block.article || firstText
+  %>
+  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, selected.id), :onchange => 'jQuery("#block_blog_options").toggle(this.blogs.indexOf(this.value) != -1)') %>
+  <div id="block_blog_options">
+    <%= labelled_form_field( _('Number of posts:'), text_field_tag('block[posts_per_page]', @block.posts_per_page) ) %>
+    <%= labelled_form_field( _('How to display posts:'), select_tag('block[visualization_format]', options_for_select([[_('First paragraph'), 'short'], [_('Full post'), 'full']], @block.visualization_format))) %>
+  </div>
+  <% blogs = @block.available_articles.select{|a|a.blog?} %>
+  <script>
+    jQuery("#block_article_id")[0].blogs = <%= blogs.map{|b| b.id.to_s }.to_json %>;
+    jQuery("#block_blog_options").toggle(<%= blogs.include?(selected) %>);
+  </script>
 <% end %>
 </div>
diff --git a/app/views/content_viewer/blog_page.rhtml b/app/views/content_viewer/blog_page.rhtml
index 52bb080..d48ec35 100644
--- a/app/views/content_viewer/blog_page.rhtml
+++ b/app/views/content_viewer/blog_page.rhtml
@@ -11,9 +11,11 @@
 <div class="blog-posts">
   <%=
    posts = @posts
+   format = blog.visualization_format
    if inside_block
-     posts = blog.posts.paginate(:page=>1, :per_page=>1)
+     posts = blog.posts.paginate(:page=>1, :per_page=>inside_block.posts_per_page)
+     format = inside_block.visualization_format
    end
-   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, blog.visualization_format))
+   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format))
   %>
 </div>
diff --git a/test/integration/blocks_integration_test.rb b/test/integration/blocks_integration_test.rb
index 2a031c5..9ee9604 100644
--- a/test/integration/blocks_integration_test.rb
+++ b/test/integration/blocks_integration_test.rb
@@ -1,18 +1,56 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
 class BlocksIntegrationTest < ActionController::IntegrationTest
-
-  should "allow blog as block content" do
+  def blog_on_article_block_bootstrap
     profile = fast_create(Profile)
     blog = fast_create(Blog, :name => 'Blog', :profile_id => profile.id)
-    post = fast_create(TinyMceArticle, :name => "A Post", :profile_id => profile.id, :parent_id => blog.id, :body => 'Lorem ipsum dolor sit amet')
+    fast_create(TinyMceArticle, :name => "First Post", :profile_id => profile.id, :parent_id => blog.id, :body => '<p> Wasserstoffbombe </p>')
+    fast_create(TinyMceArticle, :name => "A Post", :profile_id => profile.id, :parent_id => blog.id, :body => '<p>Lorem ipsum dolor sit amet</p> <p>Second paragraph</p>')
     block = ArticleBlock.new
     block.article = blog
     profile.boxes << Box.new
     profile.boxes.first.blocks << block
-    
-    get "/profile/#{profile.identifier}"
+    return block
+  end
+
+  should 'allow blog as article block content' do
+    block = blog_on_article_block_bootstrap
+    get "/profile/#{block.owner.identifier}"
+    assert_match(/Lorem ipsum dolor sit amet/, @response.body)
+  end
+
+  should 'display short version for block posts on article block' do
+    block = blog_on_article_block_bootstrap
+    get "/profile/#{block.owner.identifier}"
+    assert_no_match(/Second paragraph/, @response.body)
+  end
+
+  should 'display full version for block posts on article block' do
+    block = blog_on_article_block_bootstrap
+    block.visualization_format = 'full'
+    block.save!
+    get "/profile/#{block.owner.identifier}"
+    assert_match(/Second paragraph/, @response.body)
+  end
+
+  should 'display configured number of blog posts on article block' do
+    block = blog_on_article_block_bootstrap
+    block.posts_per_page = 2
+    block.save!
+    get "/profile/#{block.owner.identifier}"
     assert_match(/Lorem ipsum dolor sit amet/, @response.body)
+    assert_match(/Wasserstoffbombe/, @response.body)
+  end
+
+  should 'link correctly in pagination' do
+    block = blog_on_article_block_bootstrap
+    p = block.owner
+    b = block.article
+    f = fast_create(Folder, :name => 'Folder1', :profile_id => p.id)
+    b.parent = f
+    b.save!
+    get "/profile/#{block.owner.identifier}"
+    assert_tag :tag => 'a', :attributes => { :href => "/#{p.identifier}/#{f.slug}/#{b.slug}?npage=2" }
   end
 
 end
--
libgit2 0.21.2