From d746aea6f9fd7d58358618491f45fe7406bc5a92 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sat, 18 Jun 2011 21:09:15 +1000 Subject: File needs to be at public/assets, not public/images --- railties/guides/source/asset_pipeline.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/guides/source/asset_pipeline.textile') diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile index 1b444811a2..23c849c1f7 100644 --- a/railties/guides/source/asset_pipeline.textile +++ b/railties/guides/source/asset_pipeline.textile @@ -49,7 +49,7 @@ To serve assets, we can use the same tags that we are generally familiar with: <%= image_tag "rails.png" %> -Providing that assets are enabled within our application (+Rails.application.config.assets.enabled+ is set to +true+), this file will be served by Sprockets unless a file at +public/images/rails.png+ exists, in which case that file will be served. If there is no file at +public/images+, Sprockets will look through the available paths until it finds a file that matches the name and then will serve it, first looking in the application's assets directories and then falling back to the various engines of the application. +Providing that assets are enabled within our application (+Rails.application.config.assets.enabled+ is set to +true+), this file will be served by Sprockets unless a file at +public/assets/rails.png+ exists, in which case that file will be served. If there is no file at +public/assets+, Sprockets will look through the available paths until it finds a file that matches the name and then will serve it, first looking in the application's assets directories and then falling back to the various engines of the application. To include a JavaScript file we can still use the familiar +javascript_include_tag+. -- cgit v1.2.3 From 4f301b25402fb8736921752ceba5ba79c37bfd12 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sat, 18 Jun 2011 21:11:15 +1000 Subject: Fix indentation on manifest examples in assets guide --- railties/guides/source/asset_pipeline.textile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'railties/guides/source/asset_pipeline.textile') diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile index 23c849c1f7..febf8163f1 100644 --- a/railties/guides/source/asset_pipeline.textile +++ b/railties/guides/source/asset_pipeline.textile @@ -72,9 +72,9 @@ Sprockets allows some assets to be manifest files. These manifest files require For example, in the default Rails application there's a +app/assets/javascripts/application.js+ file which contains the following lines: - //= require jquery - //= require jquery_ujs - //= require_tree . +//= require jquery +//= require jquery_ujs +//= require_tree . In JS files, directives begin with +//=+. In this case, the file is using the +require+ directive twice and the +require_tree+ directive once. The +require+ directive tells Sprockets that we would like to require a file called +jquery.js+ that is available somewhere in the search path for Sprockets. By default, this is located inside the +vendor/assets/javascripts+ directory contained within the +jquery_rails+ gem. An identical event takes place for the +jquery_ujs+ require specified here also. @@ -84,10 +84,10 @@ The +require_tree .+ directive tells Sprockets to include _all_ JavaScript files There's also a default +app/assets/stylesheets/application.css+ file which contains these lines: - /* ... - *= require_self - *= require_tree . - */ +/* ... +*= require_self +*= require_tree . +*/ The directives that work in the JavaScript files will also work in stylesheets, obviously requiring stylesheets rather than JavaScript files. The +require_tree+ directive here works the same way as the JavaScript one, requiring all stylesheets from the current directory. -- cgit v1.2.3