Download as
Browse Code »

Commit 5d77e0b51459b902943c006e78302f73ea461455

Authored by Joenio Costa
2 parents e219a211 8647fc67
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

Merge commit 'refs/merge-requests/7' of git://gitorious.org/noosfero/noosfero

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @5d77e0b
@@ -885,7 +885,7 @@ module ApplicationHelper @@ -885,7 +885,7 @@ module ApplicationHelper
885 885
886 def template_stylesheet_path 886 def template_stylesheet_path
887 if profile.nil? 887 if profile.nil?
888 - '/designs/templates/default/stylesheets/style.css' 888 + "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
889 else 889 else
890 "/designs/templates/#{profile.layout_template}/stylesheets/style.css" 890 "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
891 end 891 end
test/unit/application_helper_test.rb
  Diff comments   View file @5d77e0b
@@ -240,9 +240,10 @@ class ApplicationHelperTest < Test::Unit::TestCase @@ -240,9 +240,10 @@ class ApplicationHelperTest < Test::Unit::TestCase
240 assert_equal 'sampleuser', theme_owner 240 assert_equal 'sampleuser', theme_owner
241 end 241 end
242 242
243 - should 'use default template when there is no profile' do 243 + should 'use environment´s template when there is no profile' do
244 stubs(:profile).returns(nil) 244 stubs(:profile).returns(nil)
245 - assert_equal "/designs/templates/default/stylesheets/style.css", template_stylesheet_path 245 + environment.expects(:layout_template).returns('sometemplate')
  246 + assert_equal "/designs/templates/sometemplate/stylesheets/style.css", template_stylesheet_path
246 end 247 end
247 248
248 should 'use template from profile' do 249 should 'use template from profile' do