Merge branch 'stable'

Conflicts: po/pt/noosfero.po public/javascripts/application.js

Merge branch 'stable'
Conflicts: po/pt/noosfero.po public/javascripts/application.js
Antonio Terceiro
2 parents 79629a6a 88006cbf
Showing 22 changed files with 144 additions and 33 deletions Show diff stats
app/controllers/admin/users_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/search_helper.rb
app/models/product.rb
app/models/uploaded_file.rb
app/views/friends/index.rhtml
app/views/profile/_comment.rhtml
app/views/profile/_create_article.rhtml
app/views/profile/_default_activity.rhtml
app/views/profile/_leave_scrap.rhtml
app/views/profile/_profile_scrap.rhtml
app/views/profile/_upload_image.rhtml
app/views/search/_image.rhtml
app/views/search/communities.rhtml
lib/acts_as_faceted.rb
lib/tasks/data.rake
po/pt/noosfero.po
public/javascripts/application.js
public/stylesheets/application.css
test/functional/profile_controller_test.rb
@@ -7,11 +7,12 @@ class UsersController &lt; AdminController
       format.html
       format.xml do
         @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        render :xml => @users.to_xml(
-          :skip_types => true,
-          :only => %w[email login created_at updated_at],
-          :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }
-        )
+        send_data @users.to_xml(
+            :skip_types => true,
+            :only => %w[email login created_at updated_at],
+            :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
+          :type => 'text/xml',
+          :disposition => "attachment; filename=users.xml"
       end
       format.csv do
         @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
@@ -212,9 +212,9 @@ class ProfileController &lt; PublicController
     begin
       scrap = current_user.person.scraps(params[:scrap_id])
       scrap.destroy
-      render :text => _('Scrap successfully removed.')
+      finish_successful_removal 'Scrap successfully removed.'
     rescue
-      render :text => _('You could not remove this scrap')
+      finish_unsuccessful_removal 'You could not remove this scrap.'
     end
   end
@@ -227,9 +227,9 @@ class ProfileController &lt; PublicController
       else
         activity.destroy
       end
-      render :text => _('Activity successfully removed.')
+      finish_successful_removal 'Activity successfully removed.'
     rescue
-      render :text => _('You could not remove this activity')
+      finish_unsuccessful_removal 'You could not remove this activity.'
     end
   end
@@ -244,6 +244,24 @@ class ProfileController &lt; PublicController
     end
   end
+  def finish_successful_removal(msg)
+    if request.xhr?
+      render :text => {'ok' => true}.to_json, :content_type => 'application/json'
+    else
+      session[:notice] = _(msg)
+      redirect_to :action => :index
+    end
+  end
+
+  def finish_unsuccessful_removal(msg)
+    session[:notice] = _(msg)
+    if request.xhr?
+      render :text => {'redirect' => url_for(:action => :index)}.to_json, :content_type => 'application/json'
+    else
+      redirect_to :action => :index
+    end
+  end
+
   def profile_info
     begin
       @block = profile.blocks.find(params[:block_id])
@@ -303,9 +321,10 @@ class ProfileController &lt; PublicController
     @comment = Comment.find(params[:comment_id])
     if (user == @comment.author || user == profile || user.has_permission?(:moderate_comments, profile))
       @comment.destroy
-      session[:notice] = _('Comment successfully deleted')
+      finish_successful_removal 'Comment successfully removed.'
+    else
+      finish_unsuccessful_removal 'You could not remove this comment.'
     end
-    redirect_to :action => :index
   end
   protected
@@ -50,7 +50,7 @@ module SearchHelper
   end
   def map_search?
-    !@query.blank? and !multiple_search? and params[:display] == 'map'
+    !@empty_query and !multiple_search? and params[:display] == 'map'
   end
   def search_page_title(title, category = nil)
@@ -107,7 +107,7 @@ module SearchHelper
     @asset_class = asset_class(asset)
     render(:partial => 'facets_unselect_menu')
   end
-  
+
   def facet_javascript(input_id, facet, array)
     array = [] if array.nil?
     hintText = _('Type in an option')
@@ -156,6 +156,7 @@ module SearchHelper
     params = params.dup
     params[:facet].each do |id, value|
       facet = klass.facet_by_id(id.to_sym)
+      next unless facet
       if value.kind_of?(Hash)
         label_hash = facet[:label].call(environment)
         value.each do |label_id, value|
 class Product < ActiveRecord::Base
+
   belongs_to :enterprise
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -163,7 +164,7 @@ class Product &lt; ActiveRecord::Base
   def total_production_cost
     return inputs_cost if price_details.empty?
-    inputs_cost + price_details.map(&:price).inject { |sum,price| sum + price }
+    inputs_cost + price_details.map(&:price).inject(0){ |sum,price| sum + price }
   end
   def price_described?
@@ -67,7 +67,7 @@ class UploadedFile &lt; Article
       'upload-file'
     end
   end
-  
+
   def mime_type
     content_type
   end
@@ -129,6 +129,12 @@ class UploadedFile &lt; Article
     end
   end
+  def extension
+    dotindex = self.filename.rindex('.')
+    return nil unless dotindex
+    self.filename[(dotindex+1)..-1].downcase
+  end
+
   def allow_children?
     false
   end
@@ -144,4 +150,5 @@ class UploadedFile &lt; Article
   def uploaded_file?
     true
   end
+
 end
@@ -31,7 +31,7 @@
               :class => 'button icon-remove',
               :title => _('remove') %>
         <%= link_to content_tag('span',_('contact')),
-              friend.url.merge(:controller => 'contact', :action => 'new'),
+              friend.url.merge(:controller => 'contact', :action => 'new', :profile => friend.identifier),
               :class => 'button icon-menu-mail',
               :title => _('contact') %>
       </div><!-- end class="controll" -->
@@ -5,19 +5,35 @@
 <li class="article-comment" style='border-bottom:none;'>
   <div class="article-comment-inner">
-  <div class="comment-content comment-logged-in">
+  <div class="comment-content comment-logged-<%= comment.author ? 'in' : 'out' %>">
   <% if comment.author %>
     <%= link_to image_tag(profile_icon(comment.author, :minor)),
-        Person.find(comment.author_id).url,
+        comment.author_url,
         :class => 'comment-picture',
         :title => comment.author_name
     %>
+  <% else %>
+    <% url_image, status_class = comment.author_id ?
+       [comment.removed_user_image, 'icon-user-removed'] :
+       [str_gravatar_url_for( comment.email ), 'icon-user-unknown'] %>
+
+    <%= link_to(
+          image_tag(url_image, :onerror=>'gravatarCommentFailback(this)',
+                   'data-gravatar'=>str_gravatar_url_for(comment.email)) +
+          content_tag('span', comment.author_name, :class => 'comment-info') +
+          content_tag('span', comment.message,
+                   :class => 'comment-user-status comment-user-status-wall ' + status_class),
+        gravatar_profile_url(comment.email),
+        :target => '_blank',
+        :class => 'comment-picture',
+        :title => '%s %s' % [comment.author_name, comment.message]
+    )%>
   <% end %>
   <div class="comment-details">
     <div class="comment-text">
-      <%= link_to(comment.author_name, comment.author.url) %>
+      <%= comment.author.present? ? link_to(comment.author_name, comment.author.url) : content_tag('strong', comment.author_name) %>
       <% unless comment.title.blank? %>
         <span class="comment-title"><%= comment.title %></span><br/>
       <% end %>
@@ -30,7 +46,7 @@
   <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
     <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
-      <%= icon_button(:delete, _('Remove'), { :action => :remove_comment, :comment_id => comment.id }, :method => :get, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
+      <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.article-comment'", url_for(:profile => params[:profile], :action => :remove_comment, :comment_id => comment.id, :view => params[:view]).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'button icon-button icon-delete') %>
     <% end %>
   <% end %>
   <br style="clear: both;" />
@@ -15,7 +15,7 @@
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id, :only_hide => true}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
   </div>
 </div>
@@ -6,7 +6,7 @@
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
   </div>
 </div>
@@ -5,7 +5,7 @@
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
   </div>
 </div>
@@ -12,7 +12,7 @@
         <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
       </span>
     <% end %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
     </div>
   </div>
@@ -6,7 +6,7 @@
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
     <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
     <div class='profile-wall-actions'>
-      <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+      <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
     </div>
   </div>
 </div>
 <div class="search-image-container">
   <% if image.is_a? UploadedFile and image.filename %>
-    <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>
+    <% extension = image.extension %>
     <% 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 %>
@@ -4,7 +4,7 @@
   <% if logged_in? %>
     <% button_bar do %>
       <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-      <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community')) %>
+      <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
     <% end %>
   <% end %>
@@ -8,7 +8,7 @@ module ActsAsFaceted
     #
     #acts_as_faceted :fields => {
     #  :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
-    #  :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"), 
+    #  :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
     #    '[NOW-1YEARS TO NOW/DAY]' => _("Last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("Last month"), '[NOW-7DAYS TO NOW/DAY]' => _("Last week"), '[NOW-1DAYS TO NOW/DAY]' => _("Last day")}},
     #  :f_profile_type => {:label => _('Author'), :proc => proc{|klass| f_profile_type_proc(klass)}},
     #  :f_category => {:label => _('Categories')}},
@@ -36,7 +36,7 @@ module ActsAsFaceted
       self.facets_order = options[:order] || self.facets.keys
       self.facets_results_containers = {:fields => 'facet_fields', :queries => 'facet_queries', :ranges => 'facet_ranges'}
       self.facets_option_for_solr = Hash[facets.select{ |id,data| ! data.has_key?(:queries) }].keys
-      self.facets_fields_for_solr = facets.map{ |id,data| {id => data[:type] || :facet} } 
+      self.facets_fields_for_solr = facets.map{ |id,data| {id => data[:type] || :facet} }
       self.solr_fields_names = facets.map{ |id,data| id.to_s + '_' + get_solr_field_type(data[:type] || :facet) }
       self.facet_category_query = options[:category_query]
@@ -67,6 +67,7 @@ module ActsAsFaceted
         raise 'Use map_facets_for before this method' if facet[:solr_field].nil?
         facets_data = {} if facets_data.blank? # could be empty array
         solr_facet = to_solr_fields_names[facet[:solr_field]]
+        unfiltered_facets_data ||= {}
         if facet[:queries]
           container = facets_data[facets_results_containers[:queries]]
@@ -158,13 +159,15 @@ module ActsAsFaceted
       end
       def facet_label(facet)
-        _ facet[:label]
+        return nil unless facet
+        _(facet[:label])
       end
       def facets_find_options(facets_selected = {}, options = {})
         browses = []
         facets_selected ||= {}
         facets_selected.map do |id, value|
+          next unless facets[id.to_sym]
           if value.kind_of?(Hash)
             value.map do |label_id, value|
               value.to_a.each do |value|
@@ -3,7 +3,7 @@ namespace :db do
     task :minimal do
       sh './script/runner', "Environment.create!(:name => 'Noosfero', :is_default => true)"
       unless ENV['NOOSFERO_DOMAIN'].blank?
-        sh './script/runner', "environment.domains << Domain.new(:name => ENV['NOOSFERO_DOMAIN'])"
+        sh './script/runner', "Environment.default.domains << Domain.new(:name => ENV['NOOSFERO_DOMAIN'])"
       end
     end
   end
@@ -14,7 +14,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.38.0\n"
 "POT-Creation-Date: 2012-08-09 10:45-0300\n"
-"PO-Revision-Date: 2012-08-09 11:10-0300\n"
+"PO-Revision-Date: 2012-10-01 01:32-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
 "Language: \n"
@@ -5915,7 +5915,13 @@ msgstr &quot;Remover&quot;
 #: app/views/profile/_default_activity.rhtml:9
 #: app/views/profile/_leave_scrap_to_self.rhtml:8
 #: app/views/profile/_upload_image.rhtml:9
+msgid "Are you sure you want to remove this activity and all its replies?"
+msgstr "Você tem certeza que quer remover esta atividade e todas as suas respostas?"
+
 #: app/views/profile/_profile_scrap.rhtml:15
+msgid "Are you sure you want to remove this scrap and all its replies?"
+msgstr "Você tem certeza que quer remover esta mensagem e todas as suas respostas?"
+
 #: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
@@ -710,6 +710,24 @@ function remove_comment(button, url, msg) {
   });
 }
+function remove_item_wall(button, item, url, msg) {
+  var $ = jQuery;
+  var $wall_item = $(button).closest(item);
+  $wall_item.addClass('remove-item-loading');
+  if (msg && !confirm(msg)) {
+    $wall_item.removeClass('remove-item-loading');
+    return;
+  }
+  $.post(url, function(data) {
+    if (data.ok) {
+      $wall_item.slideUp();
+    } else {
+      $wall_item.removeClass('remove-item-loading');
+      window.location.replace(data.redirect);
+    }
+  });
+}
+
 function original_image_dimensions(src) {
   var img = new Image();
   img.src = src;
@@ -460,6 +460,8 @@ div.pending-tasks {
 .headline img {
   float:left;
   margin: 5px;
+  max-width: 100%;
+  height: auto;
 }
 .news-area {
   border: 1px solid black;
@@ -1098,6 +1100,10 @@ a.comment-picture {
   left: 33px;
   background-repeat: no-repeat;
 }
+.comment-user-status-wall {
+  top: 16px;
+  left: 16px;
+}
 #article .article-comments-list, #article .article-comments-list ul, #article .article-comments-list li {
   padding: 0;
   margin: 0;
@@ -4802,6 +4808,10 @@ h1#agenda-title {
   color: #000;
 }
+.remove-item-loading {
+  background: transparent url(../images/loading-small.gif) no-repeat left center !important;
+}
+
 li.profile-activity-item.upload_image .more,
 li.profile-activity-item.upload_image .upimg {
   display: block;
@@ -1300,4 +1300,28 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_equal "Comment successfully added.", assigns(:message)
   end
+
+  should 'display comment in wall if user was removed' do
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    to_be_removed = create_user('removed_user').person
+    comment = Comment.create!(:author => to_be_removed, :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
+    to_be_removed.destroy
+
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
+  end
+
+  should 'display comment in wall from non logged users' do
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    comment = Comment.create!(:name => 'outside user', :email => 'outside@localhost.localdomain', :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
+
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
+  end
 end
@@ -33,7 +33,7 @@ class UsersControllerTest &lt; ActionController::TestCase
     login_as('admin_user')
     get :index, :format => 'xml'
-    assert_equal 'application/xml', @response.content_type
+    assert_equal 'text/xml', @response.content_type
   end
   should 'response as CSV to export users' do
@@ -306,6 +306,11 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     uses_sqlite
   end
+  should 'return extension' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => @profile)
+    assert_equal 'png', file.extension
+  end
+
   should 'upload to path prefix folder if database is not postgresql' do
     uses_sqlite
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => @profile)
	@@ -31,7 +31,7 @@		@@ -31,7 +31,7 @@
31	:class => 'button icon-remove',	31	:class => 'button icon-remove',
32	:title => _('remove') %>	32	:title => _('remove') %>
33	<%= link_to content_tag('span',_('contact')),	33	<%= link_to content_tag('span',_('contact')),
34	- friend.url.merge(:controller => 'contact', :action => 'new'),	34	+ friend.url.merge(:controller => 'contact', :action => 'new', :profile => friend.identifier),
35	:class => 'button icon-menu-mail',	35	:class => 'button icon-menu-mail',
36	:title => _('contact') %>	36	:title => _('contact') %>
37	</div><!-- end class="controll" -->	37	</div><!-- end class="controll" -->
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	<p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>	15	<p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
16	<div class='profile-wall-actions'>	16	<div class='profile-wall-actions'>
17	<%= link_to s_('profile\|Comment'), '#', { :class => 'focus-on-comment'} %>	17	<%= link_to s_('profile\|Comment'), '#', { :class => 'focus-on-comment'} %>
18	- <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id, :only_hide => true}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>	18	+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
19	</div>	19	</div>
20	</div>	20	</div>
21		21
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	<p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>	6	<p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
7	<div class='profile-wall-actions'>	7	<div class='profile-wall-actions'>
8	<%= link_to s_('profile\|Comment'), '#', { :class => 'focus-on-comment'} %>	8	<%= link_to s_('profile\|Comment'), '#', { :class => 'focus-on-comment'} %>
9	- <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>	9	+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
10	</div>	10	</div>
11	</div>	11	</div>
12		12
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>	5	<p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
6	<p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>	6	<p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
7	<div class='profile-wall-actions'>	7	<div class='profile-wall-actions'>
8	- <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>	8	+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
9	</div>	9	</div>
10	</div>	10	</div>
11		11
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<%= link_to_function s_('profile\|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>	12	<%= link_to_function s_('profile\|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
13	</span>	13	</span>
14	<% end %>	14	<% end %>
15	- <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>	15	+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
16	</div>	16	</div>
17	</div>	17	</div>
18		18
1	<div class="search-image-container">	1	<div class="search-image-container">
2		2
3	<% if image.is_a? UploadedFile and image.filename %>	3	<% if image.is_a? UploadedFile and image.filename %>
4	- <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>	4	+ <% extension = image.extension %>
5	<% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>	5	<% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
6	<%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>	6	<%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
7	<% if image.width && image.height %>	7	<% if image.width && image.height %>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	<% if logged_in? %>	4	<% if logged_in? %>
5	<% button_bar do %>	5	<% button_bar do %>
6	<%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>	6	<%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
7	- <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community')) %>	7	+ <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
8	<% end %>	8	<% end %>
9	<% end %>	9	<% end %>
10		10
	@@ -3,7 +3,7 @@ namespace :db do		@@ -3,7 +3,7 @@ namespace :db do
3	task :minimal do	3	task :minimal do
4	sh './script/runner', "Environment.create!(:name => 'Noosfero', :is_default => true)"	4	sh './script/runner', "Environment.create!(:name => 'Noosfero', :is_default => true)"
5	unless ENV['NOOSFERO_DOMAIN'].blank?	5	unless ENV['NOOSFERO_DOMAIN'].blank?
6	- sh './script/runner', "environment.domains << Domain.new(:name => ENV['NOOSFERO_DOMAIN'])"	6	+ sh './script/runner', "Environment.default.domains << Domain.new(:name => ENV['NOOSFERO_DOMAIN'])"
7	end	7	end
8	end	8	end
9	end	9	end
	@@ -710,6 +710,24 @@ function remove_comment(button, url, msg) {		@@ -710,6 +710,24 @@ function remove_comment(button, url, msg) {
710	});	710	});
711	}	711	}
712		712
		713	+function remove_item_wall(button, item, url, msg) {
		714	+ var $ = jQuery;
		715	+ var $wall_item = $(button).closest(item);
		716	+ $wall_item.addClass('remove-item-loading');
		717	+ if (msg && !confirm(msg)) {
		718	+ $wall_item.removeClass('remove-item-loading');
		719	+ return;
		720	+ }
		721	+ $.post(url, function(data) {
		722	+ if (data.ok) {
		723	+ $wall_item.slideUp();
		724	+ } else {
		725	+ $wall_item.removeClass('remove-item-loading');
		726	+ window.location.replace(data.redirect);
		727	+ }
		728	+ });
		729	+}
		730	+
713	function original_image_dimensions(src) {	731	function original_image_dimensions(src) {
714	var img = new Image();	732	var img = new Image();
715	img.src = src;	733	img.src = src;
	@@ -1300,4 +1300,28 @@ class ProfileControllerTest < ActionController::TestCase		@@ -1300,4 +1300,28 @@ class ProfileControllerTest < ActionController::TestCase
1300	assert_response :success	1300	assert_response :success
1301	assert_equal "Comment successfully added.", assigns(:message)	1301	assert_equal "Comment successfully added.", assigns(:message)
1302	end	1302	end
		1303	+
		1304	+ should 'display comment in wall if user was removed' do
		1305	+ UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
		1306	+ article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
		1307	+ to_be_removed = create_user('removed_user').person
		1308	+ comment = Comment.create!(:author => to_be_removed, :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
		1309	+ to_be_removed.destroy
		1310	+
		1311	+ login_as(profile.identifier)
		1312	+ get :index, :profile => profile.identifier
		1313	+
		1314	+ assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
		1315	+ end
		1316	+
		1317	+ should 'display comment in wall from non logged users' do
		1318	+ UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
		1319	+ article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
		1320	+ comment = Comment.create!(:name => 'outside user', :email => 'outside@localhost.localdomain', :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
		1321	+
		1322	+ login_as(profile.identifier)
		1323	+ get :index, :profile => profile.identifier
		1324	+
		1325	+ assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
		1326	+ end
1303	end	1327	end