rails3: fix stylesheet tag on old application layout

Victor Costa
1 parent f9e55386
Showing 5 changed files with 5 additions and 5 deletions Show diff stats
app/helpers/users_helper.rb
app/models/change_password.rb
app/models/feed_reader_block.rb
app/views/layouts/application.html.erb
app/views/users/_users_list.html.erb
@@ -18,7 +18,7 @@ module UsersHelper
     )
   end
  
-  def filter_title(filter)
+  def users_filter_title(filter)
     FILTER_TRANSLATION[filter]
   end
  
@@ -2,7 +2,7 @@ class ChangePassword &lt; Task
  
   attr_accessor :password, :password_confirmation
  
-  def self.human_attribute_name(attrib)
+  def self.human_attribute_name(attrib, options = {})
     case attrib.to_sym
     when :password
       _('Password')
@@ -2,7 +2,7 @@ class FeedReaderBlock &lt; Block
  
   attr_accessible :address, :update_errors
  
-  def initialize(attributes = nil)
+  def initialize(attributes = nil, options = {})
     data = attributes || {}
     super(data)
     self.enabled= !data[:address].blank?
@@ -10,10 +10,10 @@
  
     <%= noosfero_javascript %>
     <%= theme_javascript %>
+    <%= noosfero_stylesheets %>
  
     <%=
       # Load the principal css files:
-      stylesheet_link_tag(noosfero_stylesheets, :cache => 'cache') +
       stylesheet_import( %w( common help menu article button search blocks forms login-box ),
                          :themed_source => true ) + "\n" +
       import_blocks_stylesheets(:themed_source => true) + "\n" +
 <div class="environment-users-results-header">
-  <div id='environment-users-filter-title'><%= filter_title(@filter) %></div>
+  <div id='environment-users-filter-title'><%= users_filter_title(@filter) %></div>
   <%= filter_selector(@filter) %>
   <div style="clear: both"></div>
 </div>
...	...	@@ -18,7 +18,7 @@ module UsersHelper
18	18	)
19	19	end
20	20
21		- def filter_title(filter)
	21	+ def users_filter_title(filter)
22	22	FILTER_TRANSLATION[filter]
23	23	end
24	24
...	...
...	...	@@ -2,7 +2,7 @@ class ChangePassword < Task
2	2
3	3	attr_accessor :password, :password_confirmation
4	4
5		- def self.human_attribute_name(attrib)
	5	+ def self.human_attribute_name(attrib, options = {})
6	6	case attrib.to_sym
7	7	when :password
8	8	_('Password')
...	...
...	...	@@ -2,7 +2,7 @@ class FeedReaderBlock < Block
2	2
3	3	attr_accessible :address, :update_errors
4	4
5		- def initialize(attributes = nil)
	5	+ def initialize(attributes = nil, options = {})
6	6	data = attributes \|\| {}
7	7	super(data)
8	8	self.enabled= !data[:address].blank?
...	...
...	...	@@ -10,10 +10,10 @@
10	10
11	11	<%= noosfero_javascript %>
12	12	<%= theme_javascript %>
	13	+ <%= noosfero_stylesheets %>
13	14
14	15	<%=
15	16	# Load the principal css files:
16		- stylesheet_link_tag(noosfero_stylesheets, :cache => 'cache') +
17	17	stylesheet_import( %w( common help menu article button search blocks forms login-box ),
18	18	:themed_source => true ) + "\n" +
19	19	import_blocks_stylesheets(:themed_source => true) + "\n" +
...	...
1	1	<div class="environment-users-results-header">
2		- <div id='environment-users-filter-title'><%= filter_title(@filter) %></div>
	2	+ <div id='environment-users-filter-title'><%= users_filter_title(@filter) %></div>
3	3	<%= filter_selector(@filter) %>
4	4	<div style="clear: both"></div>
5	5	</div>
...	...