Better defaults

(ActionItem1680)

Better defaults
(ActionItem1680)
Antonio Terceiro
1 parent ee15e749
Showing 25 changed files with 168 additions and 184 deletions Show diff stats
app/models/enterprise.rb
app/models/environment.rb
app/models/link_list_block.rb
app/models/organization.rb
app/models/person.rb
app/models/profile.rb
features/blog.feature
features/delete_profile.feature
features/edit_article.feature
features/edit_blog_archives_block.feature
features/events.feature
features/login.feature
features/publish_article.feature
features/search.feature
features/step_definitions/noosfero_steps.rb
public/designs/themes/base/footer.rhtml
public/designs/themes/base/style.css
public/images/noosfero-network.png
script/sample-data
test/functional/content_viewer_controller_test.rb
@@ -122,17 +122,28 @@ class Enterprise &lt; Organization
   end
  
   def default_set_of_blocks
+    links = [
+      {:name => _("Enterprises's profile"), :address => '/profile/{profile}', :icon => 'ok'},
+      {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
+      {:name => _('Products'), :address => '/catalog/{profile}', :icon => 'new'},
+    ]
     blocks = [
-      [MainBlock],
-      [ProfileInfoBlock, MembersBlock],
-      [RecentDocumentsBlock]
+      [MainBlock.new],
+      [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
+      []
     ]
     if !environment.enabled?('disable_products_for_enterprises')
-      blocks[2].unshift ProductsBlock
+      blocks[2].unshift ProductsBlock.new
     end
     blocks
   end
  
+  def default_set_of_articles
+    [
+      Blog.new(:name => _('Blog')),
+    ]
+  end
+
   before_create do |enterprise|
     if enterprise.environment.enabled?('enterprises_are_disabled_when_created')
       enterprise.enabled = false
@@ -154,10 +165,4 @@ class Enterprise &lt; Organization
     enable_contact_us
   end
  
-  protected
-
-  def default_homepage(attrs)
-    EnterpriseHomepage.new(attrs)
-  end
-
 end
@@ -45,9 +45,7 @@ class Environment &lt; ActiveRecord::Base
       :name => N_('Member'),
       :environment => self,
       :permissions => [
-        'edit_profile',
-        'post_content',
-        'manage_products'
+        'invite_members',
       ]
     )
     # moderators for enterprises, communities etc
@@ -209,7 +207,7 @@ class Environment &lt; ActiveRecord::Base
   settings_items :location, :type => String
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
-  settings_items :description, :type => String
+  settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
   settings_items :category_types, :type => Array, :default => ['Category']
   settings_items :enable_ssl
   settings_items :local_docs, :type => Array, :default => []
@@ -261,6 +259,24 @@ class Environment &lt; ActiveRecord::Base
     features.delete_if{ |k, v| !self.enabled?(k) }
   end
  
+  before_create :enable_default_features
+  def enable_default_features
+    %w(
+      disable_asset_products
+      disable_gender_icon
+      disable_products_for_enterprises
+      disable_select_city_for_contact
+      enterprise_registration
+      media_panel
+      organizations_are_moderated_by_default
+      show_balloon_with_profile_links_when_clicked
+      use_portal_community
+      wysiwyg_editor_for_environment_home
+    ).each do |feature|
+      enable(feature)
+    end
+  end
+
   # returns <tt>true</tt> if this Environment has terms of use to be
   # accepted by users before registration.
   def has_terms_of_use?
@@ -52,7 +52,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :class => klass)
+      link_to(_(link[:name]), expand_address(link[:address]), :class => klass)
     )
   end
  
@@ -99,10 +99,24 @@ class Organization &lt; Profile
   end
  
   def default_set_of_blocks
+    links = [
+      {:name => _("Community's profile"), :address => '/profile/{profile}', :icon => 'ok'},
+      {:name => _('Invite Friends'), :address => '/profile/{profile}/invite/friends', :icon => 'send'},
+      {:name => _('Agenda'), :address => '/profile/{profile}/events', :icon => 'menu-events'},
+      {:name => _('Image gallery'), :address => '/{profile}/gallery', :icon => 'photos'},
+      {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
+    ]
+    [
+      [MainBlock.new],
+      [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
+      [MembersBlock.new, RecentDocumentsBlock.new]
+    ]
+  end
+
+  def default_set_of_articles
     [
-      [MainBlock],
-      [ProfileInfoBlock, RecentDocumentsBlock],
-      [MembersBlock, TagsBlock]
+      Blog.new(:name => _('Blog')),
+      Folder.new(:name => _('Gallery'), :view_as => 'image_gallery'),
     ]
   end
  
@@ -203,10 +203,23 @@ class Person &lt; Profile
   end
  
   def default_set_of_blocks
+    links = [
+      {:name => _('Profile'), :address => '/profile/{profile}', :icon => 'menu-people'},
+      {:name => _('Image gallery'), :address => '/{profile}/gallery', :icon => 'photos'},
+      {:name => _('Agenda'), :address => '/profile/{profile}/events', :icon => 'menu-events'},
+      {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
+    ]
+    [
+      [MainBlock.new],
+      [ProfileImageBlock.new, LinkListBlock.new(:links => links), RecentDocumentsBlock.new],
+      [FriendsBlock.new, CommunitiesBlock.new]
+    ]
+  end
+
+  def default_set_of_articles
     [
-      [MainBlock],
-      [ProfileInfoBlock, RecentDocumentsBlock, TagsBlock],
-      [FriendsBlock, EnterprisesBlock, CommunitiesBlock]
+      Blog.new(:name => _('Blog')),
+      Folder.new(:name => _('Gallery'), :view_as => 'image_gallery'),
     ]
   end
  
@@ -293,7 +293,7 @@ class Profile &lt; ActiveRecord::Base
       if self.respond_to?(:default_set_of_blocks)
         default_set_of_blocks.each_with_index do |blocks,i|
           blocks.each do |block|
-            self.boxes[i].blocks << block.new
+            self.boxes[i].blocks << block
           end
         end
       end
@@ -507,25 +507,32 @@ private :generate_url, :url_options
     if template 
       copy_articles_from template
     else
-      # a default homepage
-      hp = default_homepage(:name => _("My home page"), :body => _("<p>This is a default homepage created for me. It can be changed though the control panel.</p>"), :advertise => false)
-      hp.profile = self
-      hp.save!
-      self.home_page = hp
-
-      # a default rss feed
-      feed = RssFeed.new(:name => 'feed')
-      self.articles << feed
-
-      # a default private folder if public
-      if self.public?
-       folder = Folder.new(:name => _("Intranet"), :published => false)
-       self.articles << folder
+      default_set_of_articles.each do |article|
+        article.profile = self
+        article.advertise = false
+        article.save!
       end
     end
     self.save!
   end
  
+  # Override this method in subclasses of Profile to create a default article
+  # set upon creation. Note that this method will be called *only* if there is
+  # no template for the type of profile (i.e. if the template was removed or in
+  # the creation of the template itself).
+  #
+  # This method must return an array of pre-populated articles, which will be
+  # associated to the profile before being saved. Example:
+  #
+  #   def default_set_of_articles
+  #     [Blog.new(:name => 'Blog'), Folder.new(:name => 'Gallery', :view_as => 'image_gallery')]
+  #   end
+  #
+  # By default, this method returns an empty array.
+  def default_set_of_articles
+    []
+  end
+
   def copy_articles_from other
     other.top_level_articles.each do |a|
       copy_article_tree a
@@ -610,10 +617,6 @@ private :generate_url, :url_options
     !forbidden.include?(cat.class)
   end
  
-  def default_homepage(attrs)
-    TinyMceArticle.new(attrs)
-  end
-
   include ActionView::Helpers::TextHelper
   def short_name(chars = 15)
     if self[:nickname].blank?
@@ -7,6 +7,7 @@ Feature: blog
     And the following users
       | login | name |
       | joaosilva | Joao Silva |
+    And "joaosilva" has no articles
     And I am logged in as "joaosilva"
  
   Scenario: create a blog
@@ -34,7 +34,7 @@ Feature: delete profile
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
     When I follow "No, I gave up"
-    Then I should be on Joao Silva's homepage
+    Then I should be on Joao Silva's profile
  
   Scenario: community admin can see link to delete profile
     Given the following community
@@ -123,8 +123,9 @@ Feature: edit article
     And I should be on "Save the whales" edit page
  
   Scenario: save and continue when creating a new article
-    Given I am on /joaosilva
-    When I follow "New article"
+    Given I am on Joao Silva's control panel
+    When I follow "Manage Content"
+    And I follow "New article"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "My new article"
     And I fill in "Text" with "text for the new article"
@@ -7,6 +7,7 @@ Feature: edit_blog_archives_block
     And the following users
       | login | name |
       | joaosilva | Joao Silva |
+    And "joaosilva" has no articles
     And the following blogs
       | owner     | name     |
       | joaosilva | Blog One |
@@ -143,6 +143,9 @@ Feature: events
     Then I should see "YAPC::Brasil 2010"
  
   Scenario: provide button to go back to profile homepage
+    Given the following articles
+      | owner     | name        | homepage |
+      | josesilva | my homepage | true     |
     Given I am on /profile/josesilva/events
     When I follow "Back to josesilva"
     Then I should be on josesilva's homepage
@@ -22,6 +22,9 @@ Feature: login
     And the following users
       | login | name |
       | mariasilva | Maria Silva |
+    And the following articles
+      | owner      | name         | homepage |
+      | mariasilva | my home page | true |
     And I go to Maria Silva's homepage
     And I follow "Login"
     And I fill in the following:
@@ -25,8 +25,6 @@ Feature: publish article
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I am on Sample Community's homepage
-    And I follow "View profile"
     And I go to Sample Community's sitemap
     When I follow "Sample Article"
     Then I should see "This is the first published article"
@@ -40,8 +38,6 @@ Feature: publish article
     And I check "Sample Community"
     And I fill in "Title" with "Another name"
     And I press "Spread this"
-    And I am on Sample Community's homepage
-    And I follow "View profile"
     When I go to Sample Community's sitemap
     Then I should see "Another name"
     And I should not see "Sample Article"
@@ -94,12 +90,8 @@ Feature: publish article
     And I check "Another Community2"
     When I press "Spread this"
     Then I should see "The title (article name) is already being used by another article, please use another title."
-    And I am on Another Community1's homepage
-    And I follow "View profile"
     When I go to Another Community1's sitemap
     Then I should see "Sample Article"
-    And I am on Another Community2's homepage
-    And I follow "View profile"
     When I go to Another Community2's sitemap
     Then I should see "Sample Article"
  
@@ -28,13 +28,13 @@ Feature: search
   Scenario: simple search for enterprise
     Given the following enterprises
       | identifier | name |
-      | products-factory | Products factory |
-      | services-provider | Services Provider |
+      | shop1 | Shoes shop |
+      | shop2 | Fruits shop |
     And I go to the search page
-    And I fill in "query" with "services"
+    And I fill in "query" with "shoes"
     And I press "Search"
-    Then I should see "Services Provider"
-    And I should not see "Products factory"
+    Then I should see "Shoes shop"
+    And I should not see "Fruits shop"
  
   Scenario: simple search for content
     Given the following users
@@ -51,7 +51,12 @@ Given /^the following (articles|events|blogs|folders)$/ do |content, table|
   table.hashes.map{|item| item.dup}.each do |item|
     owner_identifier = item.delete("owner")
     owner = Profile[owner_identifier]
-    klass.create!(item.merge(:profile => owner))
+    home = item.delete("homepage")
+    result = klass.create!(item.merge(:profile => owner))
+    if home
+      owner.home_page = result
+      owner.save!
+    end
   end
 end
  
@@ -2,10 +2,6 @@
   <a id="link-to-doc" class='icon-help'><%= link_to _('Manual'), '/doc' %></a>
 </div><!-- end id="footer-links" -->
 <div id="copyright">
-  <p id='noosfero-license'>
-  Powered by <a
-    href="http://www.noosfero.org/" id='link-noosfero'>Noosfero</a>, licensed under
-    <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public
-      License</a>, version 3 or above.  </p>
+  <p><%= _('This social network uses Noosfero, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>
 </div><!-- end id="copyright" -->
 <%= language_chooser %>
@@ -363,6 +363,7 @@ body, th, td, input {
   padding: 0px;
   font-size: 11px;
   color: #555;
+  margin-bottom: 20px;
 }
  
 #theme-footer a {
@@ -9,19 +9,7 @@ environment = nil
 if environment_id
   environment = Environment.find(environment_id)
 else
-  DEFAULT_ENVIRONMENT_TEXT = <<EOF
-  <h1>Environment homepage</h1>
-  <p>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec quis diam enim, et ultricies lacus. Pellentesque sit amet velit non ante bibendum consectetur. Etiam at aliquet mauris. Pellentesque volutpat pellentesque dolor, at cursus lacus suscipit varius. Nunc at lectus tortor, eu dapibus urna. Ut at odio sem, sed laoreet augue. Nunc vestibulum, lectus id tempor vulputate, turpis nisl placerat justo, non placerat est lectus a risus. Nullam elementum convallis lectus, eget volutpat sapien malesuada quis. Fusce aliquet elementum placerat. Donec dolor mauris, accumsan eu gravida sed, mollis a metus. Quisque dictum felis vel diam ornare dapibus. Cras vel est velit. Fusce in tincidunt urna. Proin tincidunt pellentesque turpis, nec blandit nulla volutpat at. Suspendisse potenti.
-  </p>
-  <p>
-  Nunc pellentesque sem in ante lacinia egestas nec et dolor. Fusce enim leo, condimentum nec iaculis in, convallis eget diam. Integer ultricies massa eu augue tristique eu semper lorem aliquam. Praesent nibh lorem, eleifend nec laoreet ac, tempus et augue. Phasellus pulvinar nibh eget magna pellentesque ultricies. Donec varius, sapien in fermentum pellentesque, odio risus viverra lectus, sed tincidunt arcu elit id ipsum. Nunc aliquet lobortis sem, vitae dapibus velit bibendum id. Vivamus nec augue arcu, sed adipiscing quam. Maecenas at porta odio. Ut felis arcu, commodo in vestibulum a, convallis et justo. Nulla feugiat odio in dui mollis a pretium orci porta. Morbi at nisl sem, non tempus dui.
-  </p>
-  <p>
-  Maecenas neque ante, bibendum sed mollis ac, aliquet eu dolor. Fusce quis enim mi, vestibulum laoreet purus. Curabitur vel odio non mi tempus commodo. Duis suscipit justo sit amet felis volutpat scelerisque. Integer in mi vulputate lacus porttitor posuere id sed sapien. Nam aliquam molestie est a eleifend. Integer at velit nec felis sodales ornare. Etiam magna elit, facilisis at consectetur nec, commodo sit amet sapien. Maecenas fermentum leo vitae turpis viverra auctor. Phasellus facilisis ipsum quis felis semper et condimentum augue porttitor. Morbi vitae mauris risus. Nunc lobortis quam eu tellus tempus ut tristique odio luctus. Fusce justo purus, tincidunt eu tristique et, pharetra non tortor. Cras malesuada accumsan venenatis. Donec ornare iaculis porttitor. Praesent vestibulum metus fermentum risus interdum gravida. Vivamus placerat commodo nunc vitae aliquet. Fusce sit amet libero facilisis ante dictum hendrerit ac sed massa. 
-  </p>
-EOF
-  environment = Environment.create!(:name => 'Noosfero', :is_default => true, :description => DEFAULT_ENVIRONMENT_TEXT) unless (Environment.default)
+  environment = Environment.default || Environment.create!(:name => 'Noosfero', :is_default => true)
 end
  
 system('./script/sample-profiles')
@@ -344,30 +344,6 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_response :success
   end
  
-  should 'show message for disabled enterprises' do
-    login_as(@profile.identifier)
-    ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
-    get :view_page, :profile => ent.identifier, :page => []
-    assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
-  end
-
-  should 'not show message for disabled enterprise to non-enterprises' do
-    login_as(@profile.identifier)
-    @profile.enabled = false; @profile.save!
-    get :view_page, :profile => @profile.identifier, :page => []
-    assert_no_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
-  end
-
-  should 'not show message for disabled enterprise if there is a block for it' do
-    login_as(@profile.identifier)
-    ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
-    ent.boxes << Box.new
-    ent.boxes[0].blocks << DisabledEnterpriseMessageBlock.new
-    ent.save
-    get :view_page, :profile => ent.identifier, :page => []
-    assert_no_tag :tag => 'div', :attributes => {:id => 'article'}, :descendant => { :tag => 'div', :attributes => { :id => 'profile-disabled' }}
-  end
-
   should 'load the correct profile when using hosted domain' do
     profile = create_user('mytestuser').person
     profile.domains << Domain.create!(:name => 'micojones.net')
@@ -155,7 +155,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
  
   should 'create published article after finish approve article task' do
     PublishedArticle.destroy_all
-    c = Community.create!(:name => 'test comm', :moderated_articles => false)
+    c = fast_create(Community)
+    c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
@@ -167,7 +168,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
  
   should 'create published article in folder after finish approve article task' do
     PublishedArticle.destroy_all
-    c = Community.create!(:name => 'test comm', :moderated_articles => false)
+    c = fast_create(Community)
+    c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     folder = c.articles.create!(:name => 'test folder', :type => 'Folder')
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
@@ -180,7 +182,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
  
   should 'be highlighted if asked when approving a published article' do
     PublishedArticle.destroy_all
-    c = Community.create!(:name => 'test comm', :moderated_articles => false)
+    c = fast_create(Community)
+    c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     folder = c.articles.create!(:name => 'test folder', :type => 'Folder')
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
@@ -193,7 +196,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
  
   should 'create published article after choosing root folder on approve article task' do
     PublishedArticle.destroy_all
-    c = Community.create!(:name => 'test comm', :moderated_articles => false)
+    c = fast_create(Community)
+    c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
@@ -204,7 +208,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
   end
  
   should 'handle blank names for published articles' do
-    c = Community.create!(:name => 'test comm')
+    c = fast_create(Community)
     @controller.stubs(:profile).returns(c)
     c.affiliate(profile, Profile::Roles.all_roles(c.environment))
     person = create_user('test_user').person
@@ -27,22 +27,17 @@ class CommunityTest &lt; Test::Unit::TestCase
   should 'create default set of blocks' do
     c = Community.create!(:environment => Environment.default, :name => 'my new community')
  
-    assert c.boxes[0].blocks.map(&:class).include?(MainBlock)
-
-    assert c.boxes[1].blocks.map(&:class).include?(ProfileInfoBlock)
-    assert c.boxes[1].blocks.map(&:class).include?(RecentDocumentsBlock)
-
-    assert c.boxes[2].blocks.map(&:class).include?(MembersBlock)
-    assert c.boxes[2].blocks.map(&:class).include?(TagsBlock)
-
-    assert_equal 5,  c.blocks.size
+    assert !c.boxes[0].blocks.empty?, 'person must have blocks in area 1'
+    assert !c.boxes[1].blocks.empty?, 'person must have blocks in area 2'
+    assert !c.boxes[2].blocks.empty?, 'person must have blocks in area 3'
   end
  
-  should 'get a default home page and RSS feed' do
+  should 'create a default set of articles' do
+    Community.any_instance.stubs(:default_set_of_articles).returns([Blog.new(:name => 'blog')])
     community = Community.create!(:environment => Environment.default, :name => 'my new community')
  
-    assert_kind_of Article, community.home_page
-    assert_kind_of RssFeed, community.articles.find_by_path('feed')
+    assert_kind_of Blog, community.articles.find_by_path('blog')
+    assert_kind_of RssFeed, community.articles.find_by_path('blog/feed')
   end
  
   should 'have contact_person' do
@@ -59,25 +59,20 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     end
   end
  
-  should 'get a default homepage and RSS feed' do
+  should 'create a default set of articles' do
+    Enterprise.any_instance.expects(:default_set_of_articles).returns([Blog.new(:name => 'Blog')])
     enterprise = Enterprise.create!(:name => 'my test enterprise', :identifier => 'myenterprise')
  
-    assert_kind_of Article, enterprise.home_page
-    assert_kind_of RssFeed, enterprise.articles.find_by_path('feed')
+    assert_kind_of Blog, enterprise.articles.find_by_path('blog')
+    assert_kind_of RssFeed, enterprise.articles.find_by_path('blog/feed')
   end
  
   should 'create default set of blocks' do
     e = Enterprise.create(:name => 'my new community', :identifier => 'mynewcommunity')
  
-    assert e.boxes[0].blocks.map(&:class).include?(MainBlock), 'enterprise must have a MainBlock upon creation'
-
-    assert e.boxes[1].blocks.map(&:class).include?(ProfileInfoBlock), 'enterprise must have a ProfileInfoBlock upon creation'
-    assert e.boxes[1].blocks.map(&:class).include?(MembersBlock), 'enterprise must have a MembersBlock upon creation'
-
-    assert e.boxes[2].blocks.map(&:class).include?(RecentDocumentsBlock), 'enterprise must have a RecentDocumentsBlock upon creation'
-    assert e.boxes[2].blocks.map(&:class).include?(ProductsBlock), 'enterprise must have a ProductsBlock upon creation'
-
-    assert_equal 5,  e.blocks.size
+    assert !e.boxes[0].blocks.empty?, 'person must have blocks in area 1'
+    assert !e.boxes[1].blocks.empty?, 'person must have blocks in area 2'
+    assert !e.boxes[2].blocks.empty?, 'person must have blocks in area 3'
   end
  
   should 'be found in search for its product categories' do
@@ -252,11 +247,6 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     assert_equal [p.category_full_name], ent.product_categories
   end
  
-  should 'default home page is a EnterpriseHomepage' do
-    enterprise = Enterprise.create!(:name => 'my test enterprise', :identifier => 'myenterprise')
-    assert_kind_of EnterpriseHomepage, enterprise.home_page
-  end
-
   should 'not create a products block for enterprise if environment do not let' do
     env = Environment.default
     env.enable('disable_products_for_enterprises')
@@ -173,27 +173,29 @@ class PersonTest &lt; Test::Unit::TestCase
     assert !person.is_admin?(env2)
   end
  
-  should 'get a default home page and a RSS feed' do
+  should 'create a default set of articles' do
+    Person.any_instance.stubs(:default_set_of_articles).returns([Blog.new(:name => 'blog')])
     person = create_user_full('mytestuser').person
  
-    assert_kind_of Article, person.home_page
-    assert_kind_of RssFeed, person.articles.find_by_path('feed')
+    assert_kind_of Blog, person.articles.find_by_path('blog')
+    assert_kind_of RssFeed, person.articles.find_by_path('blog/feed')
   end
  
-  should 'create default set of blocks' do
+  should 'create a default set of blocks' do
     p = create_user_full('testingblocks').person
  
-    assert p.boxes[0].blocks.map(&:class).include?(MainBlock), 'person must have a MainBlock upon creation'
-
-    assert p.boxes[1].blocks.map(&:class).include?(ProfileInfoBlock), 'person must have a ProfileInfoBlock upon creation'
-    assert p.boxes[1].blocks.map(&:class).include?(RecentDocumentsBlock), 'person must have a RecentDocumentsBlock upon creation'
-    assert p.boxes[1].blocks.map(&:class).include?(TagsBlock), 'person must have a Tags Block upon creation'
-
-    assert p.boxes[2].blocks.map(&:class).include?(CommunitiesBlock), 'person must have a CommunitiesBlock upon creation'
-    assert p.boxes[2].blocks.map(&:class).include?(EnterprisesBlock), 'person must have a EnterprisesBlock upon creation'
-    assert p.boxes[2].blocks.map(&:class).include?(FriendsBlock), 'person must have a FriendsBlock upon creation'
+    assert !p.boxes[0].blocks.empty?, 'person must have blocks in area 1'
+    assert !p.boxes[1].blocks.empty?, 'person must have blocks in area 2'
+    assert !p.boxes[2].blocks.empty?, 'person must have blocks in area 3'
+  end
  
-    assert_equal 7,  p.blocks.size
+  should 'link to all articles created by default' do
+    p = create_user_full('testingblocks').person
+    blocks = p.blocks.select { |b| b.is_a?(LinkListBlock) }
+    p.articles.reject { |a| a.is_a?(RssFeed) }.each do |article|
+      path = '/' + p.identifier + '/' + article.path
+      assert blocks.any? { |b| b.links.any? { |link| b.expand_address(link[:address]) == path  }}, "#{path.inspect} must be linked by at least one of the blocks: #{blocks.inspect}"
+    end
   end
  
   should 'have friends' do
@@ -73,8 +73,8 @@ class ProfileTest &lt; Test::Unit::TestCase
   end
  
   should 'provide access to home page' do
-    profile = create(Profile)
-    assert_kind_of Article, profile.home_page
+    profile = Profile.new
+    assert_nil profile.home_page
   end
  
   def test_name_should_be_mandatory
@@ -335,13 +335,6 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal false, Profile.new.has_members?
   end
  
-  should 'create a homepage and a feed on creation' do
-    profile = create(Profile)
-
-    assert_kind_of Article, profile.home_page
-    assert_kind_of RssFeed, profile.articles.find_by_path('feed')
-  end
-
   should 'not allow to add members' do
     c = fast_create(Profile)
     p = create_user('mytestuser').person
@@ -429,26 +422,21 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal [p3,p2], Profile.recent(2)
   end
  
-  should 'advertise false to homepage and feed on creation' do
+  should 'not advertise articles created together with the profile' do
+    Profile.any_instance.stubs(:default_set_of_articles).returns([Article.new(:name => 'home'), RssFeed.new(:name => 'feed')])
     profile = create(Profile)
-    assert !profile.home_page.advertise?
+    assert !profile.articles.find_by_path('home').advertise?
     assert !profile.articles.find_by_path('feed').advertise?
   end
  
-  should 'advertise true to homepage after update' do
+  should 'advertise article after update' do
+    Profile.any_instance.stubs(:default_set_of_articles).returns([Article.new(:name => 'home')])
     profile = create(Profile)
-    assert !profile.home_page.advertise?
-    profile.home_page.name = 'Changed name'
-    assert profile.home_page.save!
-    assert profile.home_page.advertise?
-  end
-
-  should 'advertise true to feed after update' do
-    profile = create(Profile)
-    assert !profile.articles.find_by_path('feed').advertise?
-    profile.articles.find_by_path('feed').name = 'Changed name'
-    assert profile.articles.find_by_path('feed').save!
-    assert profile.articles.find_by_path('feed').advertise?
+    article = profile.articles.find_by_path('home')
+    assert !article.advertise?
+    article.name = 'Changed name'
+    article.save!
+    assert article.advertise?
   end
  
   should 'have latitude and longitude' do
@@ -774,11 +762,6 @@ class ProfileTest &lt; Test::Unit::TestCase
     end
   end
  
-  should 'default home page is a TinyMceArticle' do
-    profile = create(Profile)
-    assert_kind_of TinyMceArticle, profile.home_page
-  end
-
   should 'not add a category twice to profile' do
     c1 = fast_create(Category)
     c2 = fast_create(Category, :parent_id => c1.id)
@@ -923,14 +906,6 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert !p2.public?
   end
  
-  should 'create a initial private folder when a public profile is created' do
-    p1 = create(Profile)
-    p2 = create(Profile, :public_profile => false)
-
-    assert p1.articles.find(:first, :conditions => {:published => false})
-    assert !p2.articles.find(:first, :conditions => {:published => false})
-  end
-
   should 'remove member with many roles' do
     person = create_user('test_user').person
     community = fast_create(Community)
...	...	@@ -122,17 +122,28 @@ class Enterprise < Organization
122	122	end
123	123
124	124	def default_set_of_blocks
	125	+ links = [
	126	+ {:name => _("Enterprises's profile"), :address => '/profile/{profile}', :icon => 'ok'},
	127	+ {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
	128	+ {:name => _('Products'), :address => '/catalog/{profile}', :icon => 'new'},
	129	+ ]
125	130	blocks = [
126		- [MainBlock],
127		- [ProfileInfoBlock, MembersBlock],
128		- [RecentDocumentsBlock]
	131	+ [MainBlock.new],
	132	+ [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
	133	+ []
129	134	]
130	135	if !environment.enabled?('disable_products_for_enterprises')
131		- blocks[2].unshift ProductsBlock
	136	+ blocks[2].unshift ProductsBlock.new
132	137	end
133	138	blocks
134	139	end
135	140
	141	+ def default_set_of_articles
	142	+ [
	143	+ Blog.new(:name => _('Blog')),
	144	+ ]
	145	+ end
	146	+
136	147	before_create do \|enterprise\|
137	148	if enterprise.environment.enabled?('enterprises_are_disabled_when_created')
138	149	enterprise.enabled = false
...	...	@@ -154,10 +165,4 @@ class Enterprise < Organization
154	165	enable_contact_us
155	166	end
156	167
157		- protected
158		-
159		- def default_homepage(attrs)
160		- EnterpriseHomepage.new(attrs)
161		- end
162		-
163	168	end
...	...
...	...	@@ -45,9 +45,7 @@ class Environment < ActiveRecord::Base
45	45	:name => N_('Member'),
46	46	:environment => self,
47	47	:permissions => [
48		- 'edit_profile',
49		- 'post_content',
50		- 'manage_products'
	48	+ 'invite_members',
51	49	]
52	50	)
53	51	# moderators for enterprises, communities etc
...	...	@@ -209,7 +207,7 @@ class Environment < ActiveRecord::Base
209	207	settings_items :location, :type => String
210	208	settings_items :layout_template, :type => String, :default => 'default'
211	209	settings_items :homepage, :type => String
212		- settings_items :description, :type => String
	210	+ settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
213	211	settings_items :category_types, :type => Array, :default => ['Category']
214	212	settings_items :enable_ssl
215	213	settings_items :local_docs, :type => Array, :default => []
...	...	@@ -261,6 +259,24 @@ class Environment < ActiveRecord::Base
261	259	features.delete_if{ \|k, v\| !self.enabled?(k) }
262	260	end
263	261
	262	+ before_create :enable_default_features
	263	+ def enable_default_features
	264	+ %w(
	265	+ disable_asset_products
	266	+ disable_gender_icon
	267	+ disable_products_for_enterprises
	268	+ disable_select_city_for_contact
	269	+ enterprise_registration
	270	+ media_panel
	271	+ organizations_are_moderated_by_default
	272	+ show_balloon_with_profile_links_when_clicked
	273	+ use_portal_community
	274	+ wysiwyg_editor_for_environment_home
	275	+ ).each do \|feature\|
	276	+ enable(feature)
	277	+ end
	278	+ end
	279	+
264	280	# returns <tt>true</tt> if this Environment has terms of use to be
265	281	# accepted by users before registration.
266	282	def has_terms_of_use?
...	...
...	...	@@ -52,7 +52,7 @@ class LinkListBlock < Block
52	52	def link_html(link)
53	53	klass = 'icon-' + link[:icon] if link[:icon]
54	54	sanitize_link(
55		- link_to(link[:name], expand_address(link[:address]), :class => klass)
	55	+ link_to(_(link[:name]), expand_address(link[:address]), :class => klass)
56	56	)
57	57	end
58	58
...	...
...	...	@@ -99,10 +99,24 @@ class Organization < Profile
99	99	end
100	100
101	101	def default_set_of_blocks
	102	+ links = [
	103	+ {:name => _("Community's profile"), :address => '/profile/{profile}', :icon => 'ok'},
	104	+ {:name => _('Invite Friends'), :address => '/profile/{profile}/invite/friends', :icon => 'send'},
	105	+ {:name => _('Agenda'), :address => '/profile/{profile}/events', :icon => 'menu-events'},
	106	+ {:name => _('Image gallery'), :address => '/{profile}/gallery', :icon => 'photos'},
	107	+ {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
	108	+ ]
	109	+ [
	110	+ [MainBlock.new],
	111	+ [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
	112	+ [MembersBlock.new, RecentDocumentsBlock.new]
	113	+ ]
	114	+ end
	115	+
	116	+ def default_set_of_articles
102	117	[
103		- [MainBlock],
104		- [ProfileInfoBlock, RecentDocumentsBlock],
105		- [MembersBlock, TagsBlock]
	118	+ Blog.new(:name => _('Blog')),
	119	+ Folder.new(:name => _('Gallery'), :view_as => 'image_gallery'),
106	120	]
107	121	end
108	122
...	...
...	...	@@ -203,10 +203,23 @@ class Person < Profile
203	203	end
204	204
205	205	def default_set_of_blocks
	206	+ links = [
	207	+ {:name => _('Profile'), :address => '/profile/{profile}', :icon => 'menu-people'},
	208	+ {:name => _('Image gallery'), :address => '/{profile}/gallery', :icon => 'photos'},
	209	+ {:name => _('Agenda'), :address => '/profile/{profile}/events', :icon => 'menu-events'},
	210	+ {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
	211	+ ]
	212	+ [
	213	+ [MainBlock.new],
	214	+ [ProfileImageBlock.new, LinkListBlock.new(:links => links), RecentDocumentsBlock.new],
	215	+ [FriendsBlock.new, CommunitiesBlock.new]
	216	+ ]
	217	+ end
	218	+
	219	+ def default_set_of_articles
206	220	[
207		- [MainBlock],
208		- [ProfileInfoBlock, RecentDocumentsBlock, TagsBlock],
209		- [FriendsBlock, EnterprisesBlock, CommunitiesBlock]
	221	+ Blog.new(:name => _('Blog')),
	222	+ Folder.new(:name => _('Gallery'), :view_as => 'image_gallery'),
210	223	]
211	224	end
212	225
...	...
...	...	@@ -293,7 +293,7 @@ class Profile < ActiveRecord::Base
293	293	if self.respond_to?(:default_set_of_blocks)
294	294	default_set_of_blocks.each_with_index do \|blocks,i\|
295	295	blocks.each do \|block\|
296		- self.boxes[i].blocks << block.new
	296	+ self.boxes[i].blocks << block
297	297	end
298	298	end
299	299	end
...	...	@@ -507,25 +507,32 @@ private :generate_url, :url_options
507	507	if template
508	508	copy_articles_from template
509	509	else
510		- # a default homepage
511		- hp = default_homepage(:name => _("My home page"), :body => _("<p>This is a default homepage created for me. It can be changed though the control panel.</p>"), :advertise => false)
512		- hp.profile = self
513		- hp.save!
514		- self.home_page = hp
515		-
516		- # a default rss feed
517		- feed = RssFeed.new(:name => 'feed')
518		- self.articles << feed
519		-
520		- # a default private folder if public
521		- if self.public?
522		- folder = Folder.new(:name => _("Intranet"), :published => false)
523		- self.articles << folder
	510	+ default_set_of_articles.each do \|article\|
	511	+ article.profile = self
	512	+ article.advertise = false
	513	+ article.save!
524	514	end
525	515	end
526	516	self.save!
527	517	end
528	518
	519	+ # Override this method in subclasses of Profile to create a default article
	520	+ # set upon creation. Note that this method will be called only if there is
	521	+ # no template for the type of profile (i.e. if the template was removed or in
	522	+ # the creation of the template itself).
	523	+ #
	524	+ # This method must return an array of pre-populated articles, which will be
	525	+ # associated to the profile before being saved. Example:
	526	+ #
	527	+ # def default_set_of_articles
	528	+ # [Blog.new(:name => 'Blog'), Folder.new(:name => 'Gallery', :view_as => 'image_gallery')]
	529	+ # end
	530	+ #
	531	+ # By default, this method returns an empty array.
	532	+ def default_set_of_articles
	533	+ []
	534	+ end
	535	+
529	536	def copy_articles_from other
530	537	other.top_level_articles.each do \|a\|
531	538	copy_article_tree a
...	...	@@ -610,10 +617,6 @@ private :generate_url, :url_options
610	617	!forbidden.include?(cat.class)
611	618	end
612	619
613		- def default_homepage(attrs)
614		- TinyMceArticle.new(attrs)
615		- end
616		-
617	620	include ActionView::Helpers::TextHelper
618	621	def short_name(chars = 15)
619	622	if self[:nickname].blank?
...	...
...	...	@@ -7,6 +7,7 @@ Feature: blog
7	7	And the following users
8	8	\| login \| name \|
9	9	\| joaosilva \| Joao Silva \|
	10	+ And "joaosilva" has no articles
10	11	And I am logged in as "joaosilva"
11	12
12	13	Scenario: create a blog
...	...
...	...	@@ -34,7 +34,7 @@ Feature: delete profile
34	34	And I follow "Delete profile"
35	35	Then I should see "Are you sure you want to delete this profile?"
36	36	When I follow "No, I gave up"
37		- Then I should be on Joao Silva's homepage
	37	+ Then I should be on Joao Silva's profile
38	38
39	39	Scenario: community admin can see link to delete profile
40	40	Given the following community
...	...
...	...	@@ -123,8 +123,9 @@ Feature: edit article
123	123	And I should be on "Save the whales" edit page
124	124
125	125	Scenario: save and continue when creating a new article
126		- Given I am on /joaosilva
127		- When I follow "New article"
	126	+ Given I am on Joao Silva's control panel
	127	+ When I follow "Manage Content"
	128	+ And I follow "New article"
128	129	And I follow "Text article with visual editor"
129	130	And I fill in "Title" with "My new article"
130	131	And I fill in "Text" with "text for the new article"
...	...
...	...	@@ -7,6 +7,7 @@ Feature: edit_blog_archives_block
7	7	And the following users
8	8	\| login \| name \|
9	9	\| joaosilva \| Joao Silva \|
	10	+ And "joaosilva" has no articles
10	11	And the following blogs
11	12	\| owner \| name \|
12	13	\| joaosilva \| Blog One \|
...	...