Merged rails-3.2 branch.

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

lib/generators/redmine_plugin_controller/templates/controller.rb.erb

@@ -1,4 +1,4 @@
-class <%= class_name %>Controller < ApplicationController
+class <%= @controller_class %>Controller < ApplicationController
   unloadable
 
 <% actions.each do |action| -%>

lib/generators/redmine_plugin_controller/templates/functional_test.rb.erb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class <%= class_name %>ControllerTest < ActionController::TestCase
+class <%= @controller_class %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

lib/generators/redmine_plugin_controller/templates/helper.rb.erb

@@ -1,2 +1,2 @@
-module <%= class_name %>Helper
+module <%= @controller_class %>Helper
 end

lib/generators/redmine_plugin_controller/templates/view.html.erb

@@ -1 +1 @@
-<h2><%= class_name %>#<%= action %></h2>
+<h2><%= @controller_class %>Controller#<%= @action_name %></h2>