Merged rails-3.2 branch.

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

app/views/timelog/_date_range.html.erb

@@ -31,8 +31,8 @@
 <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
 <ul>
     <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
-                                       :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
+                                       :class => (action_name == 'index' ? 'selected' : nil)) %></li>
     <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
-                                       :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
+                                       :class => (action_name == 'report' ? 'selected' : nil)) %></li>
 </ul>
 </div>

app/views/timelog/_list.html.erb

@@ -1,4 +1,4 @@
-<% form_tag({}) do -%>
+<%= form_tag({}) do -%>
 <%= hidden_field_tag 'back_url', url_for(params) %>
 <div class="autoscroll">
 <table class="list time-entries">

app/views/timelog/bulk_edit.html.erb

@@ -7,7 +7,7 @@
      )}.join("\n").html_safe %>
 </ul>
 
-<% form_tag(:action => 'bulk_update') do %>
+<%= form_tag(:action => 'bulk_update') do %>
 <%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
 <div class="box tabular">
   <div>

app/views/timelog/edit.html.erb

@@ -1,6 +1,6 @@
 <h2><%= l(:label_spent_time) %></h2>
 
-<% labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %>
+<%= labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
 <% end %>

app/views/timelog/index.html.erb

@@ -8,7 +8,7 @@
 
 <h2><%= l(:label_spent_time) %></h2>
 
-<% form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+<%= form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
 <%= render :partial => 'date_range' %>
 <% end %>
 

app/views/timelog/new.html.erb

@@ -1,6 +1,6 @@
 <h2><%= l(:label_spent_time) %></h2>
 
-<% labelled_form_for @time_entry, :url => time_entries_path do |f| %>
+<%= labelled_form_for @time_entry, :url => time_entries_path do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
   <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

app/views/timelog/report.html.erb

@@ -6,7 +6,9 @@
 
 <h2><%= l(:label_spent_time) %></h2>
 
-<% form_tag({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+<%= form_tag({:controller => 'timelog', :action => 'report',
+              :project_id => @project, :issue_id => @issue},
+            :method => :get, :id => 'query_form') do %>
   <% @report.criteria.each do |criterion| %>
     <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
   <% end %>