From c96bf840ad715cb203f29e1607929d59c3743d87 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 19 Apr 2011 20:38:38 +0200 Subject: Add app/assets/images and include the rails.png as a sample there --- railties/lib/rails/generators/rails/app/app_generator.rb | 8 -------- .../rails/app/templates/app/assets/images/rails.png | Bin 0 -> 6646 bytes .../rails/app/templates/public/images/rails.png | Bin 6646 -> 0 bytes .../generators/rails/app/templates/public/index.html | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) create mode 100644 railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png delete mode 100644 railties/lib/rails/generators/rails/app/templates/public/images/rails.png (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 4df68d67c7..bc55efa261 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -89,10 +89,6 @@ module Rails directory "public", "public", :recursive => false end - def images - directory "public/images" - end - def script directory "script" do |content| "#{shebang}\n" + content @@ -219,10 +215,6 @@ module Rails build(:public_directory) end - def create_public_image_files - build(:images) - end - def create_script_files build(:script) end diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png b/railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png new file mode 100644 index 0000000000..d5edc04e65 Binary files /dev/null and b/railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png differ diff --git a/railties/lib/rails/generators/rails/app/templates/public/images/rails.png b/railties/lib/rails/generators/rails/app/templates/public/images/rails.png deleted file mode 100644 index d5edc04e65..0000000000 Binary files a/railties/lib/rails/generators/rails/app/templates/public/images/rails.png and /dev/null differ diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html index 13a203dd08..9d9811a5bf 100644 --- a/railties/lib/rails/generators/rails/app/templates/public/index.html +++ b/railties/lib/rails/generators/rails/app/templates/public/index.html @@ -59,7 +59,7 @@ #header { - background-image: url("images/rails.png"); + background-image: url("/assets/rails.png"); background-repeat: no-repeat; background-position: top left; height: 64px; -- cgit v1.2.3