Look for .html.erb instead of .rhtml

Antonio Terceiro
1 parent 78ad0c16
Showing 4 changed files with 11 additions and 19 deletions Show diff stats
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/helpers/application_helper.rb
app/views/layouts/application.html.erb
@@ -16,7 +16,7 @@ class UsersController &lt; AdminController
       end
       format.csv do
         @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
+        render :template => "users/index_csv.html.erb", :content_type => 'text/csv', :layout => false
       end
     end
   end
@@ -128,7 +128,7 @@ class ApplicationController &lt; ActionController::Base
   def render_not_found(path = nil)
     @no_design_blocks = true
     @path ||= request.path
-    render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
+    render :template => 'shared/not_found.html.erb', :status => 404, :layout => get_layout
   end
   alias :render_404 :render_not_found
@@ -136,7 +136,7 @@ class ApplicationController &lt; ActionController::Base
     @no_design_blocks = true
     @message = message
     @title = title
-    render :template => 'shared/access_denied.rhtml', :status => 403
+    render :template => 'shared/access_denied.html.erb', :status => 403
   end
   def load_category
@@ -265,8 +265,6 @@ module ApplicationHelper
     concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)))
   end
-  VIEW_EXTENSIONS = %w[.rhtml .html.erb]
-
   def partial_for_class_in_view_path(klass, view_path, suffix = nil)
     return nil if klass.nil?
     name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
@@ -279,10 +277,8 @@ module ApplicationHelper
       search_name = "_" + search_name
     end
-    VIEW_EXTENSIONS.each do |ext|
-      path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name+ext) : File.join(view_path, search_name+ext)
-      return name if File.exists?(File.join(path))
-    end
+    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
+    return name if File.exists?(File.join(path))
     partial_for_class_in_view_path(klass.superclass, view_path, suffix)
   end
@@ -302,9 +298,7 @@ module ApplicationHelper
     raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
     name = klass.name.underscore
-    VIEW_EXTENSIONS.each do |ext|
-      return "blocks/profile_info_actions/"+name+ext if File.exists?(File.join(Rails.root, 'app', 'views', 'blocks', 'profile_info_actions', name+ext))
-    end
+    return "blocks/profile_info_actions/" + name + '.html.erb' if File.exists?(File.join(Rails.root, 'app', 'views', 'blocks', 'profile_info_actions', name + '.html.erb'))
     view_for_profile_actions(klass.superclass)
   end
@@ -393,12 +387,10 @@ module ApplicationHelper
   end
   def theme_include(template)
-    ['.rhtml', '.html.erb'].each do |ext|
-      file = (Rails.root + '/public' + theme_path + '/' + template  + ext)
-      if File.exists?(file)
-        return render :file => file, :use_full_path => false
+    file = (Rails.root + '/public' + theme_path + '/' + template  + '.html.erb')
+    if File.exists?(file)
+      return render :file => file, :use_full_path => false
       end
-    end
     nil
   end
@@ -1125,7 +1117,7 @@ module ApplicationHelper
   def render_environment_features(folder)
     result = ''
     environment.enabled_features.keys.each do |feature|
-      file = File.join(controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
+      file = File.join(Rails.root, 'app/views/shared', folder.to_s, "#{feature}.html.erb")
       if File.exists?(file)
         result << render(:file => file, :use_full_path => false)
       end
@@ -116,7 +116,7 @@
     </div><!-- id="footer" -->
     <%# if you need to add HTML stuff to the layout, include it in
-    app/views/shared/noosfero_layout_features.rhtml! %>
+    app/views/shared/noosfero_layout_features.html.erb! %>
     <%= noosfero_layout_features %>
   </body>
 </html>
	@@ -16,7 +16,7 @@ class UsersController < AdminController		@@ -16,7 +16,7 @@ class UsersController < AdminController
16	end	16	end
17	format.csv do	17	format.csv do
18	@users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])	18	@users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
19	- render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false	19	+ render :template => "users/index_csv.html.erb", :content_type => 'text/csv', :layout => false
20	end	20	end
21	end	21	end
22	end	22	end
	@@ -128,7 +128,7 @@ class ApplicationController < ActionController::Base		@@ -128,7 +128,7 @@ class ApplicationController < ActionController::Base
128	def render_not_found(path = nil)	128	def render_not_found(path = nil)
129	@no_design_blocks = true	129	@no_design_blocks = true
130	@path \|\|= request.path	130	@path \|\|= request.path
131	- render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout	131	+ render :template => 'shared/not_found.html.erb', :status => 404, :layout => get_layout
132	end	132	end
133	alias :render_404 :render_not_found	133	alias :render_404 :render_not_found
134		134
	@@ -136,7 +136,7 @@ class ApplicationController < ActionController::Base		@@ -136,7 +136,7 @@ class ApplicationController < ActionController::Base
136	@no_design_blocks = true	136	@no_design_blocks = true
137	@message = message	137	@message = message
138	@title = title	138	@title = title
139	- render :template => 'shared/access_denied.rhtml', :status => 403	139	+ render :template => 'shared/access_denied.html.erb', :status => 403
140	end	140	end
141		141
142	def load_category	142	def load_category
	@@ -116,7 +116,7 @@		@@ -116,7 +116,7 @@
116	</div><!-- id="footer" -->	116	</div><!-- id="footer" -->
117		117
118	<%# if you need to add HTML stuff to the layout, include it in	118	<%# if you need to add HTML stuff to the layout, include it in
119	- app/views/shared/noosfero_layout_features.rhtml! %>	119	+ app/views/shared/noosfero_layout_features.html.erb! %>
120	<%= noosfero_layout_features %>	120	<%= noosfero_layout_features %>
121	</body>	121	</body>
122	</html>	122	</html>