Download as
Browse Code »

Commit 705d1057fdb96dc55a784a27ae50ce7b871328e1

Authored by AurelioAHeckert
1 parent c70977ac
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

ActionItem358: survive without theme.yml 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1758 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 3 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @705d105
@@ -494,10 +494,11 @@ module ApplicationHelper @@ -494,10 +494,11 @@ module ApplicationHelper
494 end 494 end
495 495
496 def theme_javascript() 496 def theme_javascript()
497 - js = YAML.load_file( RAILS_ROOT.to_s() + 497 + conf = RAILS_ROOT.to_s() +
498 '/public/designs/themes/' + 498 '/public/designs/themes/' +
499 current_theme.to_s() + 499 current_theme.to_s() +
500 - '/theme.yml' )['js'] 500 + '/theme.yml'
  501 + js = File.exists?(conf) ? YAML.load_file( )['js'] : []
501 html = [] 502 html = []
502 js.each do |file| 503 js.each do |file|
503 file = '/designs/themes/'+ current_theme.to_s() + 504 file = '/designs/themes/'+ current_theme.to_s() +