Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/roles/edit.html.erb

@@ -1,6 +1,6 @@
 <h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=h @role.name %></h2>
 
-<% labelled_form_for @role do |f| %>
+<%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/roles/new.html.erb

@@ -1,6 +1,6 @@
 <h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_role_new)%></h2>
 
-<% labelled_form_for @role do |f| %>
+<%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <% end %>

app/views/roles/permissions.html.erb

@@ -1,6 +1,6 @@
 <h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_permissions_report)%></h2>
 
-<% form_tag(permissions_roles_path, :id => 'permissions_form') do %>
+<%= form_tag(permissions_roles_path, :id => 'permissions_form') do %>
 <%= hidden_field_tag 'permissions[0]', '', :id => nil %>
 <div class="autoscroll">
 <table class="list permissions">