Merge branch 'stable'

Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb

Merge branch 'stable'
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
Rodrigo Souto
2 parents 4eae3f9b ffb7fba6
Showing 45 changed files with 373 additions and 193 deletions Show diff stats
AUTHORS
app/controllers/admin/users_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/tags_helper.rb
app/models/article_block.rb
app/models/feed_reader_block.rb
app/models/link_list_block.rb
app/models/organization_mailing.rb
app/models/profile.rb
app/models/profile_list_block.rb
app/models/tags_block.rb
app/models/uploaded_file.rb
app/views/box_organizer/_highlights_block.rhtml
app/views/favorite_enterprises/index.rhtml
app/views/profile/_profile_wall.rhtml
app/views/profile_members/_manage_roles.html.erb
@@ -148,6 +148,7 @@ Rodrigo Souto &lt;rodrigo@colivre.coop.br&gt;
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
+Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
  
 Ideas, specifications and incentive
+require 'csv'
+
 class UsersController < AdminController
  
   protect 'manage_environment_users', :environment
@@ -15,8 +17,16 @@ class UsersController &lt; AdminController
           :disposition => "attachment; filename=users.xml"
       end
       format.csv do
-        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
+        # using a direct connection with the dbms to optimize
+        command = User.send(:sanitize_sql, ["SELECT profiles.name, users.email FROM profiles
+                                             INNER JOIN users ON profiles.user_id=users.id
+                                             WHERE profiles.environment_id = ?", environment.id])
+        users = User.connection.execute(command)
+        csv_content = "name;email\n"
+        users.each { |u|
+          CSV.generate_row([u['name'], u['email']], 2, csv_content, fs=';')
+        }
+        render :text => csv_content, :content_type => 'text/csv', :layout => false
       end
     end
   end
@@ -32,7 +32,6 @@ class ProfileMembersController &lt; MyProfileController
  
   def last_admin
     @roles = [Profile::Roles.admin(environment.id)]
-    @pre_population = [].to_json
   end
  
   def add_role
@@ -495,23 +495,24 @@ module ApplicationHelper
  
   def profile_cat_icons( profile )
     if profile.class == Enterprise
-      icons =
-        profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
-          compact.uniq.map{ |c|
-            cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
-            cat_icon = "/images/icons-cat/#{cat_name}.png"
-            if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
-              cat_icon = '/images/icons-cat/undefined.png'
-            end
-            content_tag 'span',
-                        content_tag( 'span', c ),
-                        :title => c,
-                        :class => 'product-cat-icon cat_icon_' + cat_name,
-                        :style => "background-image:url(#{cat_icon})"
-          }.join "\n"
-      content_tag 'div',
-                  content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
-                  :class => 'product-category-icons'
+      icons = profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
+        compact.uniq.map do |c|
+          cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
+          cat_icon = "/images/icons-cat/#{cat_name}.png"
+          if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
+            cat_icon = '/images/icons-cat/undefined.png'
+          end
+          content_tag('span',
+            content_tag( 'span', c ),
+            :title => c,
+            :class => 'product-cat-icon cat_icon_' + cat_name,
+            :style => "background-image:url(#{cat_icon})"
+          )
+        end.join("\n").html_safe
+        content_tag('div',
+          content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
+          :class => 'product-category-icons'
+        )
     else
       ''
     end
@@ -635,10 +636,10 @@ module ApplicationHelper
       # FIXME
       ([toplevel] + toplevel.children_for_menu).each do |cat|
         if cat.top_level?
-          result << '<div class="categorie_box">'
+          result << '<div class="categorie_box">'.html_safe
           result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
           result << content_tag('h5', toplevel.name)
-          result << '<div style="display:none"><ul class="categories">'
+          result << '<div style="display:none"><ul class="categories">'.html_safe
         else
           checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
           result << content_tag('li', labelled_check_box(
@@ -649,7 +650,7 @@ module ApplicationHelper
                     :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
         end
       end
-      result << '</ul></div></div>'
+      result << '</ul></div></div>'.html_safe
     end
  
     content_tag('div', result)
@@ -789,10 +790,10 @@ module ApplicationHelper
             :class => 'lineitem' + (line_item+=1).to_s() ) +"\n"
         if line_item == line_size
           line_item = 0
-          html += "<br />\n"
+          html += "<br />\n".html_safe
         end
       }
-      html += "<br />\n"  if line_size == 0 || ( values.size % line_size ) > 0
+      html += "<br />\n".html_safe if line_size == 0 || ( values.size % line_size ) > 0
       column = object.class.columns_hash[method.to_s]
       text =
         ( column ?
@@ -930,7 +931,7 @@ module ApplicationHelper
   end
  
   def link_to_email(email)
-    javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") +  "</a>")')
+    javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") +  "</a>")'.html_safe)
   end
  
   def stylesheet(*args)
@@ -940,7 +941,7 @@ module ApplicationHelper
   def article_to_html(article, options = {})
     options.merge!(:page => params[:npage])
     content = article.to_html(options)
-    content = content.kind_of?(Proc) ? self.instance_eval(&content) : content
+    content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe
     @plugins && @plugins.each do |plugin|
       content = plugin.parse_content(content)
     end
@@ -986,7 +987,7 @@ module ApplicationHelper
   end
  
   def ui_icon(icon_class, extra_class = '')
-    "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>"
+    "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>".html_safe
   end
  
   def ui_button(label, url, html_options = {})
@@ -1014,13 +1015,13 @@ module ApplicationHelper
   end
  
   def collapsed_item_icon
-    "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>"
+    "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>".html_safe
   end
   def expanded_item_icon
-    "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>"
+    "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>".html_safe
   end
   def leaf_item_icon
-    "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>"
+    "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>".html_safe
   end
  
   def display_category_menu(block, categories, root = true)
@@ -1279,9 +1280,7 @@ module ApplicationHelper
     titles = tabs.inject(''){ |result, tab| result << content_tag(:li, link_to(tab[:title], '#'+tab[:id]), :class => 'tab') }
     contents = tabs.inject(''){ |result, tab| result << content_tag(:div, tab[:content], :id => tab[:id]) }
  
-    content_tag :div, :class => 'ui-tabs' do
-      content_tag(:ul, titles) + contents
-    end
+    content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
   end
  
   def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
@@ -1310,11 +1309,12 @@ module ApplicationHelper
   end
  
   def template_options(klass, field_name)
-    return '' if klass.templates.count == 0
-    return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
+    templates = klass.templates(environment)
+    return '' if templates.count == 0
+    return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
  
     counter = 0
-    radios = klass.templates.map do |template|
+    radios = templates.map do |template|
       counter += 1
       content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1))
     end.join("\n")
@@ -3,7 +3,7 @@ module BlockHelper
   def block_title(title)
     tag_class = 'block-title'
     tag_class += ' empty' if title.empty?
-    content_tag 'h3', content_tag('span', title), :class => tag_class
+    content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
  
 end
@@ -46,7 +46,7 @@ module ContentViewerHelper
         { article.environment.locales[translation.language] => { :href => url_for(translation.url) } }
       end
       content_tag(:div, link_to(_('Translations'), '#',
-                                :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
+                                :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
                                 :class => 'article-translations-menu simplemenu-trigger up'),
                   :class => 'article-translations')
     end
@@ -136,7 +136,7 @@ module ProfileEditorHelper
     concat(
       content_tag(
         'div',
-        capture(&block) + '<br style="clear:left;"/>&nbsp;',
+        capture(&block) + content_tag('br', '', :style => 'clear: left'),
         :class => 'control-panel')
     )
   end
@@ -68,7 +68,7 @@ module TagsHelper
           :title => n_( 'one item', '%d items', count ) % count
       end
  
-    end.join("\n")
+    end.join("\n").html_safe
   end
  
 end
@@ -16,7 +16,7 @@ class ArticleBlock &lt; Block
           :gallery_view => false,
           :inside_block => block,               # For Blogs and folders
           :format => block.visualization_format # For Articles and contents
-        ) : _('Article not selected yet.'))
+        ).html_safe : _('Article not selected yet.'))
     end
   end
  
@@ -47,11 +47,11 @@ class FeedReaderBlock &lt; Block
  
   def formatted_feed_content
     if error_message.blank?
-      "<ul>\n" +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n") +
-      "</ul>"
+      "<ul>\n".html_safe +
+      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
     else
-      '<p>' + error_message + '</p>'
+      "<p>#{error_message}</p>".html_safe
     end
   end
  
@@ -80,7 +80,7 @@ class LinkListBlock &lt; Block
  
   def icons_options
     ICONS.map do |i|
-      "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>"
+      "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
     end
   end
  
@@ -5,7 +5,7 @@ class OrganizationMailing &lt; Mailing
   end
  
   def recipients(offset=0, limit=100)
-   source.members.all(:order => self.id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+   source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
   end
  
   def each_recipient
@@ -68,7 +68,7 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  named_scope :templates, :conditions => {:is_template => true}
+  named_scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } }
  
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
@@ -49,13 +49,12 @@ class ProfileListBlock &lt; Block
                send(:profile_image_link, item, :minor )
              }.join("\n  ")
       if list.empty?
-        list = '<div class="common-profile-list-block-none">'+ _('None') +'</div>'
+        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
       else
         list = content_tag 'ul', nl +'  '+ list + nl
       end
       block_title(title) + nl +
-      '<div class="common-profile-list-block">' +
-      nl + list + nl + '<br style="clear:both" /></div>'
+      content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))
     end
   end
  
@@ -35,9 +35,9 @@ class TagsBlock &lt; Block
     tagname_option = is_env ? :tag : :id
  
     block_title(title) +
-    "\n<div class='tag_cloud'>\n"+
+    "\n<div class='tag_cloud'>\n".html_safe+
     tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
-    "\n</div><!-- end class='tag_cloud' -->\n";
+    "\n</div><!-- end class='tag_cloud' -->\n".html_safe
   end
  
   def footer
@@ -113,7 +113,7 @@ class UploadedFile &lt; Article
  
           content_tag(
             'div',
-            link_to_previous + content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images] + link_to_next,
+            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
             :class => 'gallery-navigation'
           )
         end.to_s +
@@ -5,7 +5,7 @@
   <% for image in @block.images do %>
     <tr>
       <td>
-        <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i), :style => "width: 100px" %></p>
+        <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe, :style => "width: 100px" %></p>
       </td>
       <td><%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %></td>
       <td><%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %></td>
@@ -17,7 +17,7 @@
  
 <%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
     page.insert_html :bottom, 'highlights', content_tag('tr',
-                  content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name), :style => "width: 100px")) +
+                  content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name).html_safe, :style => "width: 100px")) +
                   content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) +
                   content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) +
                   content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10))
@@ -5,7 +5,7 @@
 <ul class="profile-list">
 <% @favorite_enterprises.each do |enterprise| %>
   <li>
-    <%= link_to_profile profile_image(enterprise) + '<br/>' + enterprise.name,
+    <%= link_to_profile profile_image(enterprise) + '<br/>'.html_safe + enterprise.name,
                         enterprise.identifier, :class => 'profile-link' %>
     <%# profile_image_link enterprise, :portrait, 'div' %>
     <div class="controll">
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
+  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
     <%= submit_button :new, _('Share') %>
   <% end %>
@@ -13,11 +13,11 @@
  
 <% @roles.each do |role| %>
   <% search_url = url_for(:action => 'search_user', :profile => profile.identifier, :role => role.id) %>
-  <% @pre_population ||= profile.members_by_role_to_json(role) %>
+  <% pre_population = params[:action] == 'last_admin' ? [].to_json : profile.members_by_role_to_json(role) %>
   <script type="text/javascript">
     jQuery(<%= ('#search_' + role.key).to_json %>)
     .tokenInput("<%= search_url %>", {
-      prePopulate: <%= @pre_population %>,
+      prePopulate: <%= pre_population %>,
       hintText: <%= _('Type in a search term for users').to_json %>,
       noResultsText: <%= _('No results').to_json %>,
       searchingText: <%= _('Searching...').to_json %>,
@@ -2,9 +2,9 @@
  
 <%= _('Manage the templates used on creation of profiles') %>
  
-<% list_of_templates = [[_('Person')    , Person.templates    , 'person'    ],
-                        [_('Community') , Community.templates , 'community' ],
-                        [_('Enterprise'), Enterprise.templates, 'enterprise']] %>
+<% list_of_templates = [[_('Person')    , Person.templates(environment)    , 'person'    ],
+                        [_('Community') , Community.templates(environment) , 'community' ],
+                        [_('Enterprise'), Enterprise.templates(environment), 'enterprise']] %>
  
 <% list_of_templates.each do |title, templates, kind|%>
   <div class='template-kind'>
@@ -11,17 +11,17 @@
         base_content = image_tag(
           "/designs/templates/#{template.id}/thumbnail.png",
           :alt => _('The "%s" template')) +
-        '<div class="opt-info">' +
+        '<div class="opt-info">'.html_safe +
         content_tag('strong', template.id, :class => 'name') +
-        ' <br/> '
+        ' <br/> '.html_safe
  
         if @current_template == template.id  # selected
           content_tag( 'div',
-            base_content + content_tag('big', _('(current)') ) +'</div>',
+            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
             :class => 'template-opt list-opt selected')
         else  # Not selected
           link_to(
-            base_content +'</div>',
+            base_content +'</div>'.html_safe,
             { :action => 'set_layout_template', :id => template.id },
             :class => 'template-opt list-opt')
         end
@@ -48,17 +48,17 @@
         base_content = image_tag(
           "/designs/themes/#{theme.id}/preview.png",
           :alt => (_('The "%s" theme.') % theme.name)) +
-        '<div class="opt-info">' +
+        '<div class="opt-info">'.html_safe +
         content_tag('strong', theme.name, :class => 'name') +
-        ' <br/> '
+        ' <br/> '.html_safe
  
         if theme.id == @current_theme  # selected
           content_tag( 'div',
-            base_content + content_tag('big', _('(current)') ) +'</div>',
+            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
             :class => 'theme-opt list-opt selected')
         else  # Not selected
           link_to(
-            base_content + '</div>',
+            base_content + '</div>'.html_safe,
             { :action => 'set', :id => theme.id },
             :class => 'theme-opt list-opt')
         end
@@ -1 +0,0 @@
-<%= user_csv.name %>;<%= user_csv.email %>
@@ -1,2 +0,0 @@
-<%= _('name') %>;<%= _('email') %>
-<%= render :partial => 'user_csv', :collection => @users %>
+noosfero (0.41.2) unstable; urgency=low
+
+  * Bugfixes release 
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 17 Apr 2013 16:22:53 -0300
+
 noosfero (0.41.1) unstable; urgency=low
  
   * Bugfixes release
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.41.1'
+  VERSION = '0.41.2'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -13,9 +13,15 @@ class ShoppingCartPluginController &lt; PublicController
   def get
     config =
       if cart.nil?
-        { 'enterprise_id' => nil, 'hasProducts' => false }
+        { :enterprise_id => nil,
+          :has_products => false,
+          :visible => false,
+          :products => []}
       else
-        { 'enterprise_id' => cart[:enterprise_id], 'hasProducts' => (cart[:items].keys.size > 0) }
+        { :enterprise_id => cart[:enterprise_id],
+          :has_products => (cart[:items].keys.size > 0),
+          :visible => visible?,
+          :products => products}
       end
     render :text => config.to_json
   end
@@ -56,16 +62,6 @@ class ShoppingCartPluginController &lt; PublicController
  
   def list
     if validate_cart_presence
-      products = self.cart[:items].collect do |id, quantity|
-        product = Product.find(id)
-        { :id => product.id,
-          :name => product.name,
-          :price => get_price(product, product.enterprise.environment),
-          :description => product.description,
-          :picture => product.default_image(:minor),
-          :quantity => quantity
-        }
-      end
       render :text => {
         :ok => true,
         :error => {:code => 0},
@@ -128,7 +124,7 @@ class ShoppingCartPluginController &lt; PublicController
   end
  
   def visibility
-    render :text => self.cart.has_key?(:visibility) ? self.cart[:visibility].to_json : true.to_json
+    render :text => visible?.to_json
   end
  
   def show
@@ -317,4 +313,31 @@ class ShoppingCartPluginController &lt; PublicController
     :_noosfero_plugin_shopping_cart
   end
  
+  def visible?
+    !self.cart.has_key?(:visibility) || self.cart[:visibility]
+  end
+
+  def products
+    self.cart[:items].collect do |id, quantity|
+      product = Product.find_by_id(id)
+      if product
+        { :id => product.id,
+          :name => product.name,
+          :price => get_price(product, product.enterprise.environment),
+          :description => product.description,
+          :picture => product.default_image(:minor),
+          :quantity => quantity
+        }
+      else
+        { :id => id,
+          :name => _('Undefined product'),
+          :price => 0,
+          :description => _('Wrong product id'),
+          :picture => '',
+          :quantity => quantity
+        }
+      end
+    end
+  end
+
 end
@@ -12,10 +12,6 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
       _("A shopping basket feature for enterprises")
     end
  
-    def enabled_default_setting
-      true
-    end
-
     def delivery_default_setting
       false
     end
@@ -6,50 +6,36 @@ function Cart(config) {
   this.contentBox = $("#cart1 .cart-content");
   this.itemsBox = $("#cart1 .cart-items");
   this.items = {};
-  this.empty = !config.hasProducts;
+  this.empty = !config.has_products;
   this.visible = false;
   $(".cart-buy", this.cartElem).button({ icons: { primary: 'ui-icon-cart'} });
   if (!this.empty) {
     $(this.cartElem).show();
-    me = this;
-    $.ajax({
-      url: '/plugin/shopping_cart/visibility',
-      dataType: 'json',
-      success: function(data, status, ajax){
-        me.visible = /^true$/i.test(data);
-        me.listProducts();
-      },
-      cache: false,
-      error: function(ajax, status, errorThrown) {
-        alert('Visibility - HTTP '+status+': '+errorThrown);
-      }
-    });
-    $(".cart-buy", this.cartElem).colorbox({ href: '/plugin/shopping_cart/buy' });
+    this.visible = config.visible;
+    this.addToList(config.products, true)
   }
 }
  
 (function($){
  
-  Cart.prototype.listProducts = function() {
+  // Forbidding the user to request more the one action on the cart
+  // simultaneously because the cart in the cookie doesn't supports it.
+  Cart.prototype.ajax = function(config){
     var me = this;
-    $.ajax({
-      url: '/plugin/shopping_cart/list',
-      dataType: 'json',
-      success: function(data, ststus, ajax){
-        if ( !data.ok ) alert(data.error.message);
-        else me.addToList(data, true);
-      },
-      cache: false,
-      error: function(ajax, status, errorThrown) {
-        alert('List cart items - HTTP '+status+': '+errorThrown);
-      }
-    });
+    this.disabled = true;
+    var completeCallback = config.complete;
+    config.complete = function(){
+      me.disabled = false;
+      if (completeCallback) completeCallback();
+    };
+    $.ajax(config);
   }
  
-  Cart.prototype.addToList = function(data, clear) {
+  Cart.prototype.addToList = function(products, clear) {
     if( clear ) this.itemsBox.empty();
     var me = this;
-    for( var item,i=0; item=data.products[i]; i++ ) {
+    this.productsLength = products.length;
+    for( var item,i=0; item=products[i]; i++ ) {
       this.items[item.id] = { price:item.price, quantity:item.quantity };
       this.updateTotal();
       var liId = "cart-item-"+item.id;
@@ -75,9 +61,7 @@ function Cart(config) {
       input.onchange = function() {
         me.updateQuantity(this, this.productId, this.value);
       };
-//      document.location.href = "#"+liId;
-//      document.location.href = "#"+this.cartElem.id;
-//      history.go(-2);
+      // TODO: Scroll to newest item
       var liBg = li.css("background-color");
       li[0].style.backgroundColor = "#FF0";
       li.animate({ backgroundColor: liBg }, 1000);
@@ -86,24 +70,25 @@ function Cart(config) {
     if (!clear && this.empty) $(this.cartElem).show();
     if((!clear && this.empty) || (this.visible && clear)) {
       this.contentBox.hide();
-      this.show();
+      this.show(!clear);
     }
     this.empty = false;
   }
  
   Cart.prototype.updateQuantity = function(input, itemId, quantity) {
+    if(this.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
     quantity = parseInt(quantity);
     input.disabled = true;
     var originalBg = input.style.backgroundImage;
     input.style.backgroundImage = "url(/images/loading-small.gif)";
     var me = this;
     if( quantity == NaN ) return input.value = input.lastValue;
-    $.ajax({
+    this.ajax({
       url: '/plugin/shopping_cart/update_quantity/'+ itemId +'?quantity='+ quantity,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) {
-          alert(data.error.message);
+          log.error(data.error);
           input.value = input.lastValue;
         }
         else {
@@ -114,7 +99,7 @@ function Cart(config) {
       },
       cache: false,
       error: function(ajax, status, errorThrown) {
-        alert('Add item - HTTP '+status+': '+errorThrown);
+        log.error('Add item - HTTP '+status, errorThrown);
         input.value = input.lastValue;
       },
       complete: function(){
@@ -132,89 +117,103 @@ function Cart(config) {
   }
  
   Cart.addItem = function(itemId, link) {
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if ( this.productsLength > 100 ) {
+      // This limit protect the user from losing data on cookie limit.
+      // This is NOT limiting to 100 products, is limiting to 100 kinds of products.
+      alert(shoppingCartPluginL10n.maxNumberOfItens);
+      return false;
+    }
     link.intervalId = setInterval(function() {
+      $(link).addClass('loading');
       steps = ['w', 'n', 'e', 's'];
       if( !link.step || link.step==3 ) link.step = 0;
       link.step++;
-      $(link).button({ icons: { primary: 'ui-icon-arrowrefresh-1-'+steps[link.step]}, disable: true })
+      $(link).button({ icons: { primary: 'ui-icon-arrowrefresh-1-'+steps[link.step]}})
     }, 100);
     var stopBtLoading = function() {
       clearInterval(link.intervalId);
-      $(link).button({ icons: { primary: 'ui-icon-cart'}, disable: false });
+      $(link).removeClass('loading');
+      $(link).button({ icons: { primary: 'ui-icon-cart'}});
     };
     this.instance.addItem(itemId, stopBtLoading);
   }
  
   Cart.prototype.addItem = function(itemId, callback) {
     var me = this;
-    $.ajax({
+    this.ajax({
       url: '/plugin/shopping_cart/add/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
-        if ( !data.ok ) alert(data.error.message);
-        else me.addToList(data);
+        if ( !data.ok ) log.error('Shopping cart data failure', data.error);
+        else me.addToList(data.products);
       },
       cache: false,
       error: function(ajax, status, errorThrown) {
-        alert('Add item - HTTP '+status+': '+errorThrown);
+        log.error('Add item - HTTP '+status, errorThrown);
       },
       complete: callback
     });
   }
  
   Cart.removeItem = function(itemId) {
-    var message = this.instance.cartElem.getAttribute('data-l10nRemoveItem');
-    if( confirm(message) ) this.instance.removeItem(itemId);
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if( confirm(shoppingCartPluginL10n.removeItem) ) this.instance.removeItem(itemId);
   }
  
   Cart.prototype.removeItem = function(itemId) {
     if ($("li", this.itemsBox).size() < 2) return this.clean();
     var me = this;
-    $.ajax({
+    this.ajax({
       url: '/plugin/shopping_cart/remove/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
-        if ( !data.ok ) alert(data.error.message);
+        if ( !data.ok ) log.error(data.error);
         else me.removeFromList(data.product_id);
       },
       cache: false,
       error: function(ajax, status, errorThrown) {
-        alert('Remove item - HTTP '+status+': '+errorThrown);
+        log.error('Remove item - HTTP '+status, errorThrown);
       }
     });
   }
  
   Cart.toggle = function(link) {
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
     link.parentNode.parentNode.cartObj.toggle();
   }
   Cart.prototype.toggle = function() {
-    this.visible ? this.hide() : this.show();
+    this.visible ? this.hide(true) : this.show(true);
   }
  
-  Cart.prototype.show = function() {
-    $.ajax({
-      url: '/plugin/shopping_cart/show',
-      dataType: 'json',
-      cache: false,
-      error: function(ajax, status, errorThrown) {
-        alert('Show - HTTP '+status+': '+errorThrown);
-      }
-    });
+  Cart.prototype.show = function(register) {
+    if(register) {
+      this.ajax({
+        url: '/plugin/shopping_cart/show',
+        dataType: 'json',
+        cache: false,
+        error: function(ajax, status, errorThrown) {
+          log.error('Show - HTTP '+status, errorThrown);
+        }
+      });
+    }
     this.visible = true;
     this.contentBox.slideDown(500);
     $(".cart-toggle .str-show", this.cartElem).hide();
     $(".cart-toggle .str-hide", this.cartElem).show();
  
   }
-  Cart.prototype.hide = function() {
-    $.ajax({
-      url: '/plugin/shopping_cart/hide',
-      dataType: 'json',
-      cache: false,
-      error: function(ajax, status, errorThrown) {
-        alert('Hide - HTTP '+status+': '+errorThrown);
-      }
-    });
+  Cart.prototype.hide = function(register) {
+    if(register) {
+      this.ajax({
+        url: '/plugin/shopping_cart/hide',
+        dataType: 'json',
+        cache: false,
+        error: function(ajax, status, errorThrown) {
+          log.error('Hide - HTTP '+status, errorThrown);
+        }
+      });
+    }
     this.visible = false;
     this.contentBox.slideUp(500);
     $(".cart-toggle .str-show", this.cartElem).show();
@@ -238,17 +237,17 @@ function Cart(config) {
   }
  
   Cart.clean = function(link) {
-    var message = this.instance.cartElem.getAttribute('data-l10nCleanCart');
-    if( confirm(message) ) link.parentNode.parentNode.parentNode.cartObj.clean();
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if( confirm(shoppingCartPluginL10n.cleanCart) ) link.parentNode.parentNode.parentNode.cartObj.clean();
   }
  
   Cart.prototype.clean = function() {
     var me = this;
-    $.ajax({
+    this.ajax({
       url: '/plugin/shopping_cart/clean',
       dataType: 'json',
       success: function(data, status, ajax){
-        if ( !data.ok ) alert(data.error.message);
+        if ( !data.ok ) log.error(data.error);
         else{
           me.items = {};
           $(me.cartElem).slideUp(500, function() {
@@ -261,7 +260,7 @@ function Cart(config) {
       },
       cache: false,
       error: function(ajax, status, errorThrown) {
-        alert('Remove item - HTTP '+status+': '+errorThrown);
+        log.error('Remove item - HTTP '+status, errorThrown);
       }
     });
   }
@@ -274,7 +273,7 @@ function Cart(config) {
  
   Cart.prototype.send_request = function(params) {
     var me = this;
-    $.ajax({
+    this.ajax({
       type: 'POST',
       url: '/plugin/shopping_cart/send_request',
       data: params,
@@ -288,7 +287,7 @@ function Cart(config) {
       },
       cache: false,
       error: function(ajax, status, errorThrown) {
-        alert('Send request - HTTP '+status+': '+errorThrown);
+        log.error('Send request - HTTP '+status, errorThrown);
       },
       complete: function() {
         $.colorbox.close();
@@ -300,6 +299,11 @@ function Cart(config) {
     $.colorbox.close();
   }
  
+  $(window).bind('beforeunload', function(){
+    log('Page unload.');
+    Cart.unloadingPage = true;
+  });
+
   $(function(){
  
     $.ajax({
@@ -311,7 +315,18 @@ function Cart(config) {
       },
       cache: false,
       error: function(ajax, status, errorThrown) {
-        alert('Error getting shopping cart - HTTP '+status+': '+errorThrown);
+        // Give some time to register page unload.
+        setTimeout(function() {
+          // page unload is not our problem.
+          if (Cart.unloadingPage) {
+            log('Page unload before cart load.');
+          } else {
+            log.error('Error getting shopping cart - HTTP '+status, errorThrown);
+            if ( confirm(shoppingCartPluginL10n.getProblemConfirmReload) ) {
+              document.location.reload();
+            }
+          }
+        }, 100);
       }
     });
   });
@@ -26,4 +26,10 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
  
     assert_nil shopping_cart.add_to_cart_button(product)
   end
+
+  should 'be disabled by default on the enterprise' do
+    enterprise = fast_create(Enterprise)
+    settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    assert !settings.enabled
+  end
 end
-<div id="cart1" class="cart" style="display:none"
-  data-l10nRemoveItem="<%=_('Are you sure you want to remove this item?')%>"
-  data-l10nCleanCart="<%=_('Are you sure you want to clean your basket?')%>">
+<div id="cart1" class="cart" style="display:none">
   <div class="cart-inner">
     <div class="cart-content">
       <h3><%= _("Basket") %></h3>
       <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a>
       <ul class="cart-items"></ul>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
-      <a href="/plugin/shopping_cart/buy" class="cart-buy"><%=_('Shopping checkout')%></a>
+      <a href="/plugin/shopping_cart/buy" class="cart-buy colorbox"><%=_('Shopping checkout')%></a>
     </div>
     <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
       <span class="str-show"><%=_('Show basket')%></span>
@@ -15,3 +13,18 @@
     </a>
   </div>
 </div>
+<script>
+  var shoppingCartPluginL10n = {
+    getProblemConfirmReload: <%= (
+      _('Ups... I had a problem to load the basket list.') +
+      "\n" +
+      _('Did you want to reload this page?')
+    ).to_json %>,
+    maxNumberOfItens: <%= (
+      _('Sorry, you can\'t have more then 100 kinds of items on this basket.')
+    ).to_json %>,
+    waitLastRequest: <%= _('Oops, you must wait your last request to finish first!').to_json %>,
+    removeItem: <%= _('Are you sure you want to remove this item?').to_json %>,
+    cleanCart: <%= _('Are you sure you want to clean your basket?').to_json %>
+  }
+</script>
@@ -8,7 +8,7 @@
       <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
       <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @enterprise.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %>
       <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('Check'), :check]]))) %>
-      <%= labelled_form_field(_('Change'), text_field_tag('customer[change]')) %>
+      <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %>
     </div>
     <% if @settings.delivery %>
       <fieldset><legend><%=_('Delivery Address')%></legend>
@@ -9345,11 +9345,9 @@ msgid &quot;&lt;span class=&#39;login&#39;&gt;%s&lt;/span&gt;&quot;
 msgstr "<span class='welcome'>Bienvenido,</span> %s"
  
 #: app/views/layouts/application-ng.rhtml:68
-#, fuzzy
 msgid "<span class='or'>or</span> <span class='signup'>%s</span>"
 msgstr ""
-"<span class='login'>%s</span> <span class='or'>or</span> <span "
-"class='signup'>%s</span>"
+"<span class='or'>o</span> <span class='signup'>%s</span>"
  
 #: app/views/layouts/application-ng.rhtml:68
 msgid "Sign up"
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.39.3\n"
 "POT-Creation-Date: 2013-01-19 21:42-0000\n"
-"PO-Revision-Date: 2013-01-19 21:55+0000\n"
+"PO-Revision-Date: 2013-03-13 17:47-0300\n"
 "Last-Translator: Rodrigo Souto <rodrigo@colivre.coop.br>\n"
 "Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
 "Language: \n"
@@ -9205,7 +9205,7 @@ msgstr &quot;&lt;span class=&#39;login&#39;&gt;%s&lt;/span&gt;&quot;
  
 #: app/views/layouts/application-ng.rhtml:68
 msgid "<span class='or'>or</span> <span class='signup'>%s</span>"
-msgstr "<span class='or'>or</span> <span class='signup'>%s</span>"
+msgstr "<span class='or'>ou</span> <span class='signup'>%s</span>"
  
 #: app/views/layouts/application-ng.rhtml:68
 msgid "Sign up"
@@ -11086,6 +11086,10 @@ msgstr &quot;Tempo de tolerância para edição de comentários&quot;
 msgid "Empty means unlimited and zero means right away."
 msgstr "Vazio significa ilimitado e zero significa imediatamente."
  
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11
+msgid "shopping_cart|Change"
+msgstr "Troco"
+
 #: plugins/shopping_cart/views/cart.html.erb:2
 msgid "Are you sure you want to remove this item?"
 msgstr "Tem certeza de que quer excluir este ítem?"
@@ -11163,7 +11167,6 @@ msgstr &quot;Pagamento&quot;
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20
-#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11
 #, fuzzy
 msgid "Change"
 msgstr "Mudar imagem"
@@ -129,9 +129,9 @@ function hideOthersIconSelector(current_div) {
 }
  
 function loading(element_id, message) {
-   $(element_id).addClassName('loading');
+   jQuery(element_id).addClass('loading');
    if (message) {
-      $(element_id).update(message);
+      jQuery(element_id).html(message);
    }
 }
 function small_loading(element_id, message) {
@@ -141,9 +141,9 @@ function small_loading(element_id, message) {
    }
 }
 function loading_done(element_id) {
-   $(element_id).removeClassName('loading');
-   $(element_id).removeClassName('small-loading');
-   $(element_id).removeClassName('small-loading-dark');
+   jQuery(element_id).removeClass('loading');
+   jQuery(element_id).removeClass('small-loading');
+   jQuery(element_id).removeClass('small-loading-dark');
 }
 function open_loading(message) {
    jQuery('body').append("<div id='overlay_loading' class='ui-widget-overlay' style='display: none'/><div id='overlay_loading_modal' style='display: none'><p>"+message+"</p><img src='/images/loading-dark.gif'/></div>");
@@ -937,13 +937,55 @@ function facet_options_toggle(id, url) {
   });
 }
  
+if ( !console ) console = {};
+if ( !console.log ) console.log = function(){};
+
+// Two ways to call it:
+// log(mixin1[, mixin2[, ...]]);
+// log('<type>', mixin1[, mixin2[, ...]]);
+// Where <type> may be: log, info warn, or error
+window.log = function log() {
+  var type = arguments[0];
+  var argsClone = jQuery.merge([], arguments); // cloning the read-only arguments array.
+  if ( ['info', 'warn', 'error'].indexOf(type) == -1 ) {
+    type = 'log';
+  } else {
+    argsClone.shift();
+  }
+  var method = type;
+  if ( !console[method] ) method = 'log';
+  console[method].apply( console, jQuery.merge([(new Date).toISOString()], argsClone) );
+}
+
+// Call log.info(mixin1[, mixin2[, ...]]);
+log.info = function() {
+  window.log.apply(window, jQuery.merge(['info'], arguments));
+}
+
+// Call log.warn(mixin1[, mixin2[, ...]]);
+log.warn = function() {
+  window.log.apply(window, jQuery.merge(['warn'], arguments));
+}
+
+// Call log.error(mixin1[, mixin2[, ...]]);
+log.error = function() {
+  window.log.apply(window, jQuery.merge(['error'], arguments));
+}
+
 jQuery(function($) {
   $('.colorbox').live('click', function() {
-    $.fn.colorbox({
-      href:$(this).attr('href'),
-      maxWidth: '600',
-      maxHeight: '550',
-      open:true
+    $.colorbox({
+      href:       $(this).attr('href'),
+      maxWidth:   $(window).width()-50,
+      height:     $(window).height()-50,
+      open:       true,
+      fixed:      true,
+      close:      'Cancel',
+      onComplete: function(bt) {
+        var opt = {}, maxH = $(window).height()-50;
+        if ($('#cboxLoadedContent *:first').height() > maxH) opt.height = maxH;
+        $.colorbox.resize(opt);
+      }
     });
     return false;
   });
@@ -5222,6 +5222,9 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 #leave_scrap textarea {
   overflow: hidden;
 }
+#leave_scrap .loading textarea {
+  background: url('/images/loading-small.gif') 50% 50% no-repeat;
+}
 .profile-send-reply {
   color: #aaa;
 }
@@ -579,6 +579,21 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_equal 1, assigns(:user).person.boxes[0].blocks.size
   end
  
+  should 'display only templates of the current environment' do
+    env2 = fast_create(Environment)
+
+    template1 = fast_create(Person, :name => 'template1', :environment_id => Environment.default.id, :is_template => true)
+    template2 = fast_create(Person, :name => 'template2', :environment_id => Environment.default.id, :is_template => true)
+    template3 = fast_create(Person, :name => 'template3', :environment_id => env2.id, :is_template => true)
+
+    get :signup
+    assert_select '#template-options' do |elements|
+      assert_match /template1/, elements[0].to_s
+      assert_match /template2/, elements[0].to_s
+      assert_no_match /template3/, elements[0].to_s
+    end
+  end
+
   should 'render person partial' do
     Environment.any_instance.expects(:signup_person_fields).returns(['contact_phone']).at_least_once
     get :signup
@@ -1082,7 +1082,7 @@ end
     textile     = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
     translation = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'translation', :language => 'es', :translation_of_id => textile)
     xhr :get, :view_page, :profile => @profile.identifier, :page => textile.explode_path, :toolbar => true
-    assert_tag :a, :attributes => { :class => /article-translations-menu/, :onclick => /toggleSubmenu/ }
+    assert_tag :a, :attributes => { :class => /article-translations-menu/, :onmouseover => /toggleSubmenu/ }
   end
  
   should 'not be redirected if already in translation' do
@@ -203,4 +203,21 @@ class EnterpriseRegistrationControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => {:id => 'create_enterprise_plugin1', :type => 'hidden', :value => 'Plugin 1'}
     assert_tag :tag => 'input', :attributes => {:id => 'create_enterprise_plugin2', :type => 'hidden', :value => 'Plugin 2'}
   end
+
+  should 'display only templates of the current environment' do
+    env2 = fast_create(Environment)
+
+    template1 = fast_create(Enterprise, :name => 'template1', :environment_id => Environment.default.id, :is_template => true)
+    template2 = fast_create(Enterprise, :name => 'template2', :environment_id => Environment.default.id, :is_template => true)
+    template3 = fast_create(Enterprise, :name => 'template3', :environment_id => env2.id, :is_template => true)
+
+    get :index
+
+    assert_select '#template-options' do |elements|
+      assert_match /template1/, elements[0].to_s
+      assert_match /template2/, elements[0].to_s
+      assert_no_match /template3/, elements[0].to_s
+    end
+  end
+
 end
@@ -154,6 +154,22 @@ class MembershipsControllerTest &lt; ActionController::TestCase
     assert_equal 1, assigns(:community).boxes[0].blocks.size
   end
  
+  should 'display only templates of the current environment' do
+    env2 = fast_create(Environment)
+
+    template1 = fast_create(Community, :name => 'template1', :environment_id => Environment.default.id, :is_template => true)
+    template2 = fast_create(Community, :name => 'template2', :environment_id => Environment.default.id, :is_template => true)
+    template3 = fast_create(Community, :name => 'template3', :environment_id => env2.id, :is_template => true)
+
+    get :new_community, :profile => profile.identifier
+
+    assert_select '#template-options' do |elements|
+      assert_match /template1/, elements[0].to_s
+      assert_match /template2/, elements[0].to_s
+      assert_no_match /template3/, elements[0].to_s
+    end
+  end
+
   should 'display only required fields when register new community' do
     env = Environment.default
     env.custom_community_fields = {
@@ -42,6 +42,7 @@ class UsersControllerTest &lt; ActionController::TestCase
  
     get :index, :format => 'csv'
     assert_equal 'text/csv', @response.content_type
+    assert_equal 'name;email', @response.body.split("\n")[0]
   end
  
 end
@@ -243,6 +243,7 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
   end
  
   should 'not display templates options when there is no template' do
+    self.stubs(:environment).returns(Environment.default)
     [Person, Community, Enterprise].each do |klass|
       assert_equal '', template_options(klass, 'profile_data')
     end
@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlogHelperTest < ActiveSupport::TestCase
+
+  include BlockHelper
+  include ActionView::Helpers::TagHelper
+
+  should 'escape title html' do
+    assert_no_match /<b>/, block_title('<b>test</b>')
+    assert_match /&lt;b&gt;test&lt;\/b&gt;/, block_title('<b>test</b>')
+  end
+
+end
@@ -66,6 +66,12 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
     assert_equal 2, ActionMailer::Base.deliveries.count
   end
  
+  should 'deliver mailing when there are many mailings created' do
+    50.times { OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person) }
+    process_delayed_job_queue
+    assert_equal 50*community.members_count, ActionMailer::Base.deliveries.count
+  end
+
   should 'create mailing sent to each recipient after delivering mailing' do
     mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     assert_difference MailingSent, :count, 2 do
@@ -1444,9 +1444,9 @@ class ProfileTest &lt; ActiveSupport::TestCase
     t2 = fast_create(Profile, :is_template => true)
     profile = fast_create(Profile)
  
-    assert_includes Profile.templates, t1
-    assert_includes Profile.templates, t2
-    assert_not_includes Profile.templates, profile
+    assert_includes Profile.templates(Environment.default), t1
+    assert_includes Profile.templates(Environment.default), t2
+    assert_not_includes Profile.templates(Environment.default), profile
   end
  
   should 'provide URL to leave' do
...	...	@@ -148,6 +148,7 @@ Rodrigo Souto <rodrigo@colivre.coop.br>
148	148	Ronny Kursawe <kursawe.ronny@googlemail.com>
149	149	Samuel R. C. Vale <srcvale@holoscopio.com>
150	150	Valessio Brito <valessio@gmail.com>
	151	+Visita <visita@debian.(none)>
151	152	Yann Lugrin <yann.lugrin@liquid-concept.ch>
152	153
153	154	Ideas, specifications and incentive
...	...
	1	+require 'csv'
	2	+
1	3	class UsersController < AdminController
2	4
3	5	protect 'manage_environment_users', :environment
...	...	@@ -15,8 +17,16 @@ class UsersController < AdminController
15	17	:disposition => "attachment; filename=users.xml"
16	18	end
17	19	format.csv do
18		- @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
19		- render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
	20	+ # using a direct connection with the dbms to optimize
	21	+ command = User.send(:sanitize_sql, ["SELECT profiles.name, users.email FROM profiles
	22	+ INNER JOIN users ON profiles.user_id=users.id
	23	+ WHERE profiles.environment_id = ?", environment.id])
	24	+ users = User.connection.execute(command)
	25	+ csv_content = "name;email\n"
	26	+ users.each { \|u\|
	27	+ CSV.generate_row([u['name'], u['email']], 2, csv_content, fs=';')
	28	+ }
	29	+ render :text => csv_content, :content_type => 'text/csv', :layout => false
20	30	end
21	31	end
22	32	end
...	...
...	...	@@ -32,7 +32,6 @@ class ProfileMembersController < MyProfileController
32	32
33	33	def last_admin
34	34	@roles = [Profile::Roles.admin(environment.id)]
35		- @pre_population = [].to_json
36	35	end
37	36
38	37	def add_role
...	...
...	...	@@ -495,23 +495,24 @@ module ApplicationHelper
495	495
496	496	def profile_cat_icons( profile )
497	497	if profile.class == Enterprise
498		- icons =
499		- profile.product_categories.map{ \|c\| c.size > 1 ? c[1] : nil }.
500		- compact.uniq.map{ \|c\|
501		- cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
502		- cat_icon = "/images/icons-cat/#{cat_name}.png"
503		- if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
504		- cat_icon = '/images/icons-cat/undefined.png'
505		- end
506		- content_tag 'span',
507		- content_tag( 'span', c ),
508		- :title => c,
509		- :class => 'product-cat-icon cat_icon_' + cat_name,
510		- :style => "background-image:url(#{cat_icon})"
511		- }.join "\n"
512		- content_tag 'div',
513		- content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
514		- :class => 'product-category-icons'
	498	+ icons = profile.product_categories.map{ \|c\| c.size > 1 ? c[1] : nil }.
	499	+ compact.uniq.map do \|c\|
	500	+ cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
	501	+ cat_icon = "/images/icons-cat/#{cat_name}.png"
	502	+ if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
	503	+ cat_icon = '/images/icons-cat/undefined.png'
	504	+ end
	505	+ content_tag('span',
	506	+ content_tag( 'span', c ),
	507	+ :title => c,
	508	+ :class => 'product-cat-icon cat_icon_' + cat_name,
	509	+ :style => "background-image:url(#{cat_icon})"
	510	+ )
	511	+ end.join("\n").html_safe
	512	+ content_tag('div',
	513	+ content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
	514	+ :class => 'product-category-icons'
	515	+ )
515	516	else
516	517	''
517	518	end
...	...	@@ -635,10 +636,10 @@ module ApplicationHelper
635	636	# FIXME
636	637	([toplevel] + toplevel.children_for_menu).each do \|cat\|
637	638	if cat.top_level?
638		- result << '<div class="categorie_box">'
	639	+ result << '<div class="categorie_box">'.html_safe
639	640	result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
640	641	result << content_tag('h5', toplevel.name)
641		- result << '<div style="display:none"><ul class="categories">'
	642	+ result << '<div style="display:none"><ul class="categories">'.html_safe
642	643	else
643	644	checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+\|\//, '_')}"
644	645	result << content_tag('li', labelled_check_box(
...	...	@@ -649,7 +650,7 @@ module ApplicationHelper
649	650	:class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
650	651	end
651	652	end
652		- result << '</ul></div></div>'
	653	+ result << '</ul></div></div>'.html_safe
653	654	end
654	655
655	656	content_tag('div', result)
...	...	@@ -789,10 +790,10 @@ module ApplicationHelper
789	790	:class => 'lineitem' + (line_item+=1).to_s() ) +"\n"
790	791	if line_item == line_size
791	792	line_item = 0
792		- html += "<br />\n"
	793	+ html += "<br />\n".html_safe
793	794	end
794	795	}
795		- html += "<br />\n" if line_size == 0 \|\| ( values.size % line_size ) > 0
	796	+ html += "<br />\n".html_safe if line_size == 0 \|\| ( values.size % line_size ) > 0
796	797	column = object.class.columns_hash[method.to_s]
797	798	text =
798	799	( column ?
...	...	@@ -930,7 +931,7 @@ module ApplicationHelper
930	931	end
931	932
932	933	def link_to_email(email)
933		- javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") + "</a>")')
	934	+ javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") + "</a>")'.html_safe)
934	935	end
935	936
936	937	def stylesheet(*args)
...	...	@@ -940,7 +941,7 @@ module ApplicationHelper
940	941	def article_to_html(article, options = {})
941	942	options.merge!(:page => params[:npage])
942	943	content = article.to_html(options)
943		- content = content.kind_of?(Proc) ? self.instance_eval(&content) : content
	944	+ content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe
944	945	@plugins && @plugins.each do \|plugin\|
945	946	content = plugin.parse_content(content)
946	947	end
...	...	@@ -986,7 +987,7 @@ module ApplicationHelper
986	987	end
987	988
988	989	def ui_icon(icon_class, extra_class = '')
989		- "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>"
	990	+ "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>".html_safe
990	991	end
991	992
992	993	def ui_button(label, url, html_options = {})
...	...	@@ -1014,13 +1015,13 @@ module ApplicationHelper
1014	1015	end
1015	1016
1016	1017	def collapsed_item_icon
1017		- "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>"
	1018	+ "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>".html_safe
1018	1019	end
1019	1020	def expanded_item_icon
1020		- "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>"
	1021	+ "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>".html_safe
1021	1022	end
1022	1023	def leaf_item_icon
1023		- "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>"
	1024	+ "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>".html_safe
1024	1025	end
1025	1026
1026	1027	def display_category_menu(block, categories, root = true)
...	...	@@ -1279,9 +1280,7 @@ module ApplicationHelper
1279	1280	titles = tabs.inject(''){ \|result, tab\| result << content_tag(:li, link_to(tab[:title], '#'+tab[:id]), :class => 'tab') }
1280	1281	contents = tabs.inject(''){ \|result, tab\| result << content_tag(:div, tab[:content], :id => tab[:id]) }
1281	1282
1282		- content_tag :div, :class => 'ui-tabs' do
1283		- content_tag(:ul, titles) + contents
1284		- end
	1283	+ content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
1285	1284	end
1286	1285
1287	1286	def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
...	...	@@ -1310,11 +1309,12 @@ module ApplicationHelper
1310	1309	end
1311	1310
1312	1311	def template_options(klass, field_name)
1313		- return '' if klass.templates.count == 0
1314		- return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
	1312	+ templates = klass.templates(environment)
	1313	+ return '' if templates.count == 0
	1314	+ return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
1315	1315
1316	1316	counter = 0
1317		- radios = klass.templates.map do \|template\|
	1317	+ radios = templates.map do \|template\|
1318	1318	counter += 1
1319	1319	content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1))
1320	1320	end.join("\n")
...	...
...	...	@@ -3,7 +3,7 @@ module BlockHelper
3	3	def block_title(title)
4	4	tag_class = 'block-title'
5	5	tag_class += ' empty' if title.empty?
6		- content_tag 'h3', content_tag('span', title), :class => tag_class
	6	+ content_tag 'h3', content_tag('span', h(title)), :class => tag_class
7	7	end
8	8
9	9	end
...	...
...	...	@@ -46,7 +46,7 @@ module ContentViewerHelper
46	46	{ article.environment.locales[translation.language] => { :href => url_for(translation.url) } }
47	47	end
48	48	content_tag(:div, link_to(_('Translations'), '#',
49		- :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
	49	+ :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
50	50	:class => 'article-translations-menu simplemenu-trigger up'),
51	51	:class => 'article-translations')
52	52	end
...	...
...	...	@@ -136,7 +136,7 @@ module ProfileEditorHelper
136	136	concat(
137	137	content_tag(
138	138	'div',
139		- capture(&block) + '<br style="clear:left;"/> ',
	139	+ capture(&block) + content_tag('br', '', :style => 'clear: left'),
140	140	:class => 'control-panel')
141	141	)
142	142	end
...	...
...	...	@@ -68,7 +68,7 @@ module TagsHelper
68	68	:title => n_( 'one item', '%d items', count ) % count
69	69	end
70	70
71		- end.join("\n")
	71	+ end.join("\n").html_safe
72	72	end
73	73
74	74	end
...	...
...	...	@@ -16,7 +16,7 @@ class ArticleBlock < Block
16	16	:gallery_view => false,
17	17	:inside_block => block, # For Blogs and folders
18	18	:format => block.visualization_format # For Articles and contents
19		- ) : _('Article not selected yet.'))
	19	+ ).html_safe : _('Article not selected yet.'))
20	20	end
21	21	end
22	22
...	...
...	...	@@ -47,11 +47,11 @@ class FeedReaderBlock < Block
47	47
48	48	def formatted_feed_content
49	49	if error_message.blank?
50		- "<ul>\n" +
51		- self.feed_items[0..(limit-1)].map{ \|item\| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n") +
52		- "</ul>"
	50	+ "<ul>\n".html_safe +
	51	+ self.feed_items[0..(limit-1)].map{ \|item\| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
	52	+ "</ul>".html_safe
53	53	else
54		- '<p>' + error_message + '</p>'
	54	+ "<p>#{error_message}</p>".html_safe
55	55	end
56	56	end
57	57
...	...