diff --git a/app/views/account/_login_form.html.erb b/app/views/account/_login_form.html.erb
index cd111f4..f58f2fd 100644
--- a/app/views/account/_login_form.html.erb
+++ b/app/views/account/_login_form.html.erb
@@ -1,4 +1,4 @@
-<% labelled_form_for :user, @user,
+<%= labelled_form_for :user, @user,
    :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }  do |f| %>
 
 <%= f.text_field :login,
diff --git a/app/views/account/forgot_password.html.erb b/app/views/account/forgot_password.html.erb
index 537c9f4..6c4be4e 100644
--- a/app/views/account/forgot_password.html.erb
+++ b/app/views/account/forgot_password.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
 
-<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
+<%= labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
 
   <%= f.text_field :login,
                    :onchange => 'this.value = convToValidLogin( this.value )' %>
diff --git a/app/views/account/new_password.html.erb b/app/views/account/new_password.html.erb
index bf75be8..e4326c7 100644
--- a/app/views/account/new_password.html.erb
+++ b/app/views/account/new_password.html.erb
@@ -6,7 +6,7 @@
 
 <%= error_messages_for :change_password %>
 
-<% form_for(:change_password) do |f| %>
+<%= form_for(:change_password) do |f| %>
 
   <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
   <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
diff --git a/app/views/admin_panel/message_for_disabled_enterprise.html.erb b/app/views/admin_panel/message_for_disabled_enterprise.html.erb
index 03fdc96..85e7069 100644
--- a/app/views/admin_panel/message_for_disabled_enterprise.html.erb
+++ b/app/views/admin_panel/message_for_disabled_enterprise.html.erb
@@ -2,7 +2,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<% labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
+<%= labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
 
   <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
 
diff --git a/app/views/admin_panel/set_portal_news_amount.html.erb b/app/views/admin_panel/set_portal_news_amount.html.erb
index 9781d92..a129788 100644
--- a/app/views/admin_panel/set_portal_news_amount.html.erb
+++ b/app/views/admin_panel/set_portal_news_amount.html.erb
@@ -1,6 +1,6 @@
 <h1><%= _('News amount by folder') %></h1>
 
-<% labelled_form_for :environment, @environment do |f| %>
+<%= labelled_form_for :environment, @environment do |f| %>
 
   <%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
 
diff --git a/app/views/admin_panel/site_info.html.erb b/app/views/admin_panel/site_info.html.erb
index b8df356..9269645 100644
--- a/app/views/admin_panel/site_info.html.erb
+++ b/app/views/admin_panel/site_info.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<%= labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index 4eee4be..93318d0 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for 'category' %>
 
-<% labelled_form_for 'category', @category, :html => { :multipart => true} do |f| %>
+<%= labelled_form_for 'category', @category, :html => { :multipart => true} do |f| %>
 
   <%= required_fields_message %>
 
diff --git a/app/views/cms/destroy.html.erb b/app/views/cms/destroy.html.erb
index e9fcb08..dd0a662 100644
--- a/app/views/cms/destroy.html.erb
+++ b/app/views/cms/destroy.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'article' %>
 
-<% labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %>
+<%= labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %>
 
   <strong>
     <% if @article.folder? %>
diff --git a/app/views/cms/edit.html.erb b/app/views/cms/edit.html.erb
index 566ae87..cdcbdae 100644
--- a/app/views/cms/edit.html.erb
+++ b/app/views/cms/edit.html.erb
@@ -1,7 +1,7 @@
 <%= error_messages_for 'article' %>
 
 <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
-<% labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
+<%= labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
 
   <%= hidden_field_tag("type", @type) if @type %>
 
diff --git a/app/views/cms/suggest_an_article.html.erb b/app/views/cms/suggest_an_article.html.erb
index d71f07f..bda3132 100644
--- a/app/views/cms/suggest_an_article.html.erb
+++ b/app/views/cms/suggest_an_article.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<% labelled_form_for 'task', @task do |f| %>
+<%= labelled_form_for 'task', @task do |f| %>
 
   <%= required labelled_form_field(_('Title'), text_field(:task, 'article_name', :size => 50)) %>
 
diff --git a/app/views/cms/upload_files.html.erb b/app/views/cms/upload_files.html.erb
index 9527971..00a3fa9 100644
--- a/app/views/cms/upload_files.html.erb
+++ b/app/views/cms/upload_files.html.erb
@@ -19,6 +19,6 @@
 
 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
 
-<% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
+<%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
   <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
 <% end %>
diff --git a/app/views/contact/new.html.erb b/app/views/contact/new.html.erb
index 29cfe4c..c6861a8 100644
--- a/app/views/contact/new.html.erb
+++ b/app/views/contact/new.html.erb
@@ -8,7 +8,7 @@
 
 <%= error_messages_for 'contact' %>
 
-<% labelled_form_for :contact, @contact do |f| %>
+<%= labelled_form_for :contact, @contact do |f| %>
   <%= hidden_field_tag(:confirm, 'false') %>
 
   <%= required_fields_message %>
diff --git a/app/views/enterprise_registration/basic_information.html.erb b/app/views/enterprise_registration/basic_information.html.erb
index d1b015c..7a4d9c9 100644
--- a/app/views/enterprise_registration/basic_information.html.erb
+++ b/app/views/enterprise_registration/basic_information.html.erb
@@ -18,7 +18,7 @@
 
   <%= required_fields_message %>
 
-  <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+  <%= labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
     <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
     <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
     <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
diff --git a/app/views/enterprise_validation/edit_validation_info.html.erb b/app/views/enterprise_validation/edit_validation_info.html.erb
index b669a99..b1214bf 100644
--- a/app/views/enterprise_validation/edit_validation_info.html.erb
+++ b/app/views/enterprise_validation/edit_validation_info.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :info %>
 
-<% labelled_form_for :info, @info do |f| %>
+<%= labelled_form_for :info, @info do |f| %>
   <%= f.text_area(:validation_methodology, :cols => 50, :rows => 10) %>
   <%= f.text_area(:restrictions, :cols => 50, :rows => 7) %>
   <% button_bar do %>
diff --git a/app/views/environment_role_manager/change_role.html.erb b/app/views/environment_role_manager/change_role.html.erb
index f147166..34a883e 100644
--- a/app/views/environment_role_manager/change_role.html.erb
+++ b/app/views/environment_role_manager/change_role.html.erb
@@ -1,6 +1,6 @@
 <%= _('Changing role of %s') % @admin.name %>
 
-<% labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
   
   <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
diff --git a/app/views/environment_role_manager/make_admin.html.erb b/app/views/environment_role_manager/make_admin.html.erb
index 43547ca..4c8c9a8 100644
--- a/app/views/environment_role_manager/make_admin.html.erb
+++ b/app/views/environment_role_manager/make_admin.html.erb
@@ -1,6 +1,6 @@
 <h2> <% _('Make new admin') %> </h2>
 
-<% labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
   <%= _('Admin') %> <br>
   <% @people.each do |p| %>
     <%= labelled_form_field(p.name, (radio_button_tag "person", p.id)) %>
diff --git a/app/views/features/_manage_community_fields.html.erb b/app/views/features/_manage_community_fields.html.erb
index 55d7013..065dfbb 100644
--- a/app/views/features/_manage_community_fields.html.erb
+++ b/app/views/features/_manage_community_fields.html.erb
@@ -1,6 +1,6 @@
 <h2><%= _('Manage community fields') %></h2>
 
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 
 <table id='community_fields_conf'>
   <tr>
diff --git a/app/views/features/_manage_enterprise_fields.html.erb b/app/views/features/_manage_enterprise_fields.html.erb
index ff412e5..dfc601c 100644
--- a/app/views/features/_manage_enterprise_fields.html.erb
+++ b/app/views/features/_manage_enterprise_fields.html.erb
@@ -1,6 +1,6 @@
 <h2><%= _('Manage enterprise fields') %></h2>
 
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 
 <table id='enterprise_fields_conf'>
   <tr>
diff --git a/app/views/features/_manage_person_fields.html.erb b/app/views/features/_manage_person_fields.html.erb
index 39f879b..0b543aa 100644
--- a/app/views/features/_manage_person_fields.html.erb
+++ b/app/views/features/_manage_person_fields.html.erb
@@ -1,6 +1,6 @@
 <h2><%= _('Manage person fields') %></h2>
 
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 
 <table id='person_fields_conf'>
   <tr>
diff --git a/app/views/features/index.html.erb b/app/views/features/index.html.erb
index 796e632..48ac823 100644
--- a/app/views/features/index.html.erb
+++ b/app/views/features/index.html.erb
@@ -8,7 +8,7 @@
 Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the <em>"Save changes" button</em> to confirm your changes.') %>
 </p>
 
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
 
 <table>
   <tr>
diff --git a/app/views/licenses/_form.html.erb b/app/views/licenses/_form.html.erb
index ac4f53f..9df124c 100644
--- a/app/views/licenses/_form.html.erb
+++ b/app/views/licenses/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for :license %>
 
-<% form_for :license, @license do |f| %>
+<%= form_for :license, @license do |f| %>
   <%= hidden_field_tag(:license_id, params[:license_id]) %>
   <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
   <%= labelled_form_field(_('License url'), f.text_field(:url)) %>
diff --git a/app/views/manage_products/_add_input.html.erb b/app/views/manage_products/_add_input.html.erb
index cce9cfd..b0fe60a 100644
--- a/app/views/manage_products/_add_input.html.erb
+++ b/app/views/manage_products/_add_input.html.erb
@@ -1,6 +1,6 @@
 <div id='request_result_message' style='display: none'></div>
 
-<% form_for(@input,
+<%= form_for(@input,
            :url => {:action => 'add_input', :id => @product},
            :html => {:method => 'post', :id => 'input-category-form'}
            ) do |f| %>
diff --git a/app/views/manage_products/_edit_description.html.erb b/app/views/manage_products/_edit_description.html.erb
index c64ce92..0bf0028 100644
--- a/app/views/manage_products/_edit_description.html.erb
+++ b/app/views/manage_products/_edit_description.html.erb
@@ -1,5 +1,5 @@
 <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
-<% remote_form_for(@product,
+<%= remote_form_for(@product,
                    :loading => "small_loading('product-description-form')",
                    :before => ("tinyMCE.triggerSave()" unless Rails.env == 'test'),
                    :update => 'product-description',
diff --git a/app/views/manage_products/_edit_image.html.erb b/app/views/manage_products/_edit_image.html.erb
index d8c3338..5b554e1 100644
--- a/app/views/manage_products/_edit_image.html.erb
+++ b/app/views/manage_products/_edit_image.html.erb
@@ -2,7 +2,7 @@
   <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
 </div>
 
-<% form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
+<%= form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
   <% f.fields_for :image_builder, @product.image do |i| %>
     <%= i.file_field( :uploaded_data, { :size => 10 } ) %>
     <p><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %></p>
diff --git a/app/views/manage_products/_edit_info.html.erb b/app/views/manage_products/_edit_info.html.erb
index 66caa94..5505b94 100644
--- a/app/views/manage_products/_edit_info.html.erb
+++ b/app/views/manage_products/_edit_info.html.erb
@@ -2,7 +2,7 @@
   <%= render_dialog_error_messages 'product' %>
 <% end %>
 
-<% remote_form_for(@product,
+<%= remote_form_for(@product,
                    :loading => "small_loading('product-info-form')",
                    :update => 'product-info',
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'info'},
diff --git a/app/views/manage_products/_edit_input.html.erb b/app/views/manage_products/_edit_input.html.erb
index a349d43..dd53531 100644
--- a/app/views/manage_products/_edit_input.html.erb
+++ b/app/views/manage_products/_edit_input.html.erb
@@ -1,4 +1,4 @@
-<% form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
+<%= form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
             :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
 
   <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
diff --git a/app/views/manage_products/_edit_name.html.erb b/app/views/manage_products/_edit_name.html.erb
index f73170f..1e1e9e6 100644
--- a/app/views/manage_products/_edit_name.html.erb
+++ b/app/views/manage_products/_edit_name.html.erb
@@ -1,4 +1,4 @@
-<% remote_form_for(@product,
+<%= remote_form_for(@product,
                    :loading => "small_loading('product-name-form')",
                    :update => 'product-name',
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'name'},
diff --git a/app/views/manage_products/_form.html.erb b/app/views/manage_products/_form.html.erb
index 211aec4..0519f48 100644
--- a/app/views/manage_products/_form.html.erb
+++ b/app/views/manage_products/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for :product %> <br/>
 
-<% form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
+<%= form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
   <%= required_fields_message %>
 
   <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
diff --git a/app/views/manage_products/edit_category.html.erb b/app/views/manage_products/edit_category.html.erb
index 1b12874..748c3d5 100644
--- a/app/views/manage_products/edit_category.html.erb
+++ b/app/views/manage_products/edit_category.html.erb
@@ -8,7 +8,7 @@
 
   <div id='request_result_message' style='display: none'></div>
 
-  <% remote_form_for(@product,
+  <%= remote_form_for(@product,
                      :loading => "open_loading('#{ _('loading...') }')",
                      :update => "request_result_message",
                      :url => {:action => 'edit_category', :id => @product},
diff --git a/app/views/manage_products/new.html.erb b/app/views/manage_products/new.html.erb
index 301ba33..c857b95 100644
--- a/app/views/manage_products/new.html.erb
+++ b/app/views/manage_products/new.html.erb
@@ -2,7 +2,7 @@
 
 <div id='request_result_message' style='display: none'></div>
 
-<% remote_form_for :product, @product,
+<%= remote_form_for :product, @product,
    :loading => "open_loading('#{ _('loading...') }')",
    :update => "request_result_message",
    :url => {:action => 'new'},
diff --git a/app/views/maps/edit_location.html.erb b/app/views/maps/edit_location.html.erb
index 6f2f4dc..07d883b 100644
--- a/app/views/maps/edit_location.html.erb
+++ b/app/views/maps/edit_location.html.erb
@@ -3,7 +3,7 @@
   <%= flash[:error] %>
 </div>
 
-<% form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
+<%= form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
 
   <div id='location-fields'>
     <%= select_country _('Country'), 'profile_data', 'country', {:class => 'type-select'} %>
diff --git a/app/views/memberships/new_community.html.erb b/app/views/memberships/new_community.html.erb
index f3238fa..4a43007 100644
--- a/app/views/memberships/new_community.html.erb
+++ b/app/views/memberships/new_community.html.erb
@@ -10,7 +10,7 @@
 
 <div>
 
-<% labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
+<%= labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
 
   <%= required_fields_message %>
 
diff --git a/app/views/plugins/index.html.erb b/app/views/plugins/index.html.erb
index 8c4bc7d..6e37ab9 100644
--- a/app/views/plugins/index.html.erb
+++ b/app/views/plugins/index.html.erb
@@ -4,7 +4,7 @@
 <%= _('Select which plugins you want to enable in your environment') %>
 </p>
 
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
 
   <table>
     <% @active_plugins.sort_by(&:plugin_name).each do |plugin|   %>
diff --git a/app/views/profile/report_abuse.html.erb b/app/views/profile/report_abuse.html.erb
index 3862ad1..d7c45e3 100644
--- a/app/views/profile/report_abuse.html.erb
+++ b/app/views/profile/report_abuse.html.erb
@@ -1,4 +1,4 @@
-<% form_for @abuse_report, :url => {:action => 'register_report'},
+<%= form_for @abuse_report, :url => {:action => 'register_report'},
                            :html => {:onsubmit => "return send_request(this)", :id => 'report-abuse-form'} do |f| %>
   <%= labelled_form_field('* ' + _('Report reasons'), f.text_area(:reason, :rows => 6, :cols => 60, :class => 'required')) %>
   <%= hidden_field_tag(:content_type, params[:content_type]) %>
diff --git a/app/views/profile/send_mail.html.erb b/app/views/profile/send_mail.html.erb
index 185f7cd..b5ada7d 100644
--- a/app/views/profile/send_mail.html.erb
+++ b/app/views/profile/send_mail.html.erb
@@ -6,7 +6,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
+<%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
diff --git a/app/views/profile_editor/edit.html.erb b/app/views/profile_editor/edit.html.erb
index 5a074bd..bc6c0d0 100644
--- a/app/views/profile_editor/edit.html.erb
+++ b/app/views/profile_editor/edit.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :profile %>
 
-<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
+<%= labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
 
   <% if user.has_permission?('manage_environment_templates', profile.environment) %>
     <div id="profile-is-template">
diff --git a/app/views/profile_members/change_role.html.erb b/app/views/profile_members/change_role.html.erb
index 8efe363..205ddaa 100644
--- a/app/views/profile_members/change_role.html.erb
+++ b/app/views/profile_members/change_role.html.erb
@@ -1,6 +1,6 @@
 <h3> <%= _('Changing role of %s') % @member.name %> </h3>
 
-<% labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
   
   <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
diff --git a/app/views/role/_form.html.erb b/app/views/role/_form.html.erb
index 0570578..dadbe64 100644
--- a/app/views/role/_form.html.erb
+++ b/app/views/role/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for :role %>
 
-<% labelled_form_for :role, role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
+<%= labelled_form_for :role, role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
 
   <%= required_fields_message %>
 
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index ac2a634..f2f1a80 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -1,7 +1,7 @@
 <h1><%= @ticket.target ? _('New request for %s') % @ticket.target.name : _('New request') %></h1>
 
 <%# FIXME: put style in css %>
-<% labelled_form_for :ticket, @ticket do |f| %>
+<%= labelled_form_for :ticket, @ticket do |f| %>
   <% if @ticket.target %>
     <%= f.hidden_field :target_id  %>
   <% else %>
diff --git a/app/views/users/send_mail.html.erb b/app/views/users/send_mail.html.erb
index 1879b79..9d40f81 100644
--- a/app/views/users/send_mail.html.erb
+++ b/app/views/users/send_mail.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
+<%= form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
diff --git a/plugins/anti_spam/views/anti_spam_plugin_admin/index.rhtml b/plugins/anti_spam/views/anti_spam_plugin_admin/index.rhtml
index f43e047..2494f3f 100644
--- a/plugins/anti_spam/views/anti_spam_plugin_admin/index.rhtml
+++ b/plugins/anti_spam/views/anti_spam_plugin_admin/index.rhtml
@@ -1,6 +1,6 @@
 <h1><%= _('AntiSpam settings')%></h1>
 
-<% form_for(:settings) do |f| %>
+<%= form_for(:settings) do |f| %>
 
   <%= labelled_form_field _('Host'), f.text_field(:host) %>
 
diff --git a/plugins/bsc/views/bsc_plugin_admin/new.html.erb b/plugins/bsc/views/bsc_plugin_admin/new.html.erb
index 05154b5..8989365 100644
--- a/plugins/bsc/views/bsc_plugin_admin/new.html.erb
+++ b/plugins/bsc/views/bsc_plugin_admin/new.html.erb
@@ -1,7 +1,7 @@
 <%= error_messages_for :bsc %>
 <h1><%= _('BSC registration') %></h1>
 
-<% labelled_form_for :profile_data, @bsc do |f| %>
+<%= labelled_form_for :profile_data, @bsc do |f| %>
   <%= render :partial => 'shared/fields', :locals => {:f => f, :profile => @bsc} %>
 
   <% button_bar do %>
diff --git a/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb b/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
index f914c94..feb522d 100644
--- a/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
+++ b/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for :contract %>
 
-<% labelled_form_for :contract, @contract, :html => {:id => 'bsc-plugin-sales-form'} do |f| %>
+<%= labelled_form_for :contract, @contract, :html => {:id => 'bsc-plugin-sales-form'} do |f| %>
   <%= hidden_field_tag :contract_id, @contract.id %>
   <%= required f.text_field(:client_name) %>
   <%= labelled_form_field(_('Client type'), f.select(:client_type, BscPlugin::Contract::ClientType.types.map{|type| [BscPlugin::Contract::ClientType.names[type], type]}))%>
diff --git a/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb b/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
index f542c8e..efebdb6 100644
--- a/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
+++ b/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
@@ -4,7 +4,7 @@
 
 <%= required_fields_message %>
 
-<% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+<%= labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
 
   <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
diff --git a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
index c14a851..87efe9c 100644
--- a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
+++ b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :form %>
 
-<% form_for :form, @form do |f| %>
+<%= form_for :form, @form do |f| %>
   <%= required labelled_form_field _('Name'), f.text_field(:name) %>
   <%= labelled_form_field(_('Period'), (
     date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending, 
diff --git a/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb b/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
index fb180ec..a1a7a61 100644
--- a/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
+++ b/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
@@ -4,7 +4,7 @@
 <% if @submission.id.nil? %>
   <%= error_messages_for :submission %>
 
-  <% form_for :submission, @submission do |f| %>
+  <%= form_for :submission, @submission do |f| %>
     <% if !user %>
       <%= required labelled_form_field _('Author name'), text_field_tag(:author_name, @submission.author_name) %>
       <%= required labelled_form_field _('Author email'), text_field_tag(:author_email, @submission.author_email) %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
index 6dc8cc9..f8dac25 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
@@ -1,4 +1,4 @@
-<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :beginning_id, beginning_id %>
   <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id, :beginning_id => beginning_id, :range => range } %>
 <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
index 62def0e..1835998 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
@@ -1,3 +1,3 @@
-<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id } %>
 <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
index 0bbd114..0c7e812 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
@@ -4,7 +4,7 @@
 
 <h2><%= @configuration_content.name %> Configuration</h2>
 
-<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
 
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
index 3bb1ea8..e706583 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
@@ -4,7 +4,7 @@
 
 <h2><%= @configuration_content.name %> Configuration</h2>
 
-<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
   
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
index 754cb4f..933f94a 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
@@ -1,6 +1,6 @@
 <h2><%= @configuration_content.name %> Configuration</h2>
 
-<% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
+<%= form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
 :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
index 818a2d8..eb640c7 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
@@ -2,7 +2,7 @@
 
 <h2><%= @configuration_content.name %> Configuration</h2>
 
-<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"},  :method => :get do |f| %>
+<%= form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"},  :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
   
diff --git a/plugins/send_email/views/send_email_plugin_admin/index.rhtml b/plugins/send_email/views/send_email_plugin_admin/index.rhtml
index 9bb2a14..14c96f8 100644
--- a/plugins/send_email/views/send_email_plugin_admin/index.rhtml
+++ b/plugins/send_email/views/send_email_plugin_admin/index.rhtml
@@ -1,6 +1,6 @@
 <h1><%= _("SendEmailPlugin's config") %></h1>
 
-<% form_for :environment, :url => {:action => 'index'}, :html => {:method => 'post'} do |f| %>
+<%= 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 %>
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
index f7d88e6..1053a2b 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
@@ -1,6 +1,6 @@
 <h1> <%= _('Basket options') %> </h1>
 
-<% form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
+<%= form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
   <%= labelled_form_field(_('Enabled?'), f.check_box(:shopping_cart)) %>
   <%= labelled_form_field(_('Delivery?'), f.check_box(:shopping_cart_delivery)) %>
   <%= labelled_form_field(_('Delivery price:'), f.text_field(:shopping_cart_delivery_price)) %>
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
index 9db0672..0000a84 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
@@ -1,6 +1,6 @@
 <% person = user.nil? ? Person.new : user %>
 <div id='cart-request-box'>
-  <% form_for(:customer, person, :url => {:action => 'send_request'},
+  <%= form_for(:customer, person, :url => {:action => 'send_request'},
               :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
     <div id="cart-form-main">
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
diff --git a/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml b/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml
index fe1700c..19013fc 100644
--- a/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml
+++ b/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml
@@ -1,6 +1,6 @@
 <h1><%= _('Spaminator settings')%></h1>
 
-<% form_for(:settings) do |f| %>
+<%= form_for(:settings) do |f| %>
 
   <div id="spaminator-config-fields">
     <%= labelled_form_field _('Period (days) for scanning spammers'), f.text_field(:period, :size => 4) %>
diff --git a/plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb b/plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb
index 954ba77..6b44521 100644
--- a/plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb
+++ b/plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :tolerance %>
 
-<% form_for :tolerance, @tolerance do |f| %>
+<%= form_for :tolerance, @tolerance do |f| %>
 
   <% time_units = [[_('Seconds'), 1], [_('Minutes'), 60], [_('Hours'), 3600]]%>
 
--
libgit2 0.21.2