Download as
Browse Code »

Commit 9624e79cbb53ca2c2defa85b4e24e9c9188d0e24

Authored by Victor Costa
1 parent f9e55386
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix stylesheet tag on old application layout

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