Merge branch 'master' into search-improvements

Conflicts: public/stylesheets/application.css

Merge branch 'master' into search-improvements
Conflicts: public/stylesheets/application.css
Rodrigo Souto
2 parents c2b91bf8 7b118e80
Showing 47 changed files with 144 additions and 188 deletions Show diff stats
Gemfile.lock
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/models/forum.rb
app/models/input.rb
app/views/box_organizer/_link_list_block.html.erb
app/views/box_organizer/_link_list_item.html.erb
app/views/comment/_comment_form.html.erb
app/views/content_viewer/view_page.html.erb
app/views/invite/_dialog_wait_loading.html.erb
app/views/invite/select_friends.html.erb
app/views/manage_products/_add_input.html.erb
app/views/manage_products/_categories_for_selection.html.erb
app/views/manage_products/_certifiers_for_selection.html.erb
app/views/manage_products/_display_name.html.erb
app/views/manage_products/_edit_input.html.erb
app/views/manage_products/_form.html.erb
@@ -62,7 +62,7 @@ GEM
     database_cleaner (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (1.0.3)
+    eventmachine (0.12.11)
     fast_gettext (0.6.8)
     ffi (1.0.11)
     gherkin (2.4.21)
@@ -76,7 +76,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.4)
+    metaclass (0.0.1)
     mime-types (1.19)
     mocha (0.11.3)
       metaclass (~> 0.0.1)
@@ -232,7 +232,7 @@ class CmsController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
   end
   def publish
@@ -54,7 +54,7 @@ class ProfileEditorController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
   end
   def header_footer
@@ -33,6 +33,7 @@ class ContentViewerController &lt; ApplicationController
       process_forum_terms_of_use(user, params[:terms_accepted])
     elsif is_a_forum_topic?(@page)
       redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
+      return
     end
     # At this point the page will be showed
@@ -671,7 +671,7 @@ module ApplicationHelper
   def theme_javascript_ng
     script = File.join(theme_path, 'theme.js')
-    if File.exists?(Rails.root.join('public', script))
+    if File.join(Rails.root, 'public', script)
       javascript_include_tag script
     else
       nil
@@ -2,7 +2,7 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
-  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions
+  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link
   acts_as_having_image
@@ -3,7 +3,7 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
-  attr_accessible :has_terms_of_use, :terms_of_use
+  attr_accessible :has_terms_of_use, :terms_of_use, :allows_members_to_create_topics
   settings_items :terms_of_use, :type => :string, :default => ""
   settings_items :has_terms_of_use, :type => :boolean, :default => false
 class Input < ActiveRecord::Base
-  attr_accessible :product, :product_category
+  attr_accessible :product, :product_category, :product_category_id, :amount_used, :unit_id, :price_per_unit, :relevant_to_price
   belongs_to :product
   belongs_to :product_category
@@ -10,40 +10,15 @@
   </ul>
   <ul id="dropable-link-list">
     <% for link in @block.links do %>
-      <li>
-        <ul class="link-list-row">
-          <li>
-            <%= icon_selector(link['icon']) %>
-          </li>
-          <li>
-            <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
-          </li>
-          <li>
-            <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
-          </li>
-          <li>
-            <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
-          </li>
-          <li>
-            <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
-          </li>
-        </ul>
-      </li>
+      <%= render :partial => 'link_list_item', :locals => {:link => link} %>
     <% end %>
   </ul>
   <input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
+
+  <div id="new-template">
+    <% template_link = {'icon' => 'ok'} %>
+    <%= render :partial => 'link_list_item', :locals => {:link => template_link} %>
+  </div>
 </div>
-<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'dropable-link-list', content_tag('li',
-      content_tag('ul',
-        content_tag('li', icon_selector('ok')) +
-        content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
-        content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
-        content_tag('li', select_tag('block[links][][target]',
-        options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
-        content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
-      :class=>"link-list-row new_link_row")
-    ) +
-    javascript_tag("new_link_action()")
-end %>
+<%= link_to_function(_('New link'), 'add_new_link();', :class => 'button icon-add with-text') %>
@@ -0,0 +1,19 @@
+<li>
+  <ul class="link-list-row">
+    <li>
+      <%= icon_selector(link['icon']) %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
+    </li>
+    <li>
+      <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+    </li>
+    <li>
+      <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
+    </li>
+  </ul>
+</li>
@@ -46,14 +46,16 @@ function check_captcha(button, confirm_action) {
 }
 </script>
-<% if @comment && @comment.errors.any? %>
+<% @comment ||= Comment.new %>
+
+<% if @comment.errors.any? %>
   <%= error_messages_for :comment %>
 <% end %>
 <div class="post_comment_box <%= ((defined? show_form) && show_form) ? 'opened' : 'closed' %>">
   <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link && @comment.reply_of_id.blank? %>
-<%= remote_form_for(:comment, comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
+<%= remote_form_for(:comment, @comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  @comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
   <%= required_fields_message %>
@@ -79,7 +81,7 @@ function check_captcha(button, confirm_action) {
   <%= hidden_field_tag(:view, params[:view])%>
   <%= f.hidden_field(:reply_of_id) %>
-  <%= @plugins.dispatch(:comment_form_extra_contents, local_assigns).collect { |content| instance_exec(&content) }.join("") %>
+  <%= @plugins.dispatch(:comment_form_extra_contents, local_assigns.merge(:comment => @comment)).collect { |content| instance_exec(&content) }.join("") %>
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "if(check_captcha(this)) { save_comment(this) } else { check_captcha(this, save_comment)};return false;") %>
@@ -80,35 +80,25 @@
     </h3>
   <% end %>
-  <% if @page.accept_comments? && @comments.count > 1 %>
+  <% if @page.accept_comments? && @comments.present? && @comments.count > 1 %>
     <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
-    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %>
     <%= javascript_include_tag "comment_order.js" %>
     <div class="comment-order">
       <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
         <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
       <% end %>
     </div>
-  <% end %>
-  <% if @page.accept_comments? and @comments.count > 1 %>
-    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
-    <%= javascript_include_tag "comment_order.js" %>
-    <div class="comment-order">
-      <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
-        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
-      <% end %>
-    </div>
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comments %>
+      <%= pagination_links @comments, :param_name => 'comment_page' %>
+    </ul>
   <% end %>
-  <ul class="article-comments-list">
-    <%= render :partial => 'comment/comment', :collection => @comments %>
-    <%= pagination_links @comments, :param_name => 'comment_page' %>
-  </ul>
-
   <% if @page.accept_comments? %>
-    <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:comment => Comment.new, :url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
+    <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
   <% end %>
 </div><!-- end class="comments" -->
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery(function($) {
     $("#loading-dialog").dialog({
       height: 160,
@@ -32,9 +32,7 @@
   <br/>
-  <%= link_to_function(_('Personalize invitation mail'), nil) do |page|
-    page['invitation-mail_template'].show
-  end %>
+  <%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
   <div id='invitation-mail_template' style='display:none'>
     <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
 <div id='request_result_message' style='display: none'></div>
-<%= form_for(@input,
+<%= form_for(:input,
            :url => {:action => 'add_input', :id => @product},
            :html => {:method => 'post', :id => 'input-category-form'}
            ) do |f| %>
 <%= select_for_categories(categories, level) %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
   $('selected_category_id').value = <%= @category && @category.id %>
   $('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')
 <%= select_certifiers(@qualifier) + remove_qualifier_button %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery('#product-qualifiers-list *').removeClass('small-loading')
 <% end %>
@@ -2,7 +2,7 @@
   <h2><%= @product.name_with_unit %></h2>
   <%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
 </div>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $$('#display-product-category .hierarchy-category')[0].update('<%=
     escape_javascript(hierarchy_category_navigation(
       @product.product_category,
-<%= form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
+<%= form_for(:input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
             :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
   <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
 <%= error_messages_for :product %> <br/>
-<%= form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
+<%= form_for :product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
   <%= required_fields_message %>
   <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   var value = <%= @product.price_description_percentage %>;
   var total_cost = <%= @product.total_production_cost %>;
   var price = '<%= @product.formatted_value(:price) %>';
@@ -25,6 +25,6 @@
 <% end %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
 <% end %>
-<%= form_for @abuse_report, :url => {:action => 'register_report'},
+<%= form_for :abuse_report, :url => {:action => 'register_report'},
                            :html => {:onsubmit => "return send_request(this)", :id => 'report-abuse-form'} do |f| %>
   <%= labelled_form_field('* ' + _('Report reasons'), f.text_area(:reason, :rows => 6, :cols => 60, :class => 'required')) %>
   <%= hidden_field_tag(:content_type, params[:content_type]) %>
@@ -5,7 +5,7 @@
     <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
       <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
       <% if image.width && image.height %>
-        <% javascript_tag do %>
+        <%= javascript_tag do %>
           image = jQuery('script').last().parent().find('.search-image-pic');
           des_width = parseInt(image.css('width'));
           des_height = parseInt(image.css('height'));
@@ -4,7 +4,7 @@
 <div style="clear: both"></div>
 <% if @asset == :product %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery('.search-product-price-details').altBeautify();
   <% end %>
 <% end %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   close_loading()
   jQuery('#errorExplanation h2').hide()
   jQuery('#errorExplanation p').hide()
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery(".numbers-only").keypress(function(event) {
     var separator = "<%= environment.currency_separator %>"
     return numbersonly(event, separator)
-<% javascript_tag do %>
+<%= javascript_tag do %>
   update_loading('<%= _('redirecting...') %>')
   redirect_to('<%= url %>')
 <% end %>
 <%
   content = render :partial => 'shared/select_categories',
-      :locals => {:object_name => 'article', :multiple => true}, :layout => false
+      :locals => {:object_name => object_name, :multiple => true}, :layout => false
 %>
 jQuery('#select-categories').html('<%= j(content) %>');
@@ -97,41 +97,3 @@ Feature: comment
     Given I am on /booking/article-to-comment
     And I follow "Post a comment"
     Then "Post a comment" should not be visible within "#article"
-
-  @selenium
-  Scenario: the newest post from a forum should be displayed first.
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And the following forums
-       | owner     | name  |
-       | joaosilva | Forum |
-    And the following articles
-       | owner     | name     | parent |
-       | joaosilva | Post one | Forum  |
-    And the following comments
-       | article  | author    | title  | body   |
-       | Post one | joaosilva | Hi all | Hi all |
-       | Post one | joaosilva | Hello  | Hello  |
-   When I go to /joaosilva/forum/post-one
-   And I select "Newest first" from "comment_order" within ".comment-order"
-   Then I should see "Hello" within ".article-comment"
-
-  @selenium
-  Scenario: the oldest post from a forum should be displayed first.
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And the following forums
-       | owner     | name  |
-       | joaosilva | Forum |
-    And the following articles
-       | owner     | name     | parent |
-       | joaosilva | Post one | Forum  |
-    And the following comments
-       | article  | author    | title  | body   |
-       | Post one | joaosilva | Hi all | Hi all |
-       | Post one | joaosilva | Hello  | Hello  |
-   When I go to /joaosilva/forum/post-one
-   And I select "Oldest first" from "comment_order" within ".comment-order"
-   Then I should see "Hi all" within ".article-comment"
@@ -13,7 +13,6 @@ Feature: delete profile
       | sample-community | Sample Community |
     And "Maria Silva" is a member of "Sample Community"
-  @selenium
   Scenario: deleting profile
     Given I am logged in as "joaosilva"
     And I am on joaosilva's control panel
@@ -46,7 +45,6 @@ Feature: delete profile
     When I follow "Community Info and settings"
     Then I should see "Delete profile"
-  @selenium
   Scenario: community admin deletes the community
     Given "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
@@ -75,7 +73,6 @@ Feature: delete profile
     When I follow "Enterprise Info and settings"
     Then I should see "Delete profile"
-  @selenium
   Scenario: enterprise admin deletes the enterprise
     Given the following enterprise
       | identifier | name |
@@ -101,7 +98,6 @@ Feature: delete profile
     And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile
     Then I should see "Access denied"
-  @selenium
   Scenario: environment admin deletes profile
     Given I am logged in as admin
     And I am on joaosilva's control panel
@@ -35,7 +35,9 @@ Feature: edit article
     And "Maria Silva" is a member of "Free Software"
     And I am on freesoftware's control panel
     And I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
+    And I should see "Folder"
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I choose "article_published_false"
@@ -57,7 +59,9 @@ Feature: edit article
     And "Maria Silva" is a member of "Free Software"
     And I am on freesoftware's control panel
     And I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
+    And I should see "Folder"
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I choose "article_published_false"
@@ -108,14 +112,17 @@ Feature: edit article
   Scenario: display tag list field when creating event
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
-    When I follow "Event"
+    And I should see "Event" within ".article-types"
+    When I follow "Event" within ".article-types"
     Then I should see "Tag list"
   Scenario: display tag list field when creating folder
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
+    And I should see "Folder"
     When I follow "Folder"
     Then I should see "Tag list"
@@ -163,12 +170,15 @@ Feature: edit article
   Scenario: create an article inside a folder
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
+    And I should see "Folder"
     And I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "My Article"
     And I press "Save"
@@ -179,12 +189,15 @@ Feature: edit article
   Scenario: cancel button back to folder after giving up creating
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
+    And I should see "Folder"
     And I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I follow "Cancel" within ".no-boxes"
     Then I should be on /joaosilva/my-folder
@@ -202,6 +215,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
+    And I should see "Text article with visual editor"
     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"
@@ -34,11 +34,12 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to o-rappa's control panel
-    And I follow "Community Info and settings"
-    And I should not see "identifier-change-confirmation"
-    When I fill in "Address" with "banda-o-rappa"
-    And I should see "identifier-change-confirmation"
+    And I go to o-rappa's control panel
+    When I follow "Community Info and settings"
+    Then I should not see "WARNING" within "#identifier-change-confirmation"
+    And I fill in "Address" with "banda-o-rappa"
+    When I leave the "#profile_data_identifier" field
+    Then I should see "WARNING" within "#identifier-change-confirmation"
   @selenium
   Scenario: Confirm url change
@@ -46,12 +47,13 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to o-rappa's control panel
+    And I go to o-rappa's control panel
     And I follow "Community Info and settings"
-    When I fill in "Address" with "banda-o-rappa"
-    Then I should see "identifier-change-confirmation"
+    And I fill in "Address" with "banda-o-rappa"
+    When I leave the "#profile_data_identifier" field
+    Then I should see "WARNING" within "#identifier-change-confirmation"
     When I follow "Yes"
-    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
+    Then I should not see "WARNING" within "#identifier-change-confirmation"
   @selenium
   Scenario: Cancel url change
@@ -59,9 +61,10 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to o-rappa's control panel
+    And I go to o-rappa's control panel
     And I follow "Community Info and settings"
-    When I fill in "Address" with "banda-o-rappa"
-    Then I should see "identifier-change-confirmation"
+    And I fill in "Address" with "banda-o-rappa"
+    When I leave the "#profile_data_identifier" field
+    Then I should see "WARNING" within "#identifier-change-confirmation"
     When I follow "No"
-    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
+    Then I should not see "WARNING" within "#identifier-change-confirmation"
@@ -14,7 +14,9 @@ Feature: forum
   Scenario: create a forum
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
+    And I should see "New content"
     And I follow "New content"
+    And I should see "Forum"
     When I follow "Forum"
     And I fill in "Title" with "My Forum"
     And I press "Save"
@@ -97,6 +99,7 @@ Feature: forum
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Topic"
     And I press "Save"
@@ -249,6 +252,7 @@ Feature: forum
     And I am logged in as "mariasilva"
     And I go to /sample-community/forum
     And I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Test"
     And I press "Save"
@@ -274,11 +278,13 @@ Feature: forum
     And I am logged in as "mariasilva"
     And I go to /sample-community/forum
     And I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Test"
     And I press "Save"
     And I go to /sample-community/forum/test
     And I follow "New discussion topic"
+    And I should see "Text article with visual editor"
     And I follow "Text article with visual editor"
     And I fill in "Title" with "Test inside the topic page"
     And I press "Save"
@@ -58,6 +58,7 @@ Feature: check all manage fields
     Given I follow "Community's fields"
     And I check "community_active"
     And I press "save_community_fields"
+    And I follow "Community's fields"
     And I uncheck "community_active"
     And I press "save_community_fields"
     When I go to mycommunity's control panel
@@ -69,6 +70,7 @@ Feature: check all manage fields
     Given I follow "Enterprise's fields"
     And I check "enterprise_active"
     And I press "save_enterprise_fields"
+    And I follow "Enterprise's fields"
     And I uncheck "enterprise_active"
     And I press "save_enterprise_fields"
     When I go to paper-street's control panel
@@ -58,6 +58,7 @@ Feature: manage inputs
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
     And I follow "Add the inputs or raw material used by this product"
+    And I should see "Cancel" within "#categories_selection_actionbar"
     And I follow "Cancel" within "#categories_selection_actionbar"
     Then I should see "Abbey Road"
     And I should see "Add the inputs or raw material used by this product"
@@ -199,6 +200,7 @@ Feature: manage inputs
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
     And I follow "Edit" within ".input-details"
+    And I should see "Cancel" within ".edit_input"
     And I follow "Cancel" within ".edit_input"
     And I follow "Edit" within ".input-details"
     Then I should see "Amount used"
@@ -218,25 +220,6 @@ Feature: manage inputs
     And I confirm the browser dialog
     Then I should see "Add the inputs or raw material used by this product"
-  @selenium
-  Scenario: Remember in which tab I was
-    Given the following products
-      | owner      | category | name         |
-      | redemoinho | Music    | Depeche Mode |
-      | redemoinho | Music    | Manu Chao    |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Depeche Mode
-    Then I should see "Add some description to your product"
-    And "Add the inputs or raw material used by this product" should not be visible within "#show_product"
-    When I follow "Inputs and raw material"
-    Then I should see "Add the inputs or raw material used by this product"
-    And "Add some description to your product" should not be visible within "#show_product"
-    When I go to Rede Moinho's page of product Manu Chao
-    Then I should see "Add some description to your product"
-    When I go to Rede Moinho's page of product Depeche Mode
-    Then I should see "Add the inputs or raw material used by this product"
-    And "Add some description to your product" should not be visible within "#show_product"
-
   @selenium-fixme
   Scenario: Order input list
     Given the following product_category
 Given /^I invite email "(.+)" to join community "(.+)"$/ do |email, community|
   identifier = Community.find_by_name(community).identifier
   visit("/myprofile/#{identifier}/profile_members")
-  click_link('Invite your friends to join 26 Bsslines')
+  first(:link, "Invite your friends to join #{community}").click
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
   click_link('Personalize invitation mail')
@@ -4,7 +4,8 @@ Given /^the following users?$/ do |table|
     person_data = item.dup
     person_data.delete("login")
     category = Category.find_by_slug person_data.delete("category")
-    user = User.create!(:login => item[:login], :password => '123456', :password_confirmation => '123456', :email => item[:login] + "@example.com", :person_data => person_data)
+    email = item[:email] || item[:login] + "@example.com"
+    user = User.create!(:login => item[:login], :password => '123456', :password_confirmation => '123456', :email => email, :person_data => person_data)
     user.activate
     p = user.person
     p.categories << category if category
@@ -8,7 +8,6 @@ Feature: upload files
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
-  @selenium
   Scenario: provile links to upload files to community's gallery
     Given the following communities
       | identifier | name | owner |
@@ -16,12 +15,9 @@ Feature: upload files
     And the following galleries
       | owner | name |
       | sample-community | Gallery test |
-    And I go to sample-community's profile
-    And I follow "Profile"
-    And I follow "0 pictures"
-    And I should see "Upload files"
+    And I go to article "Gallery test"
+    Then I should see "Upload files"
-  @selenium
   Scenario: provile links to upload files to enterprise's gallery
     Given the following enterprises
       | identifier | name | owner |
@@ -29,10 +25,8 @@ Feature: upload files
     And the following galleries
       | owner | name |
       | sample-enterprise | Gallery test |
-    And I go to sample-enterprise's profile
-    And I follow "Profile"
-    And I follow "0 pictures"
-    And I should see "Upload files"
+    And I go to article "Gallery test"
+    Then I should see "Upload files"
   Scenario: not provile links to upload files on blogs
     Given the following communities
@@ -26,7 +26,7 @@ class DisplayContentBlock &lt; Block
   settings_items :display_folder_children, :type => :boolean, :default => true
   settings_items :types, :type => Array, :default => ['TextileArticle', 'TinyMceArticle', 'RawHTMLArticle']
-  attr_accessible :sections, :checked_nodes, :display_folder_children
+  attr_accessible :sections, :checked_nodes, :display_folder_children, :types
   def self.description
     _('Display your contents')
@@ -350,10 +350,11 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'list links for all articles title defined in nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
     block = DisplayContentBlock.new
+    block.sections = [{:value => 'title', :checked => true}]
     block.nodes = [a1.id, a2.id]
     box = mock()
     block.stubs(:box).returns(box)
@@ -366,8 +367,8 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'list content for all articles lead defined in nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
-    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
+    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
+    a2 = fast_create(TinyMceArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}]
@@ -421,7 +422,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'show title if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -435,7 +436,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'show abstract if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
+    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -449,7 +450,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'show body if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
+    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -577,7 +578,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.types = ['TinyMceArticle']
     block.types = ['TinyMceArticle', 'Folder']
-    assert_equal [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types
+    assert_equivalent [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types
   end
   should 'return available content types' do
@@ -585,7 +586,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.create!
     block.types = ['TinyMceArticle']
     block.types = []
-    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
+    assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
   end
   should 'return first 2 content types' do
@@ -629,7 +630,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
     block.types = []
-    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
+    assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
   end
   should 'do not fail if a selected article was removed' do
 function send_order(order, url) {
-  open_loading(DEFAULT_LOADING_MESSAGE);
-
+  jQuery('.article-comments-list').addClass('fetching');
   jQuery.ajax({
     url:url,
     data: {"comment_order":order},
     success: function(response) {
-      close_loading();
       jQuery(".article-comments-list").html(response);
     },
-    error: function() { close_loading() }
+    complete: function(){ jQuery('.article-comments-list').removeClass('fetching') }
   });
 }
@@ -29,6 +29,13 @@ function new_link_action(){
   jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());
 }
+function add_new_link() {
+  var new_link = jQuery('#edit-link-list-block #new-template>li').clone();
+  new_link.show();
+  jQuery('#dropable-link-list').append(new_link);
+  new_link_action();
+}
+
 jQuery(document).ready(function(){
   new_link_action();
@@ -36,4 +43,4 @@ jQuery(document).ready(function(){
     revert: true,
     axis: "y"
   });
-});
 \ No newline at end of file
+});
@@ -3,8 +3,8 @@
   $('#search-content .pagination a').live('click', function () {
     $.ajax({
       url: this.href,
-      beforeSend: function(){$('#search-content').addClass('searching')},
-      complete: function() {$('#search-content').removeClass('searching')},
+      beforeSend: function(){$('#search-content').addClass('fetching')},
+      complete: function() {$('#search-content').removeClass('fetching')},
       dataType: 'script'
     })
     return false;
@@ -23,8 +23,8 @@
     $.ajax({
       url: this.action,
       data: $(this).serialize(),
-      beforeSend: function(){$('#search-content').addClass('searching')},
-      complete: function() {$('#search-content').removeClass('searching')},
+      beforeSend: function(){$('#search-content').addClass('fetching')},
+      complete: function() {$('#search-content').removeClass('fetching')},
       dataType: 'script'
     })
     return false;
@@ -1864,6 +1864,9 @@ a.button.disabled, input.disabled {
   position: relative;
   left: -24px;
 }
+#edit-link-list-block #new-template {
+  display: none;
+}
 .link-list-header {
   width: 98%;
   height: 25px;
@@ -6691,6 +6694,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   color: green;
 }
-#search-content.searching {
+.fetching {
   opacity: 0.3;
 }
@@ -131,4 +131,4 @@ packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debi
 run sudo apt-get -y install $packages
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
-run bundle --local
+run bundle install
@@ -52,6 +52,7 @@ else
     # special case Debian-based systems; in others people will have to install
     # lsb-release by themselves
     if which apt-get >/dev/null 2>&1; then
+      sudo apt-get update
       sudo apt-get -y install lsb-release
     else
       complain "E: lsb_release not available! (Try installing the lsb-release package)"
	@@ -62,7 +62,7 @@ GEM		@@ -62,7 +62,7 @@ GEM
62	database_cleaner (1.2.0)	62	database_cleaner (1.2.0)
63	diff-lcs (1.1.3)	63	diff-lcs (1.1.3)
64	erubis (2.7.0)	64	erubis (2.7.0)
65	- eventmachine (1.0.3)	65	+ eventmachine (0.12.11)
66	fast_gettext (0.6.8)	66	fast_gettext (0.6.8)
67	ffi (1.0.11)	67	ffi (1.0.11)
68	gherkin (2.4.21)	68	gherkin (2.4.21)
	@@ -76,7 +76,7 @@ GEM		@@ -76,7 +76,7 @@ GEM
76	i18n (>= 0.4.0)	76	i18n (>= 0.4.0)
77	mime-types (~> 1.16)	77	mime-types (~> 1.16)
78	treetop (~> 1.4.8)	78	treetop (~> 1.4.8)
79	- metaclass (0.0.4)	79	+ metaclass (0.0.1)
80	mime-types (1.19)	80	mime-types (1.19)
81	mocha (0.11.3)	81	mocha (0.11.3)
82	metaclass (~> 0.0.1)	82	metaclass (~> 0.0.1)
	@@ -232,7 +232,7 @@ class CmsController < MyProfileController		@@ -232,7 +232,7 @@ class CmsController < MyProfileController
232	@current_category = Category.find(params[:category_id])	232	@current_category = Category.find(params[:category_id])
233	@categories = @current_category.children	233	@categories = @current_category.children
234	end	234	end
235	- render :template => 'shared/update_categories', :locals => { :category => @current_category }	235	+ render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
236	end	236	end
237		237
238	def publish	238	def publish
	@@ -54,7 +54,7 @@ class ProfileEditorController < MyProfileController		@@ -54,7 +54,7 @@ class ProfileEditorController < MyProfileController
54	@current_category = Category.find(params[:category_id])	54	@current_category = Category.find(params[:category_id])
55	@categories = @current_category.children	55	@categories = @current_category.children
56	end	56	end
57	- render :template => 'shared/update_categories', :locals => { :category => @current_category }	57	+ render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
58	end	58	end
59		59
60	def header_footer	60	def header_footer
	@@ -33,6 +33,7 @@ class ContentViewerController < ApplicationController		@@ -33,6 +33,7 @@ class ContentViewerController < ApplicationController
33	process_forum_terms_of_use(user, params[:terms_accepted])	33	process_forum_terms_of_use(user, params[:terms_accepted])
34	elsif is_a_forum_topic?(@page)	34	elsif is_a_forum_topic?(@page)
35	redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)	35	redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
		36	+ return
36	end	37	end
37		38
38	# At this point the page will be showed	39	# At this point the page will be showed
	@@ -671,7 +671,7 @@ module ApplicationHelper		@@ -671,7 +671,7 @@ module ApplicationHelper
671		671
672	def theme_javascript_ng	672	def theme_javascript_ng
673	script = File.join(theme_path, 'theme.js')	673	script = File.join(theme_path, 'theme.js')
674	- if File.exists?(Rails.root.join('public', script))	674	+ if File.join(Rails.root, 'public', script)
675	javascript_include_tag script	675	javascript_include_tag script
676	else	676	else
677	nil	677	nil
	@@ -2,7 +2,7 @@ require 'hpricot'		@@ -2,7 +2,7 @@ require 'hpricot'
2		2
3	class Article < ActiveRecord::Base	3	class Article < ActiveRecord::Base
4		4
5	- attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions	5	+ attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link
6		6
7	acts_as_having_image	7	acts_as_having_image
8		8
	@@ -3,7 +3,7 @@ class Forum < Folder		@@ -3,7 +3,7 @@ class Forum < Folder
3	acts_as_having_posts :order => 'updated_at DESC'	3	acts_as_having_posts :order => 'updated_at DESC'
4	include PostsLimit	4	include PostsLimit
5		5
6	- attr_accessible :has_terms_of_use, :terms_of_use	6	+ attr_accessible :has_terms_of_use, :terms_of_use, :allows_members_to_create_topics
7		7
8	settings_items :terms_of_use, :type => :string, :default => ""	8	settings_items :terms_of_use, :type => :string, :default => ""
9	settings_items :has_terms_of_use, :type => :boolean, :default => false	9	settings_items :has_terms_of_use, :type => :boolean, :default => false
1	class Input < ActiveRecord::Base	1	class Input < ActiveRecord::Base
2		2
3	- attr_accessible :product, :product_category	3	+ attr_accessible :product, :product_category, :product_category_id, :amount_used, :unit_id, :price_per_unit, :relevant_to_price
4		4
5	belongs_to :product	5	belongs_to :product
6	belongs_to :product_category	6	belongs_to :product_category
	@@ -10,40 +10,15 @@		@@ -10,40 +10,15 @@
10	</ul>	10	</ul>
11	<ul id="dropable-link-list">	11	<ul id="dropable-link-list">
12	<% for link in @block.links do %>	12	<% for link in @block.links do %>
13	- <li>
14	- <ul class="link-list-row">
15	- <li>
16	- <%= icon_selector(link['icon']) %>
17	- </li>
18	- <li>
19	- <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
20	- </li>
21	- <li>
22	- <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
23	- </li>
24	- <li>
25	- <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
26	- </li>
27	- <li>
28	- <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
29	- </li>
30	- </ul>
31	- </li>	13	+ <%= render :partial => 'link_list_item', :locals => {:link => link} %>
32	<% end %>	14	<% end %>
33	</ul>	15	</ul>
34	<input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />	16	<input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
		17	+
		18	+ <div id="new-template">
		19	+ <% template_link = {'icon' => 'ok'} %>
		20	+ <%= render :partial => 'link_list_item', :locals => {:link => template_link} %>
		21	+ </div>
35	</div>	22	</div>
36		23
37	-<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do \|page\|
38	- page.insert_html :bottom, 'dropable-link-list', content_tag('li',
39	- content_tag('ul',
40	- content_tag('li', icon_selector('ok')) +
41	- content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
42	- content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
43	- content_tag('li', select_tag('block[links][][target]',
44	- options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
45	- content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
46	- :class=>"link-list-row new_link_row")
47	- ) +
48	- javascript_tag("new_link_action()")
49	-end %>	24	+<%= link_to_function(_('New link'), 'add_new_link();', :class => 'button icon-add with-text') %>
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+<li>
	2	+ <ul class="link-list-row">
	3	+ <li>
	4	+ <%= icon_selector(link['icon']) %>
	5	+ </li>
	6	+ <li>
	7	+ <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
	8	+ </li>
	9	+ <li>
	10	+ <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
	11	+ </li>
	12	+ <li>
	13	+ <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
	14	+ </li>
	15	+ <li>
	16	+ <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
	17	+ </li>
	18	+ </ul>
	19	+</li>