Download as
Browse Code »

Commit fa8d45fc1ec3b635c8d14465b8ef036274667598

Authored by Antonio Terceiro
1 parent 7621915d
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

Include javascript from theme in NG layout 

(ActionItem1500)
Showing 2 changed files with 10 additions and 0 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @fa8d45f
... ... @@ -643,6 +643,15 @@ module ApplicationHelper
643 643 html.join "\n"
644 644 end
645 645  
  646 + def theme_javascript_ng
  647 + script = File.join(theme_path, 'theme.js')
  648 + if File.exists?(File.join(Rails.root, 'public', script))
  649 + javascript_include_tag script
  650 + else
  651 + nil
  652 + end
  653 + end
  654 +
646 655 def file_field_or_thumbnail(label, image, i)
647 656 display_form_field label, (
648 657 render :partial => (image && image.valid? ? 'shared/show_thumbnail' : 'shared/change_image'),
... ...
app/views/layouts/application-ng.rhtml
  Diff comments   View file @fa8d45f
... ... @@ -90,5 +90,6 @@
90 90 <%= theme_footer %>
91 91 </div><!-- end id="theme-footer" -->
92 92 <%= noosfero_layout_features %>
  93 + <%= theme_javascript_ng %>
93 94 </body>
94 95 </html>
... ...