Permalink
Browse files

Merge pull request #26 from timoschilling/namespace_assets

namespace dj_mon.js and dj_mon.css
  • Loading branch information...
2 parents f3691c9 + 4ef8622 commit 3d27f532c3933df63da53f5e03a573df6d97216d @akshayrawat committed Sep 25, 2012
@@ -1,8 +1,10 @@
!!! 5
%html
%head{:lang => "en"}
- = stylesheet_link_tag "dj_mon", :media => "screen, projection"
%meta{:name => "apple-itunes-app", :content => "app-id=552732872"}
+ = stylesheet_link_tag "dj_mon/dj_mon", :media => "screen, projection"
+ = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
+ = javascript_include_tag "dj_mon/dj_mon"
= yield :head
%body
@@ -26,8 +28,6 @@
.container
= yield
- = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
- = javascript_include_tag "dj_mon"
%script
var dj_counts_dj_reports_url = "#{dj_counts_dj_reports_url}"
@@ -9,7 +9,7 @@ class Engine < Rails::Engine
if Rails.version > "3.1"
initializer "DJMon precompile hook" do |app|
- app.config.assets.precompile += ['dj_mon.js', 'dj_mon.css']
+ app.config.assets.precompile += ['dj_mon/dj_mon.js', 'dj_mon/dj_mon.css']
end
end

0 comments on commit 3d27f53

Please sign in to comment.