Merge branch 'next'

Joenio Costa
2 parents 370d0e1f fa207812
Showing 17 changed files with 434 additions and 22 deletions Show diff stats
app/models/block.rb
app/models/main_block.rb
app/views/box_organizer/edit.rhtml
plugins/comment_group/lib/ext/article.rb
plugins/comment_group/test/unit/article_test.rb
plugins/community_block/lib/community_block.rb
plugins/community_block/lib/community_block_plugin.rb
plugins/community_block/public/style.css
plugins/community_block/test/functional/commmunity_block_plugin_profile_design_controller_test.rb
plugins/community_block/test/test_helper.rb
plugins/community_block/test/unit/commmunity_block_plugin_test.rb
plugins/community_block/test/unit/commmunity_block_test.rb
plugins/community_block/views/community_block.rhtml
plugins/pg_search/lib/pg_search_plugin.rb
plugins/pg_search/test/unit/pg_search_plugin_test.rb
test/functional/profile_design_controller_test.rb
test/unit/main_block_test.rb
@@ -40,7 +40,7 @@ class Block &lt; ActiveRecord::Base
         if context[:article]
           return context[:article] != owner.home_page
         else
-          return context[:request_path] != '/' + owner.identifier
+          return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
         end
       end
     end
@@ -153,4 +153,19 @@ class Block &lt; ActiveRecord::Base
     }
   end
+  DISPLAY_OPTIONS = {
+    'always'           => __('In all pages'),
+    'home_page_only'   => __('Only in the homepage'),
+    'except_home_page' => __('In all pages, except in the homepage'),
+    'never'            => __('Don\'t display'),
+  }
+
+  def display_options
+    DISPLAY_OPTIONS.keys
+  end
+
+  def display_option_label(option)
+    DISPLAY_OPTIONS[option]
+  end
+
 end
@@ -17,11 +17,15 @@ class MainBlock &lt; Block
   end
   def editable?
-    false
+    true
   end
   def cacheable?
-   false
+    false
+  end
+
+  def display_options
+    ['always', 'except_home_page']
   end
 end
 <div class="block-config-options <%= @block.class.name %>-options">
-  <h2 class="title"><%= _('Editing block') %></h2>
+  <h2 class="title"><%= _(@block.class.description) %></h2>
   <% form_tag(:action => 'save', :id => @block.id) do %>
@@ -9,17 +9,11 @@
     <%= labelled_form_field _('Display this block:'), '' %>
     <div style='margin-left: 10px'>
-      <%= radio_button(:block, :display, 'always') %>
-      <%= label_tag('block_display_always', _('In all pages')) %>
-      <br/>
-      <%= radio_button(:block, :display, 'home_page_only') %>
-      <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
-      <br/>
-      <%= radio_button(:block, :display, 'except_home_page') %>
-      <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
-      <br/>
-      <%= radio_button(:block, :display, 'never') %>
-      <%= label_tag('block_display_never', _("Don't display")) %>
+      <% @block.display_options.each do |option| %>
+        <%= radio_button(:block, :display, option) %>
+        <%= label_tag("block_display_#{option}", _(@block.display_option_label(option))) %>
+        <br/>
+      <% end %>
     </div>
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
@@ -7,8 +7,8 @@ class Article
   validate :not_empty_group_comments_removed
   def not_empty_group_comments_removed
-    if body
-      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
+    if body && body_changed?
+      groups_with_comments = Comment.find(:all, :select => 'distinct group_id', :conditions => {:source_id => self.id}).map(&:group_id).compact
       groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
       errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
     end
 require File.dirname(__FILE__) + '/../test_helper'
+require 'benchmark'
 class ArticleTest < ActiveSupport::TestCase
@@ -16,16 +17,40 @@ class ArticleTest &lt; ActiveSupport::TestCase
   end
   should 'do not allow a exclusion of a group comment macro if this group has comments' do
-    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=2></div>")
+    article.body = "<div class=\"macro\" data-macro-group_id=2></div>"
     comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
     assert !article.save
     assert_equal 'Not empty group comment cannot be removed', article.errors[:base]
   end
   should 'allow save if comment group macro is not removed for group with comments' do
-    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=1></div>")
+    article.body = "<div class=\"macro\" data-macro-group_id=1></div>"
     comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
     assert article.save
   end
+  should 'do not validate empty group if article body is not changed' do
+    article.body = "<div class=\"macro\" data-macro-group_id=2></div>"
+    assert article.save
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    article.name = article.name + 'changed'
+    assert article.save
+  end
+
+  should 'improve performance checking changes in body' do
+    i = 1
+    time0 = (Benchmark.measure { 50.times {
+      i = i + 1
+      article.body = "i = #{i}"
+      assert article.save
+    }})
+    i = 1
+    time1 = (Benchmark.measure { 50.times {
+      i = i + 1
+      article.body = "i = 1"
+      assert article.save
+    }})
+    assert time0.total > time1.total
+  end
+
 end
@@ -0,0 +1,19 @@
+class CommunityBlock < Block
+
+  def self.description
+    _("Community block")
+  end
+
+  def help
+    _("Help for Community Description Block.")
+  end
+
+  def content(arg={})
+    block = self
+
+    lambda do
+      render :file => 'community_block', :locals => { :block => block }
+    end
+  end
+
+end
@@ -0,0 +1,27 @@
+require_dependency File.dirname(__FILE__) + '/community_block'
+
+class CommunityBlockPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Community Block Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a block to show community description")
+  end
+
+  def self.extra_blocks
+    {
+      CommunityBlock => {:type => Community}
+    }
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,104 @@
+#content .box-1 .community-block {
+  display: table;
+  width: 100%;
+}
+
+#content .box-1 .community-block .community-block-logo {
+  float: left;
+  width: 150px;
+  height: 150px;
+  padding: 5px;
+}
+
+#content .box-1 .community-block-info {
+  float: left;
+  padding: 5px;
+  width: 360px;
+  margin-left: 2px;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu {
+  bottom: 154px;
+  right: -120px;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-header {
+  display: none;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-content {
+  border: 1px solid #888a85;
+  border-radius: 4px;
+  background-color: #efefef;
+  background-image: none;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-content h4 {
+  display: none;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-content ul {
+  list-style: none;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-content li {
+  padding: 7px;
+  font-size: 10px;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-content a {
+  color: #000;
+}
+
+#content .box-1 .community-block .community-block-title .menu-submenu-footer {
+  display: none;
+}
+
+#content .box-1 .community-block .community-block-title h1 {
+  font-variant: small-caps;
+  color: #555753;
+  text-align: left;
+  padding-left: 10px;
+  margin: 0px 0px 2px 0px;
+}
+
+#content .box-1 .community-block .community-block-button {
+  border: 1px solid #CCCCCC;
+  border-radius: 4px;
+  float: right;
+  height: 22px;
+  line-height: 22px;
+  margin-top: 1px;
+  margin-right: 1px;
+  background-color: #F4F4F4;
+  background-position: center center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+}
+
+#content .box-1 .community-block .community-block-button.icon-add {
+  width: 20px;
+  background-image: url('/designs/icons/default/Tango/16x16/actions/add.png');
+}
+
+#content .box-1 .community-block .community-block-button.icon-remove {
+  width: 20px;
+  background-image: url('/designs/icons/default/Tango/16x16/actions/remove.png');
+}
+
+#content .box-1 .community-block .community-block-button.icon-arrow {
+  width: 16px;
+  background-image: url('/images/top-arrow.png');
+}
+
+#content .box-1 .community-block .community-block-button:hover {
+  background-color: #DDDDDD;
+}
+
+
+#content .box-1 .community-block .community-block-description {
+  font-style: italic;
+  color: black;
+  padding: 10px;
+}
+
@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e)
+    raise e
+  end
+end
+
+class ProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @user = create_user('testinguser').person
+    login_as(@user.identifier)
+
+    @community = fast_create(Community, :environment_id => Environment.default)
+    @community.add_member @user
+    @community.add_admin @user
+
+    @environment = @community.environment
+    @environment.enabled_plugins = ['CommunityBlock']
+    @environment.save!
+
+    CommunityBlock.delete_all
+    @box1 = Box.create!(:owner => @community)
+    @community.boxes = [@box1]
+
+    @block = CommunityBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @community.blocks<<@block
+    @community.save!
+  end
+
+  should 'display community-block' do
+    get :index, :profile => @community.identifier
+    assert_tag :div, :attributes => {:class => 'community-block-logo'}
+    assert_tag :div, :attributes => {:class => 'community-block-info'}
+    assert_tag :div, :attributes => {:class => 'community-block-title'}
+    assert_tag :div, :attributes => {:class => 'community-block-description'}
+  end
+
+  should 'display *leave* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
+  end
+
+  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
+  end
+
+  should 'display *report* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is logged in and is not a member of the community' do
+    @community.remove_member @user
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'display *control panel* link option when the user is logged in and is community admin' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'not display *arrow* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommunityBlockPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = CommunityBlockPlugin.new
+  end
+
+  should 'be a noosfero plugin' do
+    assert_kind_of Noosfero::Plugin, @plugin
+  end
+
+  should 'have name' do
+    assert_equal 'Community Block Plugin', CommunityBlockPlugin.plugin_name
+  end
+
+  should 'have description' do
+    assert_equal "A plugin that adds a block to show community description", CommunityBlockPlugin.plugin_description
+  end
+
+  should 'have stylesheet' do
+    assert @plugin.stylesheet?
+  end
+
+  should "return CommunityBlock in extra_blocks class method" do
+    assert  CommunityBlockPlugin.extra_blocks.keys.include?(CommunityBlock)
+  end
+
+  should "return false for class method has_admin_url?" do
+    assert  !CommunityBlockPlugin.has_admin_url?
+  end
+
+end
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommunityBlockTest < ActiveSupport::TestCase
+
+  should "display community block" do
+    block = CommunityBlock.new
+    self.expects(:render).with(:file => 'community_block', :locals => { :block => block })
+    instance_eval(& block.content)
+  end
+
+end
@@ -0,0 +1,52 @@
+<div class="community-block">
+  <div class="community-block-logo">
+    <%= link_to profile_image(profile, :big), profile.url %>
+  </div>
+  <div class="community-block-info">
+    <div class="community-block-title">
+
+      <%
+        links = []
+
+        if logged_in?
+
+          if profile.enable_contact?
+            links.push(_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
+          end
+
+          links.push(_('Report abuse') => {:href => url_for({:controller => 'profile', :action => 'report_abuse', :profile => profile.identifier})})
+
+          if !user.nil? && user.has_permission?('edit_profile', profile)
+            links.push(_('Control panel') => {:href => url_for({:controller => 'profile_editor', :profile => profile.identifier})})
+          end %>
+
+      <%= link_to(
+            content_tag('span','',:class => 'community-block-button icon-arrow'),
+            '#',
+            :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false;",
+            :class => 'simplemenu-trigger') %>
+
+      <% end %>
+
+      <% if logged_in? %>
+        <% if profile.members.include?(user) || profile.already_request_membership?(user) %>
+            <%= link_to(
+                  content_tag('span', '', :class => 'community-block-button icon-remove'),
+                  profile.leave_url) %>
+        <% else %>
+            <%= link_to(
+                  content_tag('span', '', :class => 'community-block-button icon-add'),
+                  profile.join_url) %>
+        <% end %>
+      <% else %>
+        <%= link_to(
+              content_tag('span', '', :class => 'community-block-button icon-add'),
+              profile.join_not_logged_url) %>
+      <% end %>
+
+      <h1><%=profile.name%></h1>
+    </div>
+    <div class="community-block-description"><%= profile.description %></div>
+  </div>
+  <div style="clear:both"></div>
+</div>
@@ -10,7 +10,7 @@ class PgSearchPlugin &lt; Noosfero::Plugin
   def find_by_contents(asset, scope, query, paginate_options={}, options={})
     scope = scope.pg_search_plugin_search(query) unless query.blank?
-    scope = scope.send(options[:filter]) unless options[:filter]
+    scope = scope.send(options[:filter]) if options[:filter]
     {:results => scope.paginate(paginate_options)}
   end
@@ -31,6 +31,11 @@ class PgSearchPluginTest &lt; ActiveSupport::TestCase
   #   assert_includes search(Profile, 'colmeia'), profile
   # end
+  should 'check if filter option is defined' do
+    plugin = PgSearchPlugin.new
+    assert plugin.find_by_contents('asset', Profile, 'query', {:page => 1})
+  end
+
   private
   def search(scope, query)
@@ -300,6 +300,27 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     assert !@controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
   end
+  should 'not edit main block with never option' do
+    get :edit, :profile => 'designtestuser', :id => @b4.id
+    assert_no_tag :input, :attributes => { :type => 'radio', :value => 'never'}
+  end
+
+  should 'not edit main block with home_page_only option' do
+    get :edit, :profile => 'designtestuser', :id => @b4.id
+    assert_no_tag :input, :attributes => { :type => 'radio', :value => 'home_page_only'}
+  end
+
+  should 'edit main block with always option' do
+    get :edit, :profile => 'designtestuser', :id => @b4.id
+    assert_tag :input, :attributes => { :type => 'radio', :value => 'always'}
+  end
+
+  should 'edit main block with except_home_page option' do
+    get :edit, :profile => 'designtestuser', :id => @b4.id
+    assert_tag :input, :attributes => { :type => 'radio', :value => 'except_home_page'}
+  end
+
+
   ######################################################
   # END - tests for BoxOrganizerController features
   ######################################################
@@ -11,8 +11,22 @@ class MainBlockTest &lt; ActiveSupport::TestCase
     ok("MainBlock must not have a content") { MainBlock.new.content.blank? }
   end
-  should 'not be editable' do
-    assert !MainBlock.new.editable?
+  should 'be editable' do
+    assert MainBlock.new.editable?
+  end
+
+  should 'be visible on environment' do
+    env = Environment.new
+    block = MainBlock.new
+    block.stubs(:owner).returns(env)
+    assert block.visible?
+  end
+
+  should 'not be visible on environment' do
+    env = Environment.new
+    block = MainBlock.new(:display => 'never')
+    block.stubs(:owner).returns(env)
+    assert !block.visible?
   end
 end
	@@ -40,7 +40,7 @@ class Block < ActiveRecord::Base		@@ -40,7 +40,7 @@ class Block < ActiveRecord::Base
40	if context[:article]	40	if context[:article]
41	return context[:article] != owner.home_page	41	return context[:article] != owner.home_page
42	else	42	else
43	- return context[:request_path] != '/' + owner.identifier	43	+ return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
44	end	44	end
45	end	45	end
46	end	46	end
	@@ -153,4 +153,19 @@ class Block < ActiveRecord::Base		@@ -153,4 +153,19 @@ class Block < ActiveRecord::Base
153	}	153	}
154	end	154	end
155		155
		156	+ DISPLAY_OPTIONS = {
		157	+ 'always' => __('In all pages'),
		158	+ 'home_page_only' => __('Only in the homepage'),
		159	+ 'except_home_page' => __('In all pages, except in the homepage'),
		160	+ 'never' => __('Don\'t display'),
		161	+ }
		162	+
		163	+ def display_options
		164	+ DISPLAY_OPTIONS.keys
		165	+ end
		166	+
		167	+ def display_option_label(option)
		168	+ DISPLAY_OPTIONS[option]
		169	+ end
		170	+
156	end	171	end
1	require File.dirname(__FILE__) + '/../test_helper'	1	require File.dirname(__FILE__) + '/../test_helper'
		2	+require 'benchmark'
2		3
3	class ArticleTest < ActiveSupport::TestCase	4	class ArticleTest < ActiveSupport::TestCase
4		5
	@@ -16,16 +17,40 @@ class ArticleTest < ActiveSupport::TestCase		@@ -16,16 +17,40 @@ class ArticleTest < ActiveSupport::TestCase
16	end	17	end
17		18
18	should 'do not allow a exclusion of a group comment macro if this group has comments' do	19	should 'do not allow a exclusion of a group comment macro if this group has comments' do
19	- article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=2></div>")	20	+ article.body = "<div class=\"macro\" data-macro-group_id=2></div>"
20	comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)	21	comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
21	assert !article.save	22	assert !article.save
22	assert_equal 'Not empty group comment cannot be removed', article.errors[:base]	23	assert_equal 'Not empty group comment cannot be removed', article.errors[:base]
23	end	24	end
24		25
25	should 'allow save if comment group macro is not removed for group with comments' do	26	should 'allow save if comment group macro is not removed for group with comments' do
26	- article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=1></div>")	27	+ article.body = "<div class=\"macro\" data-macro-group_id=1></div>"
27	comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)	28	comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
28	assert article.save	29	assert article.save
29	end	30	end
30		31
		32	+ should 'do not validate empty group if article body is not changed' do
		33	+ article.body = "<div class=\"macro\" data-macro-group_id=2></div>"
		34	+ assert article.save
		35	+ comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
		36	+ article.name = article.name + 'changed'
		37	+ assert article.save
		38	+ end
		39	+
		40	+ should 'improve performance checking changes in body' do
		41	+ i = 1
		42	+ time0 = (Benchmark.measure { 50.times {
		43	+ i = i + 1
		44	+ article.body = "i = #{i}"
		45	+ assert article.save
		46	+ }})
		47	+ i = 1
		48	+ time1 = (Benchmark.measure { 50.times {
		49	+ i = i + 1
		50	+ article.body = "i = 1"
		51	+ assert article.save
		52	+ }})
		53	+ assert time0.total > time1.total
		54	+ end
		55	+
31	end	56	end
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class CommunityBlock < Block
	2	+
	3	+ def self.description
	4	+ _("Community block")
	5	+ end
	6	+
	7	+ def help
	8	+ _("Help for Community Description Block.")
	9	+ end
	10	+
	11	+ def content(arg={})
	12	+ block = self
	13	+
	14	+ lambda do
	15	+ render :file => 'community_block', :locals => { :block => block }
	16	+ end
	17	+ end
	18	+
	19	+end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+require_dependency File.dirname(__FILE__) + '/community_block'
	2	+
	3	+class CommunityBlockPlugin < Noosfero::Plugin
	4	+
	5	+ def self.plugin_name
	6	+ "Community Block Plugin"
	7	+ end
	8	+
	9	+ def self.plugin_description
	10	+ _("A plugin that adds a block to show community description")
	11	+ end
	12	+
	13	+ def self.extra_blocks
	14	+ {
	15	+ CommunityBlock => {:type => Community}
	16	+ }
	17	+ end
	18	+
	19	+ def self.has_admin_url?
	20	+ false
	21	+ end
	22	+
	23	+ def stylesheet?
	24	+ true
	25	+ end
	26	+
	27	+end
@@ -0,0 +1,104 @@		@@ -0,0 +1,104 @@
	1	+#content .box-1 .community-block {
	2	+ display: table;
	3	+ width: 100%;
	4	+}
	5	+
	6	+#content .box-1 .community-block .community-block-logo {
	7	+ float: left;
	8	+ width: 150px;
	9	+ height: 150px;
	10	+ padding: 5px;
	11	+}
	12	+
	13	+#content .box-1 .community-block-info {
	14	+ float: left;
	15	+ padding: 5px;
	16	+ width: 360px;
	17	+ margin-left: 2px;
	18	+}
	19	+
	20	+#content .box-1 .community-block .community-block-title .menu-submenu {
	21	+ bottom: 154px;
	22	+ right: -120px;
	23	+}
	24	+
	25	+#content .box-1 .community-block .community-block-title .menu-submenu-header {
	26	+ display: none;
	27	+}
	28	+
	29	+#content .box-1 .community-block .community-block-title .menu-submenu-content {
	30	+ border: 1px solid #888a85;
	31	+ border-radius: 4px;
	32	+ background-color: #efefef;
	33	+ background-image: none;
	34	+}
	35	+
	36	+#content .box-1 .community-block .community-block-title .menu-submenu-content h4 {
	37	+ display: none;
	38	+}
	39	+
	40	+#content .box-1 .community-block .community-block-title .menu-submenu-content ul {
	41	+ list-style: none;
	42	+}
	43	+
	44	+#content .box-1 .community-block .community-block-title .menu-submenu-content li {
	45	+ padding: 7px;
	46	+ font-size: 10px;
	47	+}
	48	+
	49	+#content .box-1 .community-block .community-block-title .menu-submenu-content a {
	50	+ color: #000;
	51	+}
	52	+
	53	+#content .box-1 .community-block .community-block-title .menu-submenu-footer {
	54	+ display: none;
	55	+}
	56	+
	57	+#content .box-1 .community-block .community-block-title h1 {
	58	+ font-variant: small-caps;
	59	+ color: #555753;
	60	+ text-align: left;
	61	+ padding-left: 10px;
	62	+ margin: 0px 0px 2px 0px;
	63	+}
	64	+
	65	+#content .box-1 .community-block .community-block-button {
	66	+ border: 1px solid #CCCCCC;
	67	+ border-radius: 4px;
	68	+ float: right;
	69	+ height: 22px;
	70	+ line-height: 22px;
	71	+ margin-top: 1px;
	72	+ margin-right: 1px;
	73	+ background-color: #F4F4F4;
	74	+ background-position: center center;
	75	+ background-repeat: no-repeat;
	76	+ cursor: pointer;
	77	+}
	78	+
	79	+#content .box-1 .community-block .community-block-button.icon-add {
	80	+ width: 20px;
	81	+ background-image: url('/designs/icons/default/Tango/16x16/actions/add.png');
	82	+}
	83	+
	84	+#content .box-1 .community-block .community-block-button.icon-remove {
	85	+ width: 20px;
	86	+ background-image: url('/designs/icons/default/Tango/16x16/actions/remove.png');
	87	+}
	88	+
	89	+#content .box-1 .community-block .community-block-button.icon-arrow {
	90	+ width: 16px;
	91	+ background-image: url('/images/top-arrow.png');
	92	+}
	93	+
	94	+#content .box-1 .community-block .community-block-button:hover {
	95	+ background-color: #DDDDDD;
	96	+}
	97	+
	98	+
	99	+#content .box-1 .community-block .community-block-description {
	100	+ font-style: italic;
	101	+ color: black;
	102	+ padding: 10px;
	103	+}
	104	+
@@ -0,0 +1,87 @@		@@ -0,0 +1,87 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+# Re-raise errors caught by the controller.
	4	+class ProfileController
	5	+ append_view_path File.join(File.dirname(__FILE__) + '/../../views')
	6	+ def rescue_action(e)
	7	+ raise e
	8	+ end
	9	+end
	10	+
	11	+class ProfileControllerTest < ActionController::TestCase
	12	+
	13	+ def setup
	14	+ @controller = ProfileController.new
	15	+ @request = ActionController::TestRequest.new
	16	+ @response = ActionController::TestResponse.new
	17	+
	18	+ @user = create_user('testinguser').person
	19	+ login_as(@user.identifier)
	20	+
	21	+ @community = fast_create(Community, :environment_id => Environment.default)
	22	+ @community.add_member @user
	23	+ @community.add_admin @user
	24	+
	25	+ @environment = @community.environment
	26	+ @environment.enabled_plugins = ['CommunityBlock']
	27	+ @environment.save!
	28	+
	29	+ CommunityBlock.delete_all
	30	+ @box1 = Box.create!(:owner => @community)
	31	+ @community.boxes = [@box1]
	32	+
	33	+ @block = CommunityBlock.new
	34	+ @block.box = @box1
	35	+ @block.save!
	36	+
	37	+ @community.blocks<<@block
	38	+ @community.save!
	39	+ end
	40	+
	41	+ should 'display community-block' do
	42	+ get :index, :profile => @community.identifier
	43	+ assert_tag :div, :attributes => {:class => 'community-block-logo'}
	44	+ assert_tag :div, :attributes => {:class => 'community-block-info'}
	45	+ assert_tag :div, :attributes => {:class => 'community-block-title'}
	46	+ assert_tag :div, :attributes => {:class => 'community-block-description'}
	47	+ end
	48	+
	49	+ should 'display leave button when the user is logged in and is a member of the community' do
	50	+ get :index, :profile => @community.identifier
	51	+ assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
	52	+ end
	53	+
	54	+ should 'display send email to administrators button when the user is logged in and is a member of the community' do
	55	+ get :index, :profile => @community.identifier
	56	+ assert_match /\{"Send an e-mail":\{"href":"\/contact\/#{@community.identifier}\/new"\}\}/, @response.body
	57	+ end
	58	+
	59	+ should 'display report button when the user is logged in and is a member of the community' do
	60	+ get :index, :profile => @community.identifier
	61	+ assert_match /\{"Report abuse":\{"href":"\/profile\/#{@community.identifier}\/report_abuse"\}\}/, @response.body
	62	+ end
	63	+
	64	+ should 'display join button when the user is logged in and is not a member of the community' do
	65	+ @community.remove_member @user
	66	+ get :index, :profile => @community.identifier
	67	+ assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
	68	+ end
	69	+
	70	+ should 'display control panel link option when the user is logged in and is community admin' do
	71	+ get :index, :profile => @community.identifier
	72	+ assert_match /\{"Control panel":\{"href":"\/myprofile\/#{@community.identifier}"\}\}/, @response.body
	73	+ end
	74	+
	75	+ should 'display join button when the user is not logged in' do
	76	+ logout
	77	+ get :index, :profile => @community.identifier
	78	+ assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
	79	+ end
	80	+
	81	+ should 'not display arrow button when the user is not logged in' do
	82	+ logout
	83	+ get :index, :profile => @community.identifier
	84	+ assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
	85	+ end
	86	+
	87	+end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class CommunityBlockPluginTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @plugin = CommunityBlockPlugin.new
	7	+ end
	8	+
	9	+ should 'be a noosfero plugin' do
	10	+ assert_kind_of Noosfero::Plugin, @plugin
	11	+ end
	12	+
	13	+ should 'have name' do
	14	+ assert_equal 'Community Block Plugin', CommunityBlockPlugin.plugin_name
	15	+ end
	16	+
	17	+ should 'have description' do
	18	+ assert_equal "A plugin that adds a block to show community description", CommunityBlockPlugin.plugin_description
	19	+ end
	20	+
	21	+ should 'have stylesheet' do
	22	+ assert @plugin.stylesheet?
	23	+ end
	24	+
	25	+ should "return CommunityBlock in extra_blocks class method" do
	26	+ assert CommunityBlockPlugin.extra_blocks.keys.include?(CommunityBlock)
	27	+ end
	28	+
	29	+ should "return false for class method has_admin_url?" do
	30	+ assert !CommunityBlockPlugin.has_admin_url?
	31	+ end
	32	+
	33	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class CommunityBlockTest < ActiveSupport::TestCase
	4	+
	5	+ should "display community block" do
	6	+ block = CommunityBlock.new
	7	+ self.expects(:render).with(:file => 'community_block', :locals => { :block => block })
	8	+ instance_eval(& block.content)
	9	+ end
	10	+
	11	+end
@@ -0,0 +1,52 @@		@@ -0,0 +1,52 @@
	1	+<div class="community-block">
	2	+ <div class="community-block-logo">
	3	+ <%= link_to profile_image(profile, :big), profile.url %>
	4	+ </div>
	5	+ <div class="community-block-info">
	6	+ <div class="community-block-title">
	7	+
	8	+ <%
	9	+ links = []
	10	+
	11	+ if logged_in?
	12	+
	13	+ if profile.enable_contact?
	14	+ links.push(_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
	15	+ end
	16	+
	17	+ links.push(_('Report abuse') => {:href => url_for({:controller => 'profile', :action => 'report_abuse', :profile => profile.identifier})})
	18	+
	19	+ if !user.nil? && user.has_permission?('edit_profile', profile)
	20	+ links.push(_('Control panel') => {:href => url_for({:controller => 'profile_editor', :profile => profile.identifier})})
	21	+ end %>
	22	+
	23	+ <%= link_to(
	24	+ content_tag('span','',:class => 'community-block-button icon-arrow'),
	25	+ '#',
	26	+ :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false;",
	27	+ :class => 'simplemenu-trigger') %>
	28	+
	29	+ <% end %>
	30	+
	31	+ <% if logged_in? %>
	32	+ <% if profile.members.include?(user) \|\| profile.already_request_membership?(user) %>
	33	+ <%= link_to(
	34	+ content_tag('span', '', :class => 'community-block-button icon-remove'),
	35	+ profile.leave_url) %>
	36	+ <% else %>
	37	+ <%= link_to(
	38	+ content_tag('span', '', :class => 'community-block-button icon-add'),
	39	+ profile.join_url) %>
	40	+ <% end %>
	41	+ <% else %>
	42	+ <%= link_to(
	43	+ content_tag('span', '', :class => 'community-block-button icon-add'),
	44	+ profile.join_not_logged_url) %>
	45	+ <% end %>
	46	+
	47	+ <h1><%=profile.name%></h1>
	48	+ </div>
	49	+ <div class="community-block-description"><%= profile.description %></div>
	50	+ </div>
	51	+ <div style="clear:both"></div>
	52	+</div>