aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-04-19 20:38:38 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-04-19 20:38:38 +0200
commitc96bf840ad715cb203f29e1607929d59c3743d87 (patch)
treeeffee1df141dd9e7c543caa73a962108e4b45e65 /railties
parent9aac54c4bff67adac8a8b5ef4ff5e5564fb237b1 (diff)
downloadrails-c96bf840ad715cb203f29e1607929d59c3743d87.tar.gz
rails-c96bf840ad715cb203f29e1607929d59c3743d87.tar.bz2
rails-c96bf840ad715cb203f29e1607929d59c3743d87.zip
Add app/assets/images and include the rails.png as a sample there
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb8
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png (renamed from railties/lib/rails/generators/rails/app/templates/public/images/rails.png)bin6646 -> 6646 bytes
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/index.html2
3 files changed, 1 insertions, 9 deletions
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/public/images/rails.png b/railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png
index d5edc04e65..d5edc04e65 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/images/rails.png
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png
Binary files 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;