html_safe: Always return button_bar value to template

Braulio Bhavamitra
1 parent 54bc457e
Showing 173 changed files with 242 additions and 259 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/buttons_helper.rb
app/views/account/_login_form.html.erb
app/views/account/accept_terms.html.erb
app/views/account/activation_question.html.erb
app/views/account/forgot_password.html.erb
app/views/account/login.html.erb
app/views/account/login_block.html.erb
app/views/account/logout_popup.html.erb
app/views/account/new_password.html.erb
app/views/account/welcome.html.erb
app/views/admin_panel/message_for_disabled_enterprise.html.erb
app/views/admin_panel/set_portal_community.html.erb
app/views/admin_panel/set_portal_folders.html.erb
app/views/admin_panel/set_portal_news_amount.html.erb
app/views/admin_panel/site_info.html.erb
app/views/box_organizer/edit.html.erb
app/views/box_organizer/index.html.erb
app/views/categories/_form.html.erb
app/views/cms/_media_new_folder.html.erb
@@ -233,13 +233,6 @@ module ApplicationHelper
     link_to(content_tag('span', text), url, html_options.merge(:class => the_class, :title => text))
   end
  
-  def button_bar(options = {}, &block)
-    options[:class].nil? ?
-      options[:class]='button-bar' :
-      options[:class]+=' button-bar'
-    concat(content_tag('div', capture(&block).to_s + tag('br', :style => 'clear: left;'), options))
-  end
-
   def render_profile_actions klass
     name = klass.to_s.underscore
     begin
 module ButtonsHelper
+
+  def button_bar(options = {}, &block)
+    options[:class] ||= ''
+    options[:class] << ' button-bar'
+
+    content_tag :div, options do
+      [
+        capture(&block).to_s,
+        tag(:br, style: 'clear: left;'),
+      ].safe_join
+    end
+  end
+
   def button(type, label, url, html_options = {})
     html_options ||= {}
     the_class = 'with-text'
@@ -11,7 +11,7 @@
   <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= submit_button( 'login', _('Log in') )%>
   <%= modal_close_button _('Cancel') if request.xhr? %>
 <% end %>
@@ -20,7 +20,7 @@
     <%= hidden_field_tag :answer, params[:answer] %>
  
     <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :id => 'accept-terms') %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
       <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
     <% end %>
@@ -24,7 +24,7 @@
  
 <div class='activation-box'>
   <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
-  <%= form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> 
+  <%= form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %>
  
   <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
  
@@ -34,7 +34,7 @@
  
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button 'cancel', _('Cancel'), :action => 'index' %>
       <%= submit_button 'forward', _('Continue') %>
     <% end %>
@@ -9,7 +9,7 @@
   <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
  
   <div>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button('send', _('Send instructions')) %>
     <% end %>
   </div>
@@ -22,7 +22,7 @@
  
      <%= safe_join(@plugins.dispatch(:login_extra_contents).collect { |content| instance_exec(&content) }, "") %>
  
-     <% button_bar do %>
+     <%= button_bar do %>
        <%= submit_button( 'login', _('Log in') )%>
        <% if is_popin %>
          <%= modal_close_button(_('Cancel')) %>
@@ -31,7 +31,7 @@
  
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
     <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
   <% end %>
@@ -17,7 +17,7 @@
  
       <%= safe_join(@plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }, "") %>
  
-      <% button_bar do %>
+      <%= button_bar do %>
         <%= submit_button( 'login', _('Log in') )%>
         <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
           <%= button(:add, _('New user'), { :controller => 'account', :action => 'signup' }) %>
 <h2><%= _('Are you sure you want to get out?') %></h2>
 <p>
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
   <%= modal_close_button _('No, I want to stay.') %>
 <% end %>
@@ -10,7 +10,7 @@
  
   <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
   <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:ok, _('Change password')) %>
   <% end %>
  
@@ -3,8 +3,8 @@
  
   <%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
  
-  <% button_bar do %>
-    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %> 
+  <%= button_bar do %>
+    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %>
     <%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
   <% end %>
 <% end %>
@@ -6,7 +6,7 @@
  
   <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
     <%= button(:cancel, _('Cancel'), :action => 'index') %>
   <% end %>
@@ -4,14 +4,14 @@
   <%= form_tag do %>
     <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
     <% end %>
   <% end %>
 <% else %>
   <%= _('Portal identifier: %s').html_safe % link_to(@portal_community.identifier, @portal_community.url) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%if @portal_community.environment.enabled?('use_portal_community') %>
       <%= button 'cancel', _('Disable'), {:action => 'manage_portal_community', :activate => 0} %>
     <% else %>
@@ -37,7 +37,7 @@
     <%= _('The same order in which you arrange the folders here will be used for arranging the boxes in the environment initial page.') %>
   </p>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button 'save', _('Save'), :cancel => {:action => 'index'} %>
   <% end %>
 <% end %>
@@ -6,7 +6,7 @@
   <%= labelled_form_field _('Number of portal news'), select(:environment, :portal_news_amount, (0..10).to_a) %>
   <%= labelled_form_field _('Number of news by folder'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
     <%= button(:cancel, _('Cancel'), :action => 'index') %>
   <% end %>
@@ -20,7 +20,7 @@
   <% tabs << {:title => _('Signup introduction text'), :id => 'signup-intro',
     :content => (render :partial => 'signup_intro', :locals => {:f => f})} %>
   <%= render_tabs(tabs) %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
@@ -35,7 +35,7 @@
       </div>
     <% end %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= modal_close_button(_('Cancel')) %>
     <% end %>
@@ -3,7 +3,7 @@
  
 <h1><%= _('Editing sideboxes')%></h1>
  
-<% button_bar :class=>'design-menu' do %>
+<%= button_bar :class=>'design-menu' do %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
  
@@ -28,7 +28,7 @@
     <%= file_field_or_thumbnail(_('Image:'), @category.image, i) %>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
   <% end%>
 <% end %>
@@ -9,7 +9,7 @@
   <%= labelled_radio_button _('Folder'), :folder_type, 'Folder', false %>
  
   <%= labelled_form_field _('Name:'), text_field_tag(:new_folder, nil, 'data-url' => url_for({:action => 'new', :profile => profile.identifier})) %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:newfolder, _('Create')) %>
   <% end %>
 <% end %>
@@ -12,7 +12,7 @@
  
 <%= hidden_field_tag('back_to', @back_to) %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button_to_function :add, _('More files'), "add_new_file_fields()" %>
   <% if @back_to %>
     <%= submit_button :save, _('Upload'), :cancel => @back_to %>
@@ -12,7 +12,7 @@
     <% end %>
   </strong>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Yes, I want.') %>
     <%= button :cancel, _("No, I don't want."), @article.url %>
   <% end %>
@@ -21,7 +21,7 @@
     </div>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= submit_button :save, _('Save and continue'), :name => "continue" %>
   <% end %>
@@ -48,7 +48,7 @@
     <%= options_for_article(@article, @tokenized_children) %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
  
     <% if @back_to %>
@@ -25,7 +25,7 @@
         <%= hidden_field_tag :back_to, @back_to %>
         <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
  
-        <% button_bar do %>
+        <%= button_bar do %>
           <%= submit_button 'spread', _('Spread this') %>
         <% end %>
       <% end %>
@@ -41,7 +41,7 @@
         <% search_action = url_for(:action => 'search_communities_to_publish') %>
         <%= token_input_field_tag(:q, 'search-communities-to-publish', search_action, { :hint_text => _('Type in a search for your community'), :zindex => 10000, :focus => false }) %>
         <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
-        <% button_bar do %>
+        <%= button_bar do %>
           <%= submit_button 'spread', _('Spread this') %>
         <% end %>
       <% end %>
@@ -58,7 +58,7 @@
         <%= hidden_field_tag :back_to, @back_to %>
         <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
  
-        <% button_bar do %>
+        <%= button_bar do %>
           <%= submit_button 'spread', _('Spread this') %>
         <% end %>
       <% end %>
@@ -5,7 +5,7 @@
     <%= hidden_field_tag :back_to, @back_to %>
     <%= labelled_text_field _('Title') + ': ', :name, @article.name, :style => 'width: 100%' %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
     <% end %>
   <% end %>
@@ -14,7 +14,7 @@
     <%= _("There is no portal community in this environment.") %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button :back, _('Back'), :controller => 'cms' %>
   <% end %>
 <% end %>
@@ -23,7 +23,7 @@
  
   <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= button :cancel, _('Cancel'), @back_to %>
   <% end %>
@@ -14,7 +14,7 @@
   </div>
 <% end %>
  
-<% button_bar(:style => 'margin-bottom: 1em;') do %>
+<%= button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
  
   <%= modal_button('new', _('New content'), url_for({:action => 'new', :parent_id => parent_id, :cms => true}).html_safe) %>
@@ -4,6 +4,6 @@
 <%= _('By categorizing your content, you increase the possibility that other people access it. When they are looking for, say, articles about Bahia and you categorize your article in "Regions/Bahia", then there is a good change that your article is going to be found.') %>
 </p>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= modal_close_button _('Close') %>
 <% end %>
@@ -8,7 +8,7 @@
   <div id="recaptcha-container" style="display: none">
     <h3><%= _('Please type the two words below') %></h3>
     <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button_to_function :add, _('Confirm'), "return false", :id => "confirm-captcha" %>
       <%= button_to_function :cancel, _('Cancel'), "noosfero.modal.close()" %>
     <% end %>
@@ -87,7 +87,7 @@ function check_captcha(button, confirm_action) {
  
   <%= safe_join(@plugins.dispatch(:comment_form_extra_contents, local_assigns.merge(:comment => @comment)).collect { |content| instance_exec(&content) }, "") %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "if(check_captcha(this)) { save_comment(this) } else { check_captcha(this, save_comment)};return false;") %>
     <% if !edition_mode %>
       <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
@@ -36,7 +36,7 @@ function submit_comment_form(button) {
   <div id="recaptcha-container" style="display: none">
     <h3><%= _('Please type the two words below') %></h3>
     <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button_to_function :add, _('Confirm'), "return false", :id => "confirm-captcha" %>
       <%= button_to_function :cancel, _('Cancel'), "noosfero.modal.close()" %>
     <% end %>
@@ -73,7 +73,7 @@ function submit_comment_form(button) {
   <%= hidden_field_tag(:confirm, 'false') %>
   <%= hidden_field_tag(:view, params[:view])%>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
     <% if cancel_triggers_hide %>
       <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
@@ -5,7 +5,7 @@
   <%= form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %>
     <%= hidden_field_tag(:unfollow, 'commit') %>
     <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button(:ok, _('Cancel notifications for e-mail above') ) %>
     <% end %>
   <% end %>
@@ -16,7 +16,7 @@
   <p><%= @page.terms_of_use %></p>
  
   <%= form_tag @page.url.merge(:terms_accepted => true) do %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <% if user %>
         <%= submit_button :save, _("Accept")  %>
       <% else %>
@@ -8,7 +8,7 @@
     <%= _('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button :back, _('Go back'), { :profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile" }%>
   <% end %>
 <% else %>
@@ -36,7 +36,7 @@
  
     <%= template_options(:enterprises, 'create_enterprise')%>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
     <% end %>
   <% end %>
@@ -4,7 +4,7 @@
  
 <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @enterprise.template, :header => _("What can I do with a %s?")} %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back'), {:controller => 'memberships', :action => 'index', :profile => user.identifier} %>
 <% end %>
  
@@ -22,7 +22,7 @@
   <% end %>
   </table>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button 'save', _('Confirm') %>
   <% end %>
 <% end %>
@@ -15,7 +15,7 @@
 <p><%= _('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %></p>
  
 <%= form_tag :action => 'approve', :id => @pending.code do %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('approve', _('Approve')) %>
   <% end %>
 <% end %>
@@ -27,7 +27,7 @@
 <%= form_tag :action => 'reject', :id => @pending.code do %>
   <%= labelled_form_field(_('Please provide an explanation for the rejection. This explanation will be sent to the requestor (required).'), text_area_tag('reject_explanation'))%>
   <div>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button('reject', _('Reject')) %>
     <% end %>
   </div>
@@ -5,7 +5,7 @@
 <%= labelled_form_for :info do |f| %>
   <%= f.text_area(:validation_methodology, :cols => 50, :rows => 10) %>
   <%= f.text_area(:restrictions, :cols => 50, :rows => 7) %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
 <h1><%= _('Enterprise validations') %></h1>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %>
   <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %>
 <% end %>
@@ -3,7 +3,7 @@
 <%= form_tag( {:action => 'give_role'}, {:method => :post}) do %>
   <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]})  %>
   <%= hidden_field_tag 'person', current_user.person.id %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('affiliate', _('Affiliate', :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
@@ -7,7 +7,7 @@
   <% end %>
   <%= hidden_field_tag 'person', @admin.id %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes'), :cancel => {:action => 'index'})  %>
   <% end %>
 <% end %>
@@ -9,7 +9,7 @@
   <% @roles.each do |r| %>
     <%= labelled_form_field(r.name, (check_box_tag "roles[]", r.id)) %>
   <% end %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button( 'save', _('Make'), :cancel => {:action => 'index'} ) %>
   <% end %>
 <% end %>
@@ -3,6 +3,6 @@
  
 <br style="clear:both" />
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Back'), :controller => 'admin_panel', :action => 'index') %>
 <% end %>
@@ -23,7 +23,7 @@
 </p>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
 <% end %>
  
@@ -55,7 +55,7 @@
 </script>
  
 <div>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes'), :id=>"save_community_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
@@ -22,7 +22,7 @@
   </fieldset>
 </div>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:save, _('Save'), 'javascript: void()', :onClick => "submit_custom_field_form('##{format_values_id}', '##{form_id}');") %>
 <% end %>
  
@@ -55,7 +55,7 @@
 </script>
  
 <div>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes'), :id=>"save_enterprise_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
@@ -55,7 +55,7 @@
 </script>
  
 <div>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes'), :id=>"save_person_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
@@ -69,7 +69,7 @@ Check all the features you want to enable for your environment, uncheck all the 
 <hr/>
  
 <div>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 <h1><%= _("Connections with %s") % @suggestion.suggestion.name %></h1>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Go to friends list'), :controller => 'friends') %>
 <% end %>
  
@@ -12,7 +12,7 @@
     </p>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
     <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
 <h1><%= _("Friends suggestions for %s") % profile.name %></h1>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Go to friends list'), :controller => 'friends') %>
 <% end %>
  
@@ -34,7 +34,7 @@
     <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:forward, _("Next")) %>
   <% end %>
   <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
@@ -24,7 +24,7 @@
       { :hint_text => _('Type in the person\'s %{search_fields}') % {:search_fields => @search_fields},
         :focus => false }) %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button('save', _('Invite'))%>
       <%= button('cancel', _('Cancel'), profile.url)%>
     <% end %>
@@ -32,7 +32,7 @@
  
   <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:ok, _("Invite!")) %>
   <% end %>
 <% end %>
@@ -5,7 +5,7 @@
   <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
   <%= labelled_form_field(_('License url'), f.text_field(:url)) %>
  
- <% button_bar do %>
+ <%= button_bar do %>
    <%= submit_button('save', _('Save'))%>
    <%= button('cancel', _('Cancel'), {:action => 'index'})%>
   <% end %>
@@ -16,7 +16,7 @@
   <% end %>
 </table>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:add, _('Add a new license'), :action => 'create')%>
   <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
 <% end %>
@@ -6,7 +6,7 @@
  
   <p><%= _('You already request activation of your mailbox. Please wait until an administrator approves your request.') %></p>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
   <% end %>
  
@@ -21,10 +21,10 @@
     <h2><%= _('Configuration') %></h2>
     <ul>
       <li>
-      <%= link_to _('Mail configuration for POP and IMAP'), 'http://www.ynternet.org/move/infos-technique-pour-utiliser-multypass-pop3-smtp-imap-ftp-quotas...' %>  
+      <%= link_to _('Mail configuration for POP and IMAP'), 'http://www.ynternet.org/move/infos-technique-pour-utiliser-multypass-pop3-smtp-imap-ftp-quotas...' %>
       </li>
     </ul>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
     <% end %>
  
@@ -33,7 +33,7 @@
     <h2><%= _("Enable e-Mail account below:") %></h2>
     <ul><%= safe_join(profile.email_addresses.map{|i| content_tag('li', i)}, "\n") %></ul>
     <blockquote><%= _("You'll be able to access a webmail from your user menu.") %></blockquote>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button(:ok, _('Enable e-Mail'), { :action => 'enable' }, :method => 'post') %>
       <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
     <% end %>
@@ -11,7 +11,7 @@
     <%= labelled_form_field _('City'), f.text_field(:city) %>
     <%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
     <%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button_to_function :search, _('Locate in the map'), "addressToPoint()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
       <%= submit_button 'save', _('Save') %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
 <h1><%= _("Connections with %s") % @suggestion.suggestion.name %></h1>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Go to groups list'), :controller => 'memberships') %>
 <% end %>
  
@@ -2,7 +2,7 @@
  
 <h1><%= _('Manage my groups') %></h1>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:add, _('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
   <%= button :add, _('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
@@ -48,7 +48,7 @@
  
   <%= hidden_field_tag('back_to', @back_to) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Create')) %>
     <%= button(:cancel, _('Cancel'), @back_to ) %>
   <% end %>
 <h1><%= _("Communities suggestions for %s") % profile.name %></h1>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Go to groups list'), :controller => 'memberships') %>
 <% end %>
  
@@ -4,6 +4,6 @@
  
 <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a %s?")} %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back'), @back_to %>
 <% end %>
@@ -22,7 +22,7 @@
  
   <%= render :partial => 'results' %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button :back, _('Back'), :controller => 'admin_panel' %>
   <% end %>
 <% end %>
@@ -26,7 +26,7 @@
   </table>
  
 <div>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
@@ -45,7 +45,7 @@
   </div>
  
   <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
-    <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
+    <%= button_bar(:style => 'float: right; margin-top: 0px;') do %>
       <%= 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]), _('Are you sure you want to remove this comment and all its replies?')], :class => 'button icon-button icon-delete') %>
     <% end %>
   <% end %>
@@ -5,7 +5,7 @@
 <div class='private-profile-message'><%= @message %></div>
 <div class='private-profile-description'><%= profile.description %></div>
  
-<% button_bar do %>
+<%= button_bar do %>
   <% if @action == :join && logged_in? %>
     <%= join_community_button({:logged => true}) %>
   <% end %>
@@ -14,7 +14,7 @@
   </div>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <%= button :add, _('Create a new community'),
       :controller => 'memberships', :action => 'new_community' if logged_in? && user == profile %>
@@ -8,7 +8,7 @@
 <% end %>
 </ul>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <%= button :add, _('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
 <% end %>
@@ -8,7 +8,7 @@
 <% end %>
 </ul>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' }%>
 <% end %>
  
@@ -8,7 +8,7 @@
 <% end %>
 </ul>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' }%>
 <% end %>
  
@@ -14,7 +14,7 @@
   </div>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if user == profile %>
     <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
@@ -36,7 +36,7 @@
   </div><!-- end of class="profile-members-tabs-container" -->
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if profile.community? and user %>
     <% if user.has_permission?(:invite_members, profile) %>
@@ -3,7 +3,7 @@
 <p><%= _('Are you sure you want to delete this profile?') %></p>
 <p><%= _('You must be aware that all content of this profile (articles, events, files and pictures) will also be deleted.') %></p>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:remove, _('Yes, I am sure'), {:action => 'destroy_profile'}, :method => :post) %>
   <%= button(:cancel, _('No, I gave up'), profile.url) %>
 <% end %>
@@ -67,13 +67,13 @@
  
   <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
   <% end %>
  
   <% if user && user.has_permission?('destroy_profile', profile) %>
-    <% button_bar(:id => 'delete-profile') do %>
+    <%= button_bar(:id => 'delete-profile') do %>
  
       <% if !environment.enabled?('forbid_destroy_profile') || user.is_admin?(environment) %>
         <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
@@ -24,7 +24,7 @@
     <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
     <h2><%= _('Content for footer') %></h2>
     <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
     <% end %>
@@ -13,7 +13,7 @@
     <%= _('This page will be displayed to the user after his signup with this template.') %>
   </div>
  
-  <% button_bar do%>
+  <%= button_bar do%>
     <%= submit_button('save',  _('Save'), :cancel => @back_to) %>
   <% end %>
 <% end %>
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back'), :controller => 'profile_editor' %>
   <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
   <% if profile.community? and user.has_permission?(:invite_members, profile) %>
@@ -5,7 +5,7 @@
     <%= hidden_field_tag(:last_admin, true) if from == 'last_admin'%>
   <% end %>
  
-  <% button_bar(:style => 'margin-top: 30px;') do %>
+  <%= button_bar(:style => 'margin-top: 30px;') do %>
     <%= submit_button('save', _('Save'))%>
     <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
   <% end %>
@@ -3,7 +3,7 @@
 <%= form_tag( {:action => 'give_role'}, {:method => :post}) do %>
   <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]})  %>
   <%= hidden_field_tag 'person', current_user.person.id %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('affiliate', _('Affiliate'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
@@ -24,7 +24,7 @@
   <% end %>
   <%= hidden_field_tag 'person', @member.id %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save',  _('Save changes'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
@@ -16,7 +16,7 @@
   </div>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', (mode == :edit) ? _('Save changes') : _('Create role'), :cancel => {:action => 'index'} ) %>
   <% end %>
 <% end %>
@@ -17,7 +17,7 @@
     <%=token_input_field_tag(:person_id, 'search-profile-members', {:action => 'assign_role_by_members'},
     {:focus => false, :hint_text => _('Select members to assign the role')}) %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button(:forward, _("Confirm")) %>
     <% end %>
   </div>
@@ -28,7 +28,7 @@
     <% @roles_list.each do |role| %>
       <%= labelled_radio_button role.name , :selected_role, role.id , false, :class => "selected_role" %> <br>
     <% end %>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button('save',_('Confirm'), :cancel => {:action => 'index'} ) %>
     <% end %>
   </div>
@@ -4,7 +4,7 @@
   <p><%= _('This role is not being currently used.')%></p>
   <p><%= _('Are you sure you want to delete this role?') %></p>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button(:remove, _('Yes, I am sure'), {:action => 'remove', :id => @role.id}, :method => :post) %>
     <%= button(:cancel, _('No, I gave up'), {:action => 'index'}) %>
   <% end %>
@@ -16,7 +16,7 @@
       <%= check_box_tag("roles[]", role.id, false ,{:id => role.key}) %>
       <%= content_tag(:label, role.name, { :for => role.key }) %><br/>
     <% end %>
-    <% button_bar do %>
+    <%= button_bar do %>
     <%= submit_button('save',_('Delete role'), :cancel => {:action => 'index'} ) %>
     <% end %>
   <% end %>
@@ -21,7 +21,7 @@
   <% end %>
 </table>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :add, _('Create a new role'), :action => 'new' %>
   <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
 <% end %>
@@ -3,11 +3,11 @@
 <h3> <%= _('Permissions') %> </h3>
 <ul>
   <% @role.permissions.each do |p| %>
-    <li> <%= permission_name(p) %> </li> 
+    <li> <%= permission_name(p) %> </li>
   <% end %>
 </ul>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :edit, _('Edit'), :action => 'edit', :id => @role %>
   <%= button :back, _('Back to roles management'), :action => 'index' %>
 <% end %>
@@ -3,7 +3,7 @@
 <%= form_tag do %>
   <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:add, _('Add')) %>
     <%= modal_close_button _('Cancel') %>
   <% end %>
 <%= form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
   <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:add, _('Add image')) %>
   <% end %>
 <% end %>
@@ -3,7 +3,7 @@
 <%= form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
   <%= hidden_field_tag('css', @css) %>
   <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
   <% end %>
 <% end %>
@@ -15,7 +15,7 @@
       <li><%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %></li>
     <% end %>
   </ul>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= modal_button :add, _('New CSS'), :action => 'add_css', :id => @theme.id %>
   <% end %>
 </div>
@@ -27,7 +27,7 @@
       <li><%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %></li>
     <% end %>
   </ul>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= modal_button :add, _('Add image'), :action => 'add_image', :id =>  @theme.id %>
   <% end %>
 </div>
@@ -40,7 +40,7 @@
  
 <br style="clear:both" />
  
-<% button_bar do %>
+<%= button_bar do %>
   <% if environment.enabled?('user_themes')  %>
     <%= modal_button :add, _('New theme ...'), :action => 'new' %>
   <% end %>
@@ -4,7 +4,7 @@
  
   <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Create')) %>
   <% end %>
 <% end %>
@@ -5,7 +5,7 @@
       <%= item.name %>
       <%= form_tag :action => 'add', :id => @region do %>
         <%= hidden_field_tag :validator_id, item.id %>
-        <% button_bar do %>
+        <%= button_bar do %>
           <%= submit_button('add', _('Add')) %>
         <% end %>
       <% end %>
@@ -19,7 +19,7 @@
  
 <%= form_tag({}, { :method => 'get' }) do %>
   <%= text_field_tag :search, nil, :id => 'search_validator' %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('search', _('Search')) %>
   <% end %>
 <% end %>
@@ -16,7 +16,7 @@
   </div>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', (mode == :edit) ? _('Save changes') : _('Create role'), :cancel => {:action => 'index'} ) %>
   <% end %>
 <% end %>
@@ -17,7 +17,7 @@
   <% end %>
 </table>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :add, _('Create a new role'), :action => 'new' %>
   <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
 <% end %>
@@ -3,11 +3,11 @@
 <h3> <%= _('Permissions') %> </h3>
 <ul>
   <% @role.permissions.each do |p| %>
-    <li> <%= permission_name(p) %> </li> 
+    <li> <%= permission_name(p) %> </li>
   <% end %>
 </ul>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :edit, _('Edit'), :action => 'edit', :id => @role %>
   <%= button :back, _('Back to roles management'), :action => 'index' %>
 <% end %>
@@ -2,7 +2,7 @@
   <%= _('Tagged with "%s"').html_safe % content_tag('code', @tag) %>
 </h2>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button('back', _('Back to tag cloud'), :action => 'tags') %>
 <% end %>
  
@@ -11,7 +11,7 @@
         <%= raw _('Description: %s') % group.description  + '<br/>' if group.community? %>
         <%= _('Members: %s') % group.members_count.to_s %> <br/>
         <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
-        <% button_bar do %>
+        <%= button_bar do %>
           <% if user.has_permission?(:edit_profile, group) %>
             <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
           <% end %>
@@ -9,7 +9,7 @@
       <p><%= _("If you are supposed to have access to this area, you'll probably want to talk to the people responsible and ask them to give you access.") %></p>
     <% end %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button :back, _('Go back'), :back %>
       <%= button :home, _('Go to the site home page'), :controller => 'home' %>
     <% end %>
@@ -4,7 +4,7 @@
     <%= _('You may have clicked an expired link or mistyped the address.') %>
     <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %>
     </p>
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= button :back, _('Go back'), :back %>
       <%= button :home, _('Go to the home page'), '/' %>
     <% end %>
@@ -5,7 +5,7 @@
  
   <p><small><em><%= _('You can move this window away to have a better visualization of specific parts of screen.') %></em></small></p>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button(:ok, _('Finished testing'), :controller => 'profile_themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
     <%= button(:edit, _('Edit theme'), :controller => 'profile_themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
   <% end %>
@@ -7,7 +7,7 @@
  
   <%= yield %> <%# ??? %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
     <%= yield :extra_buttons %>
     <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
@@ -6,7 +6,7 @@
  
 <%= _('There are no spams to review.') if no_tabs %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
 <% end %>
  
@@ -20,7 +20,7 @@
 <%= render_tabs(tabs) %>
  
 <% unless no_tabs %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
   <% end %>
 <% end %>
@@ -41,7 +41,7 @@
   </p>
 <% else %>
   <%= form_tag tasks_url(:action => 'close') do%>
-    <% button_bar(:class => 'task-actions') do %>
+    <%= button_bar(:class => 'task-actions') do %>
       <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
       <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
       <%= submit_button :save, _("Apply!") %>
@@ -71,7 +71,7 @@
  
     <%= pagination_links(@tasks)%>
  
-    <% button_bar(:class => 'task-actions') do %>
+    <%= button_bar(:class => 'task-actions') do %>
       <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
       <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
       <%= submit_button :save, _("Apply!") %>
@@ -13,6 +13,6 @@
   <% end %>
 </ul>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back'), :action => 'index' %>
 <% end %>
@@ -11,7 +11,7 @@
   <%= f.text_field :title, :style => 'width:80%;' %>
   <%= f.text_area :message, :style => 'height:200px; width:80%;' %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:ok, _('Send'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
@@ -48,7 +48,7 @@
 <% end %>
 </p>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, _('Back'), :action => 'index') %>
 <% end %>
  
@@ -14,6 +14,6 @@
   <p><%= _('Closing statement: %s') % @ticket.closing_statment %></p>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back'), :action => 'index' %>
 <% end %>
@@ -11,7 +11,7 @@
 <%= form_tag do %>
   <%= labelled_text_field(_('Name')+': ', :name)%>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save'))%>
     <%= button('cancel', _('Cancel'), {:action => 'index'})%>
   <% end %>
@@ -40,6 +40,6 @@
   </div>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
 <% end %>
@@ -5,7 +5,7 @@
   <%= text_field_tag :site, @site %>
   <%= hidden_field_tag :orig_site, @site %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Save changes'), :cancel => {:action => 'index'} ) %>
   <% end %>
 <% end %>
@@ -22,7 +22,7 @@
   <% end %>
 </table>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :add, _('Add a trusted site'), :action => 'new' %>
   <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
 <% end %>
@@ -4,7 +4,7 @@
  
   <%= text_field_tag :site, @site %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', _('Add trusted site'), :cancel => {:action => 'index'} ) %>
   <% end %>
 <% end %>
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :'text-plain', _('User list as [CSV]'), :action => 'download.csv' %>
   <%= button :'text-html', _('User list as [XML]'), :action => 'download.xml' %>
   <%= button :send, _('Send e-mail to users'), :action => 'send_mail' %>
@@ -31,7 +31,7 @@
       <%= labelled_check_box(_("Display popup until user close the notification"), 'notifications[display_popup]', '1', @notification.display_popup?) %>
     </div>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
     <% end %>
  
@@ -6,7 +6,7 @@
  
   <%= labelled_form_field _('API key'), f.text_field(:api_key, :size => 40) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
@@ -15,7 +15,7 @@
     <%=_('salvador-ba: Soteropolitano')%>
   </fieldset>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
@@ -7,7 +7,7 @@
   <%= labelled_form_field(_('Color'), f.select(:color, @colors.map{|s|[s.capitalize,s]}))  %>
   <%= labelled_form_field(f.check_box(:enabled) + _('Enable this label?'),'') %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', c_('Save'), :cancel => {:action => 'index'}  ) %>
   <% end %>
 <% end %>
@@ -25,7 +25,7 @@
     </table>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button(:add, _('Add a new label'), :action => 'create')%>
     <%= button :back, c_('Back to admin panel'), :controller => 'admin_panel' %>
   <% end %>
@@ -6,7 +6,7 @@
   <%= labelled_form_field(_('Status'), f.select(:status_id, @statuses.map{|s|[s.name,s.id]}))  %>
   <%= labelled_form_field(_('Reason:'), f.text_area(:reason, :rows => 5)) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', c_('Save') ) %>
   <% end %>
 <% end %>
@@ -7,7 +7,7 @@
   <%= labelled_form_field(f.check_box(:enabled) + _('Enable this status?'),'') %>
   <%#= labelled_form_field(f.check_box(:enable_reason) + _('This status allows reason?'),'') %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', c_('Save'), :cancel => {:action => 'index'}  ) %>
   <% end %>
 <% end %>
@@ -25,7 +25,7 @@
     </table>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button(:add, _('Add a new status'), :action => 'create')%>
     <%= button :back, c_('Back to admin panel'), :controller => 'admin_panel' %>
   <% end %>
@@ -17,7 +17,7 @@
       </div>
     </div>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
     <% end %>
  
@@ -12,7 +12,7 @@
   </div>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:add, c_('Create a new community'), :controller => 'memberships', :action => 'new_community', :profile => user.identifier, :back_to => @back_to) %>
 <% end %>
  
@@ -55,7 +55,7 @@
   <%= button(:add, _('Add a new select field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{CGI::escapeHTML(html_for_field(f, :fields, CustomFormsPlugin::SelectField).to_json)}); return false")%>
 </div>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= submit_button :save, c_('Save'), :cancel => {:action => 'index'}%>
 <% end %>
  
@@ -22,6 +22,6 @@
   </table>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back to forms'), :action => 'index' %>
 <% end %>
@@ -44,7 +44,7 @@
 <% end %>
 </table>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back to submissions'), :action => 'submissions', :id => @form.id %>
 <% end %>
  
@@ -27,7 +27,7 @@
   </table>
 <% end %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back to forms'), :action => 'index' %>
 <% end %>
  
@@ -22,7 +22,7 @@
  
     <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <% if @form.expired? %>
         <%= submit_button :save, c_('Save'), :disabled => '', :class => 'disabled', :cancel => {:controller => :profile, :profile => profile.identifier} %>
       <% else %>
@@ -73,7 +73,7 @@
 </table>
  
 <div>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', c_('Save changes')) %>
     <%= button :back, _('Back to plugins administration panel'), :controller => 'plugins' %>
   <% end %>
 require 'test_helper'
  
-class MarkCommentAsReadPluginTest < ActiveSupport::TestCase
-
-  include ActionView::Helpers::TagHelper
-  include NoosferoTestHelper
+class MarkCommentAsReadPluginTest < ActionView::TestCase
  
   def setup
     @plugin = MarkCommentAsReadPlugin.new
@@ -6,6 +6,6 @@
  
 <%= _('Send an email to %s requesting your unsubscription or click on the button below.') % link_to(environment.contact_email, "mailto:#{environment.contact_email}?subject=#{_('Cancel newsletter subscription')}") %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :ok, _('Confirm unsubscription'), {:action => 'confirm_unsubscription'}, :method => 'post' %>
 <% end %>
@@ -85,7 +85,7 @@
       :id => 'newsletter-footer-field'
     ))
   %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= submit_button :save, _('Save and visualize'), :name => "visualize", :cancel => {:controller => 'plugins'}  %>
   <% end %>
@@ -33,7 +33,7 @@
     <% end %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>
@@ -45,7 +45,7 @@
       </tr>
     </table>
     <div>
-      <% button_bar do %>
+      <%= button_bar do %>
         <%= submit_button('save', c_('Save changes')) %>
         <%= button :back, _('Back'), :controller => 'plugins' %>
       <% end %>
-<% button_bar do %>
+<%= button_bar do %>
   <% if logged_in? %>
     <%= button(:new,_("Rate %s ") % _(profile.class.name),
               {:controller => "organization_ratings_plugin_profile",
@@ -8,7 +8,7 @@
  
   <%= labelled_form_field _('Piwik site id'), f.text_field(:piwik_site_id) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
 require_relative '../../test_helper'
  
-class EnterpriseHomepageHelperTest < ActiveSupport::TestCase
+class EnterpriseHomepageHelperTest < ActionView::TestCase
  
   include ProductsPlugin::EnterpriseHomepageHelper
  
@@ -57,7 +57,4 @@ class EnterpriseHomepageHelperTest &lt; ActiveSupport::TestCase
     assert_no_match /100.34/, result
   end
  
-  protected
-  include NoosferoTestHelper
-
 end
   <div class='input-informations input-form-closed'>
     <div class='input-name'> <%= input.name %> <%= input_icon(input) %> </div>
     <div class='input-details'>
-      <% button_bar do %>
+      <%= button_bar do %>
         <% if input.has_price_details? %>
           <%= edit_button(:edit, _('Edit'), {:action => 'edit_input', :id => input}, :class => 'edit-input', :id => "edit-input-#{input.id}") %>
         <% end %>
@@ -6,7 +6,7 @@
                    html: {id: 'product-description-form', method: 'post'}) do |f| %>
  
   <%= labelled_form_field(_('Description:'), f.text_area(:description, rows: 15, style: 'width: 90%;', class: 'mceEditor')) %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'description') %>
   <% end %>
@@ -54,7 +54,7 @@
  
   <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, class: 'bar-update-url' %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'info') %>
   <% end %>
@@ -6,7 +6,7 @@
   <%= f.text_field(:name, value: @product.name, class: 'name_edition') %>
   <%= select_unit(@product) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'name') %>
   <% end %>
@@ -11,7 +11,7 @@
     <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %>
   <% end %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', (mode == 'new' ? _('Create product') : _('Save changes')), :cancel => {:action => 'index'} ) %>
   <% end %>
 <% end %>
@@ -21,7 +21,7 @@
   <%= hidden_field(:product, :inputs_cost) %>
   <%= hidden_field(:product, :price) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save'), :disabled => '', :class => 'disabled' %>
     <%= button :cancel, _('Cancel'), '#', class: 'cancel-price-details', data: {confirm: _('If you leave, you will lose all unsaved information. Are you sure you want to quit?')} %>
     <%= button(:add, _('New cost'), '#', :id => 'add-new-cost') %>
@@ -24,7 +24,7 @@
  
 <%= pagination_links @products %>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :add, _('New product or service'), :action => 'new' if @profile.create_product? %>
   <%= button :back,  _('Back'), { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' } %>
 <% end %>
@@ -68,7 +68,7 @@
  
 </div>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button :back, _('Back to the product listing'), controller: 'products_plugin/catalog', action: 'index' %>
   <%= button :delete, _('Remove product or service'), {action: 'destroy', id: @product}, class: 'requires-permission-manage_products', style: 'display:none;' %>
 <% end %>
@@ -7,7 +7,7 @@
   <h3><%= t('push_notification_plugin.lib.plugin.enabled_notifications')%></h3>
   <%= render partial: "notification_events_form", locals:{f: f, settings: @settings} %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins'}) %>
   <% end %>
  
@@ -18,7 +18,7 @@
 <%= form_for(:settings, :url => {:controller => "push_notification_plugin_myprofile", :action => "update_settings"}) do |f| %>
   <h1><%= t('push_notification_plugin.lib.plugin.enabled_notifications') %></h1>
   <%= render partial: "notification_events_form", locals: {f: f, settings: @settings} %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
     <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
   <% end %>
@@ -13,7 +13,7 @@
     </strong>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
@@ -39,7 +39,7 @@
     <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, @mail_template, :cols => 72, :rows => 8)) %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:ok, _("Invite my friends!")) %>
   <% end %>
 <% end %>
@@ -12,7 +12,7 @@
       </div>
     </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'name') %>
   <% end %>
@@ -3,7 +3,7 @@
 <%= form_for :environment, :url => {:action => 'index'}, :html => {:method => 'post'} do |f| %>
   <%= labelled_form_field(_("E-Mail addresses you want to allow to send"), f.text_area(:send_email_plugin_allow_to, :rows => 8)) %>
   <small><%= _('(list of email addresses separated by comma)') %></small>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button 'save', c_('Save'), :cancel => {:controller => 'plugins'} %>
   <% end %>
 <% end %>
@@ -5,7 +5,7 @@
   <%= labelled_form_field _('Tooltips (CSV format: language, group name, selector, description)'), f.text_area(:actions_csv, :style => 'width: 100%', :class => 'actions-csv') %>
   <%= labelled_form_field _('Group Triggers (CSV format: group name, selector, event (e.g. mouseenter, click))'), f.text_area(:group_triggers_csv, :style => 'width: 100%', :class => 'groups-csv', :rows => 7) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
@@ -16,7 +16,7 @@
  
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
     <%= button :back, _('Back to control panel'), controller: 'profile_editor' %>
   <% end %>
 require 'test_helper'
  
-class SocialSharePrivacyPluginTest < ActiveSupport::TestCase
+class SocialSharePrivacyPluginTest < ActionView::TestCase
  
   include NoosferoTestHelper
  
@@ -38,7 +38,7 @@
     <%= _('The same order in which you arrange the social networks here will be used for arranging the share buttons.') %>
   </p>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button 'save', _('Save'), :cancel => {:controller => 'plugins', :action => 'index'} %>
   <% end %>
 <% end %>
@@ -30,7 +30,7 @@
       <%= button(:cancel, _('Withhold'), {:action => 'withhold'}, :title => _('Cancel next scheduled scans')) if @settings.deployed %>
     <% end %>
  
-    <% button_bar do %>
+    <%= button_bar do %>
       <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
     <% end %>
   </div>
@@ -29,6 +29,6 @@
  
 <br style='clear: both'/>
  
-<% button_bar do %>
+<%= button_bar do %>
   <%= button(:back, c_('Back'), :action => 'index') %>
 <% end %>
@@ -10,7 +10,7 @@
 <% end %>
  
 <%= form_tag do %>
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= button(:add, _('Create a new sub-community'), :controller => 'memberships', :action => 'new_community', :profile => user.identifier, :sub_organizations_plugin_parent_to_be => profile.id) %>
     <%= button :add, _('Register a new sub-enterprise'), :controller => 'enterprise_registration', :sub_organizations_plugin_parent_to_be => profile.id if environment.enabled?('enterprise_registration') %>
   <% end %>
@@ -21,7 +21,7 @@
       :hint_text => _('Type in a search term for a group'),
       :pre_populate => @tokenized_children}) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', c_('Save'))%>
     <%= button('cancel', c_('Cancel'), {:controller => 'profile_editor'})%>
   <% end %>
@@ -51,7 +51,7 @@
     <%= pagination_links(organizations, {:param_name => 'npage', :page_links => true})  %>
   </div>
  
-  <% button_bar(:class => "related-organizations-button-bar") do %>
+  <%= button_bar(:class => "related-organizations-button-bar") do %>
     <%= button :back, c_('Go back'), { :controller => 'profile' } %>
     <%= button :add, _("Add a new %s") % organization_type, :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
  
@@ -9,7 +9,7 @@
   <% if organizations.length == 0 %>
     <li><%= _("There are no sub-%s yet.")  % organization_type.pluralize %></li>
   <% end %>
-  <% button_bar(:class => "related-organizations-button-bar") do %>
+  <%= button_bar(:class => "related-organizations-button-bar") do %>
     <%= button :back, c_('Go back'), { :controller => 'profile' } %>
     <%= button :add, _("Add a new %s") % organization_type, :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
  
@@ -10,5 +10,5 @@
       = check_box_tag "consumers[#{consumer.id}]", '1', distributed_consumers.include?(consumer.profile)
       = label_tag "consumers[#{consumer.id}]", consumer.name
  
-  - button_bar do
+  = button_bar do
     = submit_button :save, _('Save')
@@ -11,13 +11,13 @@
       f.text_field(:content_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') +
       select_tag(:content_tolerance_unit, options_for_select(time_units, @content_default_unit) )) %>
   <% end %>
-  <%= labelled_form_field(_('Comment edition tolerance time'), 
-    f.text_field(:comment_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') + 
+  <%= labelled_form_field(_('Comment edition tolerance time'),
+    f.text_field(:comment_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') +
     select_tag(:comment_tolerance_unit, options_for_select(time_units, @comment_default_unit) )) %>
  
   <%= content_tag( 'small', _('Empty means unlimited and zero means right away.') ) %>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button('save', c_('Save'))%>
     <%= button('back', c_('Back'), {:controller => 'profile_editor'})%>
   <% end %>
@@ -13,7 +13,7 @@
     <%= labelled_form_field _('Limit of voters to display:'), f.text_field(:voters_limit, :size => 3) %>
   </strong>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
@@ -12,7 +12,7 @@
     <%= visibility_options(@article, @tokenized_children) %>
   </div>
  
-  <% button_bar do %>
+  <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= button :cancel, _('Cancel'), @back_to %>
   <% end %>
+##
+# DEPRECATED ActionView::TestCase already provide all needed
+#
 module NoosferoTestHelper
  
-  def link_to(content, url, options = {})
-    "<a href='#{url.inspect}'>#{content}</a>"
-  end
-
-  def content_tag(tag, content, options = {})
-    tag_attr = options.blank? ? '' : ' ' + options.collect{ |o| "#{o[0]}=\"#{o[1]}\"" }.join(' ')
-    "<#{tag}#{tag_attr}>#{content}</#{tag}>"
-  end
  
   def submit_tag(content, options = {})
     content
@@ -17,11 +12,6 @@ module NoosferoTestHelper
     ''
   end
  
-  def tag(tag, args = {})
-    attrs = args.map{|k,v| "#{k}='#{v}'"}.join(' ')
-    "<#{tag} #{attrs} />"
-  end
-
   def options_from_collection_for_select(collection, value_method, content_method)
     "<option value='fake value'>fake content</option>"
   end
@@ -682,29 +682,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_nil default_folder_for_image_upload(profile)
   end
  
-  should 'envelop a html with button-bar div' do
-    result = button_bar { '<b>foo</b>' }
-    assert_equal '<div class="button-bar"><b>foo</b>'+
-                 '<br style=\'clear: left;\' /></div>', result
-  end
-
-  should 'add more classes to button-bar envelope' do
-    result = button_bar :class=>'test' do
-      '<b>foo</b>'
-    end
-    assert_equal '<div class="test button-bar"><b>foo</b>'+
-                 '<br style=\'clear: left;\' /></div>', result
-  end
-
-  should 'add more attributes to button-bar envelope' do
-    result = button_bar :id=>'bt1' do
-      '<b>foo</b>'
-    end
-    assert_tag_in_string result, :tag =>'div', :attributes => {:class => 'button-bar', :id => 'bt1'}
-    assert_tag_in_string result, :tag =>'b', :content => 'foo', :parent => {:tag => 'div', :attributes => {:id => 'bt1'}}
-    assert_tag_in_string result, :tag =>'br', :parent => {:tag => 'div', :attributes => {:id => 'bt1'}}
-  end
-
   should 'not filter html if source does not have macros' do
     class Plugin1 < Noosfero::Plugin
     end
@@ -871,7 +848,7 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     html = fullscreen_buttons("#article")
     assert html.include?("<script>fullscreenPageLoad('#article')</script>")
     assert html.include?("class=\"button with-text icon-fullscreen\"")
-    assert html.include?("onClick=\"toggle_fullwidth('#article')\"")
+    assert html.include?("onClick=\"toggle_fullwidth(&#39;#article&#39;)\"")
   end
  
   should "return the related class string" do
-# encoding: UTF-8
 require_relative "../test_helper"
  
 class ButtonsHelperTest < ActionView::TestCase
+
   include ButtonsHelper
  
   should 'append with-text class and keep existing classes' do
     expects(:button_without_text).with('type', 'label', 'url', { :class => 'with-text class1'})
     button('type', 'label', 'url', { :class => 'class1' })
   end
-end
 \ No newline at end of file
+
+  should 'envelop a html with button-bar div' do
+    result = button_bar { content_tag :b, 'foo' }
+    assert_equal '<div class=" button-bar"><b>foo</b>'+
+                 '<br style="clear: left;" /></div>', result
+  end
+
+  should 'add more classes to button-bar envelope' do
+    result = button_bar :class=>'test' do
+      content_tag :b, 'foo'
+    end
+    assert_equal '<div class="test button-bar"><b>foo</b>'+
+                 '<br style="clear: left;" /></div>', result
+  end
+
+  should 'add more attributes to button-bar envelope' do
+    result = button_bar :id=>'bt1' do
+      content_tag :b, 'foo'
+    end
+    assert_tag_in_string result, :tag =>'div', :attributes => {:class => ' button-bar', :id => 'bt1'}
+    assert_tag_in_string result, :tag =>'b', :content => 'foo', :parent => {:tag => 'div', :attributes => {:id => 'bt1'}}
+    assert_tag_in_string result, :tag =>'br', :parent => {:tag => 'div', :attributes => {:id => 'bt1'}}
+  end
+
+end
 require_relative "../test_helper"
  
-class CommentHelperTest < ActiveSupport::TestCase
+class CommentHelperTest < ActionView::TestCase
  
   include CommentHelper
-  include ActionView::Helpers::TagHelper
-  include NoosferoTestHelper
+
+  helper ApplicationHelper
  
   def setup
     @user = create_user('usertest').person
@@ -12,6 +12,7 @@ class CommentHelperTest &lt; ActiveSupport::TestCase
     self.stubs(:logged_in?).returns(true)
     self.stubs(:report_abuse).returns('<a href="#">link</a>')
     self.stubs(:expirable_comment_link).returns('<a href="#">link</a>')
+    self.stubs(:url_for)
     @plugins = mock
     @plugins.stubs(:dispatch).returns([])
   end
@@ -140,9 +141,5 @@ class CommentHelperTest &lt; ActiveSupport::TestCase
     assert_match /plugin_action/, Nokogiri::HTML.fragment(html).css('.comments-action-bar').to_html
   end
  
-  def link_to_function(content, url, options = {})
-    link_to(content, url, options)
-  end
-
 end
  
@@ -3,6 +3,8 @@ require_relative &quot;../test_helper&quot;
 class ContentViewerHelperTest < ActionView::TestCase
  
   include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
+
   include ContentViewerHelper
   include DatesHelper
   include ApplicationHelper
@@ -148,11 +150,4 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
     assert_match /February 1, 2007/, result
   end
  
-  protected
-  include NoosferoTestHelper
-  include ActionView::Helpers::TextHelper
-  def url_for(args = {})
-    ['http:/', args[:host], args[:profile], args[:page]].join('/')
-  end
-
 end
 require_relative "../test_helper"
  
-class EventsHelperTest < ActiveSupport::TestCase
+class EventsHelperTest < ActionView::TestCase
  
   include EventsHelper
  
 require_relative "../test_helper"
  
-class ForumHelperTest < ActiveSupport::TestCase
+class ForumHelperTest < ActionView::TestCase
  
   include BlogHelper
   include ForumHelper
@@ -58,7 +58,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     assert_match result, out
     assert_match 'a2', out
  
-    assert_match(/#{result} by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post))
+    assert_match(/#{result} by <a href="[^"]+">a2<\/a>/, last_topic_update(some_post))
   end
  
   should "return last comment author's name from unauthenticated user" do
...	...	@@ -233,13 +233,6 @@ module ApplicationHelper
233	233	link_to(content_tag('span', text), url, html_options.merge(:class => the_class, :title => text))
234	234	end
235	235
236		- def button_bar(options = {}, &block)
237		- options[:class].nil? ?
238		- options[:class]='button-bar' :
239		- options[:class]+=' button-bar'
240		- concat(content_tag('div', capture(&block).to_s + tag('br', :style => 'clear: left;'), options))
241		- end
242		-
243	236	def render_profile_actions klass
244	237	name = klass.to_s.underscore
245	238	begin
...	...
1	1	module ButtonsHelper
	2	+
	3	+ def button_bar(options = {}, &block)
	4	+ options[:class] \|\|= ''
	5	+ options[:class] << ' button-bar'
	6	+
	7	+ content_tag :div, options do
	8	+ [
	9	+ capture(&block).to_s,
	10	+ tag(:br, style: 'clear: left;'),
	11	+ ].safe_join
	12	+ end
	13	+ end
	14	+
2	15	def button(type, label, url, html_options = {})
3	16	html_options \|\|= {}
4	17	the_class = 'with-text'
...	...
...	...	@@ -11,7 +11,7 @@
11	11	<%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
12	12	<% end %>
13	13
14		-<% button_bar do %>
	14	+<%= button_bar do %>
15	15	<%= submit_button( 'login', _('Log in') )%>
16	16	<%= modal_close_button _('Cancel') if request.xhr? %>
17	17	<% end %>
...	...
...	...	@@ -20,7 +20,7 @@
20	20	<%= hidden_field_tag :answer, params[:answer] %>
21	21
22	22	<%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :id => 'accept-terms') %>
23		- <% button_bar do %>
	23	+ <%= button_bar do %>
24	24	<%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
25	25	<%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
26	26	<% end %>
...	...
...	...	@@ -24,7 +24,7 @@
24	24
25	25	<div class='activation-box'>
26	26	<h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
27		- <%= form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %>
	27	+ <%= form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %>
28	28
29	29	<p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
30	30
...	...	@@ -34,7 +34,7 @@
34	34
35	35	<%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
36	36
37		- <% button_bar do %>
	37	+ <%= button_bar do %>
38	38	<%= button 'cancel', _('Cancel'), :action => 'index' %>
39	39	<%= submit_button 'forward', _('Continue') %>
40	40	<% end %>
...	...
...	...	@@ -9,7 +9,7 @@
9	9	<%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
10	10
11	11	<div>
12		- <% button_bar do %>
	12	+ <%= button_bar do %>
13	13	<%= submit_button('send', _('Send instructions')) %>
14	14	<% end %>
15	15	</div>
...	...
...	...	@@ -22,7 +22,7 @@
22	22
23	23	<%= safe_join(@plugins.dispatch(:login_extra_contents).collect { \|content\| instance_exec(&content) }, "") %>
24	24
25		- <% button_bar do %>
	25	+ <%= button_bar do %>
26	26	<%= submit_button( 'login', _('Log in') )%>
27	27	<% if is_popin %>
28	28	<%= modal_close_button(_('Cancel')) %>
...	...	@@ -31,7 +31,7 @@
31	31
32	32	<% end %>
33	33
34		-<% button_bar do %>
	34	+<%= button_bar do %>
35	35	<% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
36	36	<%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
37	37	<% end %>
...	...
...	...	@@ -17,7 +17,7 @@
17	17
18	18	<%= safe_join(@plugins.dispatch(:login_extra_contents).collect { \|content\| instance_eval(&content) }, "") %>
19	19
20		- <% button_bar do %>
	20	+ <%= button_bar do %>
21	21	<%= submit_button( 'login', _('Log in') )%>
22	22	<% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
23	23	<%= button(:add, _('New user'), { :controller => 'account', :action => 'signup' }) %>
...	...
1	1	<h2><%= _('Are you sure you want to get out?') %></h2>
2	2	<p>
3		-<% button_bar do %>
	3	+<%= button_bar do %>
4	4	<%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
5	5	<%= modal_close_button _('No, I want to stay.') %>
6	6	<% end %>
...	...
...	...	@@ -10,7 +10,7 @@
10	10
11	11	<%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
12	12	<%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
13		- <% button_bar do %>
	13	+ <%= button_bar do %>
14	14	<%= submit_button(:ok, _('Change password')) %>
15	15	<% end %>
16	16
...	...