Merge branch 'master' into staging

Leandro Santos
2 parents b0339ba5 732a29a0
Showing 17 changed files with 252 additions and 86 deletions Show diff stats
DEVELOPMENT.md
app/helpers/boxes_helper.rb
app/models/thumbnail.rb
db/migrate/20160309120350_generate_missed_thumbnails.rb
lib/noosfero/plugin.rb
plugins/community_block/lib/community_block.rb
plugins/community_block/test/unit/commmunity_block_test.rb
plugins/community_block/views/blocks/community.html.erb
plugins/community_block/views/community_block.html.erb
plugins/container_block/lib/container_block_plugin/container_block.rb
plugins/oauth_client/README.md
plugins/oauth_client/models/oauth_client_plugin/provider.rb
plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb
plugins/people_block/test/unit/friends_block_test.rb
plugins/people_block/test/unit/members_block_test.rb
plugins/people_block/test/unit/people_block_test.rb
plugins/people_block/views/blocks/people_base.html.erb
@@ -11,6 +11,22 @@
   Noosfero version and/or the maintainance work of an existing Noosfero stable
   branch. See MAINTAINANCE.md for details on the maintaince policy.
+## Current Commiters
+
+* Antonio Terceiro (@terceiro)
+* Bráulio Bhavamitra (@brauliobo)
+* Daniela Feitosa (@danielafeitosa)
+* Joenio Costa (@joenio)
+* Larissa Reis (@larissa)
+* Leandro Nunes (@leandronunes)
+* Marcos Ronaldo (@marcosronaldo)
+* Rodrigo Souto (@diguliu)
+* Victor Costa (@vfcosta)
+
+## Current Release Manager
+
+* Rodrigo Souto (@diguliu)
+
 ## Development process
 * Every new feature or non-trivial bugfix should be reviewed by at least one
@@ -88,7 +88,7 @@ module BoxesHelper
   end
   def render_block block, prefix = nil, klass = block.class
-    template_name = klass.name.underscore.sub '_block', ''
+    template_name = klass.name.demodulize.underscore.sub '_block', ''
     begin
       render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
     rescue ActionView::MissingTemplate
@@ -5,7 +5,7 @@ class Thumbnail &lt; ActiveRecord::Base
   attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id
   has_attachment :storage => :file_system,
-    :content_type => :image, :max_size => 5.megabytes, processor: 'Rmagick'
+    :content_type => :image, :max_size => UploadedFile.max_size, processor: 'Rmagick'
   validates_as_attachment
   sanitize_filename
@@ -0,0 +1,5 @@
+class GenerateMissedThumbnails < ActiveRecord::Migration
+  def up
+    UploadedFile.find_each {|f| f.create_thumbnails if f.thumbnails.empty? }
+  end
+end
@@ -233,7 +233,7 @@ class Noosfero::Plugin
       type = type.map do |x|
         x.is_a?(String) ? x.capitalize.constantize : x
       end
-      raise "This is not a valid type" if !type.empty? && ![Person, Community, Enterprise, Environment].detect{|m| type.include?(m)}
+      raise "This is not a valid type" if !type.empty? && (type.any?{|t| !(t < Profile) && t != Environment })
       position = options[:position]
       position = position.is_a?(Array) ? position : [position].compact
@@ -7,13 +7,4 @@ class CommunityBlock &lt; Block
   def help
     _("Help for Community Description Block.")
   end
-
-  def content(arg={})
-    block = self
-
-    proc do
-      render :file => 'community_block', :locals => { :block => block }
-    end
-  end
-
 end
@@ -1,11 +0,0 @@
-require_relative '../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(c_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
+          end
+
+          links.push(c_('Report abuse') => {:href => url_for({:controller => 'profile', :action => 'report_abuse', :profile => profile.identifier})})
+
+          if !user.nil? && user.has_permission?('edit_profile', profile)
+            links.push(c_('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,'',#{CGI::escapeHTML(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, :class => 'join-community') %>
+        <% else %>
+            <%= link_to(
+                  content_tag('span', '', :class => 'community-block-button icon-add'),
+                  profile.join_url, :class => 'join-community') %>
+        <% 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>
@@ -1,52 +0,0 @@
-<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(c_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
-          end
-
-          links.push(c_('Report abuse') => {:href => url_for({:controller => 'profile', :action => 'report_abuse', :profile => profile.identifier})})
-
-          if !user.nil? && user.has_permission?('edit_profile', profile)
-            links.push(c_('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,'',#{CGI::escapeHTML(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, :class => 'join-community') %>
-        <% else %>
-            <%= link_to(
-                  content_tag('span', '', :class => 'community-block-button icon-add'),
-                  profile.join_url, :class => 'join-community') %>
-        <% 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>
@@ -66,13 +66,6 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
     children_settings[child_id][:width] if children_settings[child_id]
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/container', :locals => {:block => block}
-    end
-  end
-
   def copy_from_with_container(block)
     copy_from_without_container(block)
     children_settings = block.children_settings
@@ -33,6 +33,14 @@ Facebook
 [Create Facebook application](https://developers.facebook.com/docs/facebook-login/v2.1)
+Callback
+========
+
+This is the callback path that you need to use in your app configuration:
+
+/plugin/oauth_client/public/callback
+
+
 Varnish Settings
 ================
 If varnish has been used in your stack, you've to bypass the cache for signup page and prevent cookies to be removed when calling the oauth_client plugin callback. E.g.:
@@ -11,7 +11,7 @@ class OauthClientPlugin::Provider &lt; ActiveRecord::Base
   settings_items :client_options, type: Hash
   attr_accessible :name, :strategy, :enabled, :site, :image_builder,
-    :environment, :environment_id,
+    :environment, :environment_id, :options,
     :client_id, :client_secret, :client_options
   scope :enabled, -> { where enabled: true }
 <h1><%= _('Oauth Client Settings') %></h1>
 <h3><%= _('Edit Provider') %></h3>
-<%= form_for @provider, :url => {:action => 'edit'}, :method => 'post' do |f| %>
+<%= form_for @provider, :url => {:action => 'edit', :id => @provider.id}, :method => 'post' do |f| %>
   <div class="enabled">
     <%= labelled_form_field f.check_box(:enabled) + _('Enabled'), '' %>
@@ -153,4 +153,59 @@ class FriendsBlockViewTest &lt; ActionView::TestCase
     assert_tag_in_string render_block_footer(block), tag: 'a', attributes: {class: 'view-all', href: '/profile/mytestperson/friends' }
   end
+
+  FACTOR = 1.8
+
+  # Testing blog page display. It should not present a linear increase in time
+  # needed to display a blog page with the increase in number of posts.
+  #
+  # GOOD          BAD
+  #
+  # ^             ^     /
+  # |             |    /
+  # |   _____     |   /
+  # |  /          |  /
+  # | /           | /
+  # |/            |/
+  # +--------->   +--------->
+  # 0  50  100    0  50  100
+  #
+  should 'not have a linear increase in time to display friends block' do
+    owner = fast_create(Person)
+    owner.boxes<< Box.new
+    block = FriendsBlock.create!(:box => owner.boxes.first)
+
+    ActionView::Base.any_instance.stubs(:profile_image_link).returns('some name')
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    # no people
+    block.reload
+    time0 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # first 50
+    1.upto(50).map do |n|
+      p = create_user("user #{n}").person
+      owner.add_friend(p)
+    end
+    block.reload
+    time1 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # another 50
+    1.upto(50).map do |n|
+      p = create_user("user #{n}").person
+      owner.add_friend(p)
+    end
+    block.reload
+    time2 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # should not scale linearly, i.e. the inclination of the first segment must
+    # be a lot higher than the one of the segment segment. To compensate for
+    # small variations due to hardware and/or execution environment, we are
+    # satisfied if the the inclination of the first segment is at least twice
+    # the inclination of the second segment.
+    a1 = (time1.total - time0.total)/50.0
+    a2 = (time2.total - time1.total)/50.0
+    assert a1 > a2*FACTOR, "#{a1} should be larger than #{a2} by at least a factor of #{FACTOR}"
+  end
+
 end
@@ -306,4 +306,60 @@ class MembersBlockViewTest &lt; ActionView::TestCase
       assert_select '[href=/profile/mytestuser/members#admins-tab]'
     end
   end
+
+  FACTOR = 1.8
+
+  # Testing blog page display. It should not present a linear increase in time
+  # needed to display a blog page with the increase in number of posts.
+  #
+  # GOOD          BAD
+  #
+  # ^             ^     /
+  # |             |    /
+  # |   _____     |   /
+  # |  /          |  /
+  # | /           | /
+  # |/            |/
+  # +--------->   +--------->
+  # 0  50  100    0  50  100
+  #
+  should 'not have a linear increase in time to display members block' do
+    owner = fast_create(Community)
+    owner.boxes<< Box.new
+    block = MembersBlock.create!(:box => owner.boxes.first)
+
+    ActionView::Base.any_instance.stubs(:profile_image_link).returns('some name')
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    # no people
+    block.reload
+    time0 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    1.upto(50).map do |n|
+      p = create_user("user #{n}").person
+      owner.add_member(p)
+    end
+
+    # first 50
+    block.reload
+    time1 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    1.upto(50).map do |n|
+      p = create_user("user 1#{n}").person
+      owner.add_member(p)
+    end
+    block.reload
+    # another 50
+    time2 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # should not scale linearly, i.e. the inclination of the first segment must
+    # be a lot higher than the one of the segment segment. To compensate for
+    # small variations due to hardware and/or execution environment, we are
+    # satisfied if the the inclination of the first segment is at least twice
+    # the inclination of the second segment.
+    a1 = (time1.total - time0.total)/50.0
+    a2 = (time2.total - time1.total)/50.0
+    assert a1 > a2*FACTOR, "#{a1} should be larger than #{a2} by at least a factor of #{FACTOR}"
+  end
+
 end
@@ -145,4 +145,57 @@ class PeopleBlockViewTest &lt; ActionView::TestCase
       assert_select '[href=/search/people]'
     end
   end
+
+  FACTOR = 1.8
+
+  # Testing blog page display. It should not present a linear increase in time
+  # needed to display a blog page with the increase in number of posts.
+  #
+  # GOOD          BAD
+  #
+  # ^             ^     /
+  # |             |    /
+  # |   _____     |   /
+  # |  /          |  /
+  # | /           | /
+  # |/            |/
+  # +--------->   +--------->
+  # 0  50  100    0  50  100
+  #
+  should 'not have a linear increase in time to display people block' do
+    owner = fast_create(Environment)
+    owner.boxes<< Box.new
+    block = PeopleBlock.create!(:box => owner.boxes.first)
+
+    ActionView::Base.any_instance.stubs(:profile_image_link).returns('some name')
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    # no people
+    block.reload
+    time0 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # first 500
+    1.upto(50).map do
+      fast_create(Person, :environment_id => owner.id)
+    end
+    block.reload
+    time1 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # another 50
+    1.upto(50).map do
+      fast_create(Person, :environment_id => owner.id)
+    end
+    block.reload
+    time2 = (Benchmark.measure { 10.times { render_block_content(block) } })
+
+    # should not scale linearly, i.e. the inclination of the first segment must
+    # be a lot higher than the one of the segment segment. To compensate for
+    # small variations due to hardware and/or execution environment, we are
+    # satisfied if the the inclination of the first segment is at least twice
+    # the inclination of the second segment.
+    a1 = (time1.total - time0.total)/50.0
+    a2 = (time2.total - time1.total)/50.0
+    assert a1 > a2*FACTOR, "#{a1} should be larger than #{a2} by at least a factor of #{FACTOR}"
+  end
+
 end
@@ -3,9 +3,9 @@
 <%= block_title(block.view_title) %>
 <div>
-  <% unless block.profiles.count == 0 %>
+  <% unless block.profile_count == 0 %>
     <ul>
-      <%= profiles_images_list(block.profiles) %>
+      <%= profiles_images_list(block.profile_list) %>
       <% unless block.name.blank? || block.address.blank? %>
         <div class="common-profile-list-block">
	@@ -11,6 +11,22 @@		@@ -11,6 +11,22 @@
11	Noosfero version and/or the maintainance work of an existing Noosfero stable	11	Noosfero version and/or the maintainance work of an existing Noosfero stable
12	branch. See MAINTAINANCE.md for details on the maintaince policy.	12	branch. See MAINTAINANCE.md for details on the maintaince policy.
13		13
		14	+## Current Commiters
		15	+
		16	+* Antonio Terceiro (@terceiro)
		17	+* Bráulio Bhavamitra (@brauliobo)
		18	+* Daniela Feitosa (@danielafeitosa)
		19	+* Joenio Costa (@joenio)
		20	+* Larissa Reis (@larissa)
		21	+* Leandro Nunes (@leandronunes)
		22	+* Marcos Ronaldo (@marcosronaldo)
		23	+* Rodrigo Souto (@diguliu)
		24	+* Victor Costa (@vfcosta)
		25	+
		26	+## Current Release Manager
		27	+
		28	+* Rodrigo Souto (@diguliu)
		29	+
14	## Development process	30	## Development process
15		31
16	* Every new feature or non-trivial bugfix should be reviewed by at least one	32	* Every new feature or non-trivial bugfix should be reviewed by at least one
	@@ -88,7 +88,7 @@ module BoxesHelper		@@ -88,7 +88,7 @@ module BoxesHelper
88	end	88	end
89		89
90	def render_block block, prefix = nil, klass = block.class	90	def render_block block, prefix = nil, klass = block.class
91	- template_name = klass.name.underscore.sub '_block', ''	91	+ template_name = klass.name.demodulize.underscore.sub '_block', ''
92	begin	92	begin
93	render template: "blocks/#{prefix}#{template_name}", locals: { block: block }	93	render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
94	rescue ActionView::MissingTemplate	94	rescue ActionView::MissingTemplate
	@@ -5,7 +5,7 @@ class Thumbnail < ActiveRecord::Base		@@ -5,7 +5,7 @@ class Thumbnail < ActiveRecord::Base
5	attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id	5	attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id
6		6
7	has_attachment :storage => :file_system,	7	has_attachment :storage => :file_system,
8	- :content_type => :image, :max_size => 5.megabytes, processor: 'Rmagick'	8	+ :content_type => :image, :max_size => UploadedFile.max_size, processor: 'Rmagick'
9	validates_as_attachment	9	validates_as_attachment
10		10
11	sanitize_filename	11	sanitize_filename
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class GenerateMissedThumbnails < ActiveRecord::Migration
	2	+ def up
	3	+ UploadedFile.find_each {\|f\| f.create_thumbnails if f.thumbnails.empty? }
	4	+ end
	5	+end
	@@ -233,7 +233,7 @@ class Noosfero::Plugin		@@ -233,7 +233,7 @@ class Noosfero::Plugin
233	type = type.map do \|x\|	233	type = type.map do \|x\|
234	x.is_a?(String) ? x.capitalize.constantize : x	234	x.is_a?(String) ? x.capitalize.constantize : x
235	end	235	end
236	- raise "This is not a valid type" if !type.empty? && ![Person, Community, Enterprise, Environment].detect{\|m\| type.include?(m)}	236	+ raise "This is not a valid type" if !type.empty? && (type.any?{\|t\| !(t < Profile) && t != Environment })
237		237
238	position = options[:position]	238	position = options[:position]
239	position = position.is_a?(Array) ? position : [position].compact	239	position = position.is_a?(Array) ? position : [position].compact
	@@ -7,13 +7,4 @@ class CommunityBlock < Block		@@ -7,13 +7,4 @@ class CommunityBlock < Block
7	def help	7	def help
8	_("Help for Community Description Block.")	8	_("Help for Community Description Block.")
9	end	9	end
10	-
11	- def content(arg={})
12	- block = self
13	-
14	- proc do
15	- render :file => 'community_block', :locals => { :block => block }
16	- end
17	- end
18	-
19	end	10	end
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-require_relative '../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(c_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
	15	+ end
	16	+
	17	+ links.push(c_('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(c_('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,'',#{CGI::escapeHTML(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, :class => 'join-community') %>
	36	+ <% else %>
	37	+ <%= link_to(
	38	+ content_tag('span', '', :class => 'community-block-button icon-add'),
	39	+ profile.join_url, :class => 'join-community') %>
	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>
	@@ -1,52 +0,0 @@	@@ -1,52 +0,0 @@
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(c_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
15	- end
16	-
17	- links.push(c_('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(c_('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,'',#{CGI::escapeHTML(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, :class => 'join-community') %>
36	- <% else %>
37	- <%= link_to(
38	- content_tag('span', '', :class => 'community-block-button icon-add'),
39	- profile.join_url, :class => 'join-community') %>
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>
	@@ -66,13 +66,6 @@ class ContainerBlockPlugin::ContainerBlock < Block		@@ -66,13 +66,6 @@ class ContainerBlockPlugin::ContainerBlock < Block
66	children_settings[child_id][:width] if children_settings[child_id]	66	children_settings[child_id][:width] if children_settings[child_id]
67	end	67	end
68		68
69	- def content(args={})
70	- block = self
71	- proc do
72	- render :file => 'blocks/container', :locals => {:block => block}
73	- end
74	- end
75	-
76	def copy_from_with_container(block)	69	def copy_from_with_container(block)
77	copy_from_without_container(block)	70	copy_from_without_container(block)
78	children_settings = block.children_settings	71	children_settings = block.children_settings