From ac8b71cc2032bd352cbe6c078bdff55b236cab8a Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 4 Apr 2010 02:30:31 -0700 Subject: [PATCH] guides assets are now centralized in the assets directory, with standard subdirs --- .../guides/{ => assets}/images/belongs_to.png | Bin .../guides/{ => assets}/images/book_icon.gif | Bin .../guides/{ => assets}/images/bullet.gif | Bin .../guides/{ => assets}/images/challenge.png | Bin .../{ => assets}/images/chapters_icon.gif | Bin .../{ => assets}/images/check_bullet.gif | Bin .../{ => assets}/images/credits_pic_blank.gif | Bin railties/guides/{ => assets}/images/csrf.png | Bin .../images/customized_error_messages.png | Bin .../guides/{ => assets}/images/edge_badge.png | Bin .../{ => assets}/images/error_messages.png | Bin .../{ => assets}/images/feature_tile.gif | Bin .../{ => assets}/images/footer_tile.gif | Bin railties/guides/{ => assets}/images/fxn.png | Bin .../{ => assets}/images/grey_bullet.gif | Bin railties/guides/{ => assets}/images/habtm.png | Bin .../guides/{ => assets}/images/has_many.png | Bin .../{ => assets}/images/has_many_through.png | Bin .../guides/{ => assets}/images/has_one.png | Bin .../{ => assets}/images/has_one_through.png | Bin .../{ => assets}/images/header_backdrop.png | Bin .../{ => assets}/images/header_tile.gif | Bin .../images/i18n/demo_localized_pirate.png | Bin .../images/i18n/demo_translated_en.png | Bin .../images/i18n/demo_translated_pirate.png | Bin .../images/i18n/demo_translation_missing.png | Bin .../images/i18n/demo_untranslated.png | Bin .../guides/{ => assets}/images/icons/README | 0 .../{ => assets}/images/icons/callouts/1.png | Bin .../{ => assets}/images/icons/callouts/10.png | Bin .../{ => assets}/images/icons/callouts/11.png | Bin .../{ => assets}/images/icons/callouts/12.png | Bin .../{ => assets}/images/icons/callouts/13.png | Bin .../{ => assets}/images/icons/callouts/14.png | Bin .../{ => assets}/images/icons/callouts/15.png | Bin .../{ => assets}/images/icons/callouts/2.png | Bin .../{ => assets}/images/icons/callouts/3.png | Bin .../{ => assets}/images/icons/callouts/4.png | Bin .../{ => assets}/images/icons/callouts/5.png | Bin .../{ => assets}/images/icons/callouts/6.png | Bin .../{ => assets}/images/icons/callouts/7.png | Bin .../{ => assets}/images/icons/callouts/8.png | Bin .../{ => assets}/images/icons/callouts/9.png | Bin .../{ => assets}/images/icons/caution.png | Bin .../{ => assets}/images/icons/example.png | Bin .../guides/{ => assets}/images/icons/home.png | Bin .../{ => assets}/images/icons/important.png | Bin .../guides/{ => assets}/images/icons/next.png | Bin .../guides/{ => assets}/images/icons/note.png | Bin .../guides/{ => assets}/images/icons/prev.png | Bin .../guides/{ => assets}/images/icons/tip.png | Bin .../guides/{ => assets}/images/icons/up.png | Bin .../{ => assets}/images/icons/warning.png | Bin .../guides/{ => assets}/images/nav_arrow.gif | Bin .../{ => assets}/images/polymorphic.png | Bin .../{ => assets}/images/posts_index.png | Bin .../{ => assets}/images/rails_guides_logo.gif | Bin .../{ => assets}/images/rails_logo_remix.gif | Bin .../{ => assets}/images/rails_welcome.png | Bin .../{ => assets}/images/session_fixation.png | Bin .../guides/{ => assets}/images/tab_grey.gif | Bin .../guides/{ => assets}/images/tab_info.gif | Bin .../guides/{ => assets}/images/tab_note.gif | Bin .../guides/{ => assets}/images/tab_red.gif | Bin .../guides/{ => assets}/images/tab_yellow.gif | Bin .../guides/{ => assets}/images/tab_yellow.png | Bin .../images/validation_error_messages.png | Bin .../javascripts/code_highlighter.js | 0 .../{files => assets}/javascripts/guides.js | 0 .../javascripts/highlighters.js | 0 .../{files => assets}/stylesheets/main.css | 28 +++++++++--------- .../{files => assets}/stylesheets/print.css | 0 .../{files => assets}/stylesheets/reset.css | 0 .../{files => assets}/stylesheets/style.css | 0 .../{files => assets}/stylesheets/syntax.css | 0 railties/guides/rails_guides/generator.rb | 3 +- railties/guides/source/contribute.textile | 2 +- railties/guides/source/layout.html.erb | 12 ++++---- 78 files changed, 22 insertions(+), 23 deletions(-) rename railties/guides/{ => assets}/images/belongs_to.png (100%) rename railties/guides/{ => assets}/images/book_icon.gif (100%) rename railties/guides/{ => assets}/images/bullet.gif (100%) rename railties/guides/{ => assets}/images/challenge.png (100%) rename railties/guides/{ => assets}/images/chapters_icon.gif (100%) rename railties/guides/{ => assets}/images/check_bullet.gif (100%) rename railties/guides/{ => assets}/images/credits_pic_blank.gif (100%) rename railties/guides/{ => assets}/images/csrf.png (100%) rename railties/guides/{ => assets}/images/customized_error_messages.png (100%) rename railties/guides/{ => assets}/images/edge_badge.png (100%) rename railties/guides/{ => assets}/images/error_messages.png (100%) rename railties/guides/{ => assets}/images/feature_tile.gif (100%) rename railties/guides/{ => assets}/images/footer_tile.gif (100%) rename railties/guides/{ => assets}/images/fxn.png (100%) rename railties/guides/{ => assets}/images/grey_bullet.gif (100%) rename railties/guides/{ => assets}/images/habtm.png (100%) rename railties/guides/{ => assets}/images/has_many.png (100%) rename railties/guides/{ => assets}/images/has_many_through.png (100%) rename railties/guides/{ => assets}/images/has_one.png (100%) rename railties/guides/{ => assets}/images/has_one_through.png (100%) rename railties/guides/{ => assets}/images/header_backdrop.png (100%) rename railties/guides/{ => assets}/images/header_tile.gif (100%) rename railties/guides/{ => assets}/images/i18n/demo_localized_pirate.png (100%) rename railties/guides/{ => assets}/images/i18n/demo_translated_en.png (100%) rename railties/guides/{ => assets}/images/i18n/demo_translated_pirate.png (100%) rename railties/guides/{ => assets}/images/i18n/demo_translation_missing.png (100%) rename railties/guides/{ => assets}/images/i18n/demo_untranslated.png (100%) rename railties/guides/{ => assets}/images/icons/README (100%) rename railties/guides/{ => assets}/images/icons/callouts/1.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/10.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/11.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/12.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/13.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/14.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/15.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/2.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/3.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/4.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/5.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/6.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/7.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/8.png (100%) rename railties/guides/{ => assets}/images/icons/callouts/9.png (100%) rename railties/guides/{ => assets}/images/icons/caution.png (100%) rename railties/guides/{ => assets}/images/icons/example.png (100%) rename railties/guides/{ => assets}/images/icons/home.png (100%) rename railties/guides/{ => assets}/images/icons/important.png (100%) rename railties/guides/{ => assets}/images/icons/next.png (100%) rename railties/guides/{ => assets}/images/icons/note.png (100%) rename railties/guides/{ => assets}/images/icons/prev.png (100%) rename railties/guides/{ => assets}/images/icons/tip.png (100%) rename railties/guides/{ => assets}/images/icons/up.png (100%) rename railties/guides/{ => assets}/images/icons/warning.png (100%) rename railties/guides/{ => assets}/images/nav_arrow.gif (100%) rename railties/guides/{ => assets}/images/polymorphic.png (100%) rename railties/guides/{ => assets}/images/posts_index.png (100%) rename railties/guides/{ => assets}/images/rails_guides_logo.gif (100%) rename railties/guides/{ => assets}/images/rails_logo_remix.gif (100%) rename railties/guides/{ => assets}/images/rails_welcome.png (100%) rename railties/guides/{ => assets}/images/session_fixation.png (100%) rename railties/guides/{ => assets}/images/tab_grey.gif (100%) rename railties/guides/{ => assets}/images/tab_info.gif (100%) rename railties/guides/{ => assets}/images/tab_note.gif (100%) rename railties/guides/{ => assets}/images/tab_red.gif (100%) rename railties/guides/{ => assets}/images/tab_yellow.gif (100%) rename railties/guides/{ => assets}/images/tab_yellow.png (100%) rename railties/guides/{ => assets}/images/validation_error_messages.png (100%) rename railties/guides/{files => assets}/javascripts/code_highlighter.js (100%) rename railties/guides/{files => assets}/javascripts/guides.js (100%) rename railties/guides/{files => assets}/javascripts/highlighters.js (100%) rename railties/guides/{files => assets}/stylesheets/main.css (89%) rename railties/guides/{files => assets}/stylesheets/print.css (100%) rename railties/guides/{files => assets}/stylesheets/reset.css (100%) rename railties/guides/{files => assets}/stylesheets/style.css (100%) rename railties/guides/{files => assets}/stylesheets/syntax.css (100%) diff --git a/railties/guides/images/belongs_to.png b/railties/guides/assets/images/belongs_to.png similarity index 100% rename from railties/guides/images/belongs_to.png rename to railties/guides/assets/images/belongs_to.png diff --git a/railties/guides/images/book_icon.gif b/railties/guides/assets/images/book_icon.gif similarity index 100% rename from railties/guides/images/book_icon.gif rename to railties/guides/assets/images/book_icon.gif diff --git a/railties/guides/images/bullet.gif b/railties/guides/assets/images/bullet.gif similarity index 100% rename from railties/guides/images/bullet.gif rename to railties/guides/assets/images/bullet.gif diff --git a/railties/guides/images/challenge.png b/railties/guides/assets/images/challenge.png similarity index 100% rename from railties/guides/images/challenge.png rename to railties/guides/assets/images/challenge.png diff --git a/railties/guides/images/chapters_icon.gif b/railties/guides/assets/images/chapters_icon.gif similarity index 100% rename from railties/guides/images/chapters_icon.gif rename to railties/guides/assets/images/chapters_icon.gif diff --git a/railties/guides/images/check_bullet.gif b/railties/guides/assets/images/check_bullet.gif similarity index 100% rename from railties/guides/images/check_bullet.gif rename to railties/guides/assets/images/check_bullet.gif diff --git a/railties/guides/images/credits_pic_blank.gif b/railties/guides/assets/images/credits_pic_blank.gif similarity index 100% rename from railties/guides/images/credits_pic_blank.gif rename to railties/guides/assets/images/credits_pic_blank.gif diff --git a/railties/guides/images/csrf.png b/railties/guides/assets/images/csrf.png similarity index 100% rename from railties/guides/images/csrf.png rename to railties/guides/assets/images/csrf.png diff --git a/railties/guides/images/customized_error_messages.png b/railties/guides/assets/images/customized_error_messages.png similarity index 100% rename from railties/guides/images/customized_error_messages.png rename to railties/guides/assets/images/customized_error_messages.png diff --git a/railties/guides/images/edge_badge.png b/railties/guides/assets/images/edge_badge.png similarity index 100% rename from railties/guides/images/edge_badge.png rename to railties/guides/assets/images/edge_badge.png diff --git a/railties/guides/images/error_messages.png b/railties/guides/assets/images/error_messages.png similarity index 100% rename from railties/guides/images/error_messages.png rename to railties/guides/assets/images/error_messages.png diff --git a/railties/guides/images/feature_tile.gif b/railties/guides/assets/images/feature_tile.gif similarity index 100% rename from railties/guides/images/feature_tile.gif rename to railties/guides/assets/images/feature_tile.gif diff --git a/railties/guides/images/footer_tile.gif b/railties/guides/assets/images/footer_tile.gif similarity index 100% rename from railties/guides/images/footer_tile.gif rename to railties/guides/assets/images/footer_tile.gif diff --git a/railties/guides/images/fxn.png b/railties/guides/assets/images/fxn.png similarity index 100% rename from railties/guides/images/fxn.png rename to railties/guides/assets/images/fxn.png diff --git a/railties/guides/images/grey_bullet.gif b/railties/guides/assets/images/grey_bullet.gif similarity index 100% rename from railties/guides/images/grey_bullet.gif rename to railties/guides/assets/images/grey_bullet.gif diff --git a/railties/guides/images/habtm.png b/railties/guides/assets/images/habtm.png similarity index 100% rename from railties/guides/images/habtm.png rename to railties/guides/assets/images/habtm.png diff --git a/railties/guides/images/has_many.png b/railties/guides/assets/images/has_many.png similarity index 100% rename from railties/guides/images/has_many.png rename to railties/guides/assets/images/has_many.png diff --git a/railties/guides/images/has_many_through.png b/railties/guides/assets/images/has_many_through.png similarity index 100% rename from railties/guides/images/has_many_through.png rename to railties/guides/assets/images/has_many_through.png diff --git a/railties/guides/images/has_one.png b/railties/guides/assets/images/has_one.png similarity index 100% rename from railties/guides/images/has_one.png rename to railties/guides/assets/images/has_one.png diff --git a/railties/guides/images/has_one_through.png b/railties/guides/assets/images/has_one_through.png similarity index 100% rename from railties/guides/images/has_one_through.png rename to railties/guides/assets/images/has_one_through.png diff --git a/railties/guides/images/header_backdrop.png b/railties/guides/assets/images/header_backdrop.png similarity index 100% rename from railties/guides/images/header_backdrop.png rename to railties/guides/assets/images/header_backdrop.png diff --git a/railties/guides/images/header_tile.gif b/railties/guides/assets/images/header_tile.gif similarity index 100% rename from railties/guides/images/header_tile.gif rename to railties/guides/assets/images/header_tile.gif diff --git a/railties/guides/images/i18n/demo_localized_pirate.png b/railties/guides/assets/images/i18n/demo_localized_pirate.png similarity index 100% rename from railties/guides/images/i18n/demo_localized_pirate.png rename to railties/guides/assets/images/i18n/demo_localized_pirate.png diff --git a/railties/guides/images/i18n/demo_translated_en.png b/railties/guides/assets/images/i18n/demo_translated_en.png similarity index 100% rename from railties/guides/images/i18n/demo_translated_en.png rename to railties/guides/assets/images/i18n/demo_translated_en.png diff --git a/railties/guides/images/i18n/demo_translated_pirate.png b/railties/guides/assets/images/i18n/demo_translated_pirate.png similarity index 100% rename from railties/guides/images/i18n/demo_translated_pirate.png rename to railties/guides/assets/images/i18n/demo_translated_pirate.png diff --git a/railties/guides/images/i18n/demo_translation_missing.png b/railties/guides/assets/images/i18n/demo_translation_missing.png similarity index 100% rename from railties/guides/images/i18n/demo_translation_missing.png rename to railties/guides/assets/images/i18n/demo_translation_missing.png diff --git a/railties/guides/images/i18n/demo_untranslated.png b/railties/guides/assets/images/i18n/demo_untranslated.png similarity index 100% rename from railties/guides/images/i18n/demo_untranslated.png rename to railties/guides/assets/images/i18n/demo_untranslated.png diff --git a/railties/guides/images/icons/README b/railties/guides/assets/images/icons/README similarity index 100% rename from railties/guides/images/icons/README rename to railties/guides/assets/images/icons/README diff --git a/railties/guides/images/icons/callouts/1.png b/railties/guides/assets/images/icons/callouts/1.png similarity index 100% rename from railties/guides/images/icons/callouts/1.png rename to railties/guides/assets/images/icons/callouts/1.png diff --git a/railties/guides/images/icons/callouts/10.png b/railties/guides/assets/images/icons/callouts/10.png similarity index 100% rename from railties/guides/images/icons/callouts/10.png rename to railties/guides/assets/images/icons/callouts/10.png diff --git a/railties/guides/images/icons/callouts/11.png b/railties/guides/assets/images/icons/callouts/11.png similarity index 100% rename from railties/guides/images/icons/callouts/11.png rename to railties/guides/assets/images/icons/callouts/11.png diff --git a/railties/guides/images/icons/callouts/12.png b/railties/guides/assets/images/icons/callouts/12.png similarity index 100% rename from railties/guides/images/icons/callouts/12.png rename to railties/guides/assets/images/icons/callouts/12.png diff --git a/railties/guides/images/icons/callouts/13.png b/railties/guides/assets/images/icons/callouts/13.png similarity index 100% rename from railties/guides/images/icons/callouts/13.png rename to railties/guides/assets/images/icons/callouts/13.png diff --git a/railties/guides/images/icons/callouts/14.png b/railties/guides/assets/images/icons/callouts/14.png similarity index 100% rename from railties/guides/images/icons/callouts/14.png rename to railties/guides/assets/images/icons/callouts/14.png diff --git a/railties/guides/images/icons/callouts/15.png b/railties/guides/assets/images/icons/callouts/15.png similarity index 100% rename from railties/guides/images/icons/callouts/15.png rename to railties/guides/assets/images/icons/callouts/15.png diff --git a/railties/guides/images/icons/callouts/2.png b/railties/guides/assets/images/icons/callouts/2.png similarity index 100% rename from railties/guides/images/icons/callouts/2.png rename to railties/guides/assets/images/icons/callouts/2.png diff --git a/railties/guides/images/icons/callouts/3.png b/railties/guides/assets/images/icons/callouts/3.png similarity index 100% rename from railties/guides/images/icons/callouts/3.png rename to railties/guides/assets/images/icons/callouts/3.png diff --git a/railties/guides/images/icons/callouts/4.png b/railties/guides/assets/images/icons/callouts/4.png similarity index 100% rename from railties/guides/images/icons/callouts/4.png rename to railties/guides/assets/images/icons/callouts/4.png diff --git a/railties/guides/images/icons/callouts/5.png b/railties/guides/assets/images/icons/callouts/5.png similarity index 100% rename from railties/guides/images/icons/callouts/5.png rename to railties/guides/assets/images/icons/callouts/5.png diff --git a/railties/guides/images/icons/callouts/6.png b/railties/guides/assets/images/icons/callouts/6.png similarity index 100% rename from railties/guides/images/icons/callouts/6.png rename to railties/guides/assets/images/icons/callouts/6.png diff --git a/railties/guides/images/icons/callouts/7.png b/railties/guides/assets/images/icons/callouts/7.png similarity index 100% rename from railties/guides/images/icons/callouts/7.png rename to railties/guides/assets/images/icons/callouts/7.png diff --git a/railties/guides/images/icons/callouts/8.png b/railties/guides/assets/images/icons/callouts/8.png similarity index 100% rename from railties/guides/images/icons/callouts/8.png rename to railties/guides/assets/images/icons/callouts/8.png diff --git a/railties/guides/images/icons/callouts/9.png b/railties/guides/assets/images/icons/callouts/9.png similarity index 100% rename from railties/guides/images/icons/callouts/9.png rename to railties/guides/assets/images/icons/callouts/9.png diff --git a/railties/guides/images/icons/caution.png b/railties/guides/assets/images/icons/caution.png similarity index 100% rename from railties/guides/images/icons/caution.png rename to railties/guides/assets/images/icons/caution.png diff --git a/railties/guides/images/icons/example.png b/railties/guides/assets/images/icons/example.png similarity index 100% rename from railties/guides/images/icons/example.png rename to railties/guides/assets/images/icons/example.png diff --git a/railties/guides/images/icons/home.png b/railties/guides/assets/images/icons/home.png similarity index 100% rename from railties/guides/images/icons/home.png rename to railties/guides/assets/images/icons/home.png diff --git a/railties/guides/images/icons/important.png b/railties/guides/assets/images/icons/important.png similarity index 100% rename from railties/guides/images/icons/important.png rename to railties/guides/assets/images/icons/important.png diff --git a/railties/guides/images/icons/next.png b/railties/guides/assets/images/icons/next.png similarity index 100% rename from railties/guides/images/icons/next.png rename to railties/guides/assets/images/icons/next.png diff --git a/railties/guides/images/icons/note.png b/railties/guides/assets/images/icons/note.png similarity index 100% rename from railties/guides/images/icons/note.png rename to railties/guides/assets/images/icons/note.png diff --git a/railties/guides/images/icons/prev.png b/railties/guides/assets/images/icons/prev.png similarity index 100% rename from railties/guides/images/icons/prev.png rename to railties/guides/assets/images/icons/prev.png diff --git a/railties/guides/images/icons/tip.png b/railties/guides/assets/images/icons/tip.png similarity index 100% rename from railties/guides/images/icons/tip.png rename to railties/guides/assets/images/icons/tip.png diff --git a/railties/guides/images/icons/up.png b/railties/guides/assets/images/icons/up.png similarity index 100% rename from railties/guides/images/icons/up.png rename to railties/guides/assets/images/icons/up.png diff --git a/railties/guides/images/icons/warning.png b/railties/guides/assets/images/icons/warning.png similarity index 100% rename from railties/guides/images/icons/warning.png rename to railties/guides/assets/images/icons/warning.png diff --git a/railties/guides/images/nav_arrow.gif b/railties/guides/assets/images/nav_arrow.gif similarity index 100% rename from railties/guides/images/nav_arrow.gif rename to railties/guides/assets/images/nav_arrow.gif diff --git a/railties/guides/images/polymorphic.png b/railties/guides/assets/images/polymorphic.png similarity index 100% rename from railties/guides/images/polymorphic.png rename to railties/guides/assets/images/polymorphic.png diff --git a/railties/guides/images/posts_index.png b/railties/guides/assets/images/posts_index.png similarity index 100% rename from railties/guides/images/posts_index.png rename to railties/guides/assets/images/posts_index.png diff --git a/railties/guides/images/rails_guides_logo.gif b/railties/guides/assets/images/rails_guides_logo.gif similarity index 100% rename from railties/guides/images/rails_guides_logo.gif rename to railties/guides/assets/images/rails_guides_logo.gif diff --git a/railties/guides/images/rails_logo_remix.gif b/railties/guides/assets/images/rails_logo_remix.gif similarity index 100% rename from railties/guides/images/rails_logo_remix.gif rename to railties/guides/assets/images/rails_logo_remix.gif diff --git a/railties/guides/images/rails_welcome.png b/railties/guides/assets/images/rails_welcome.png similarity index 100% rename from railties/guides/images/rails_welcome.png rename to railties/guides/assets/images/rails_welcome.png diff --git a/railties/guides/images/session_fixation.png b/railties/guides/assets/images/session_fixation.png similarity index 100% rename from railties/guides/images/session_fixation.png rename to railties/guides/assets/images/session_fixation.png diff --git a/railties/guides/images/tab_grey.gif b/railties/guides/assets/images/tab_grey.gif similarity index 100% rename from railties/guides/images/tab_grey.gif rename to railties/guides/assets/images/tab_grey.gif diff --git a/railties/guides/images/tab_info.gif b/railties/guides/assets/images/tab_info.gif similarity index 100% rename from railties/guides/images/tab_info.gif rename to railties/guides/assets/images/tab_info.gif diff --git a/railties/guides/images/tab_note.gif b/railties/guides/assets/images/tab_note.gif similarity index 100% rename from railties/guides/images/tab_note.gif rename to railties/guides/assets/images/tab_note.gif diff --git a/railties/guides/images/tab_red.gif b/railties/guides/assets/images/tab_red.gif similarity index 100% rename from railties/guides/images/tab_red.gif rename to railties/guides/assets/images/tab_red.gif diff --git a/railties/guides/images/tab_yellow.gif b/railties/guides/assets/images/tab_yellow.gif similarity index 100% rename from railties/guides/images/tab_yellow.gif rename to railties/guides/assets/images/tab_yellow.gif diff --git a/railties/guides/images/tab_yellow.png b/railties/guides/assets/images/tab_yellow.png similarity index 100% rename from railties/guides/images/tab_yellow.png rename to railties/guides/assets/images/tab_yellow.png diff --git a/railties/guides/images/validation_error_messages.png b/railties/guides/assets/images/validation_error_messages.png similarity index 100% rename from railties/guides/images/validation_error_messages.png rename to railties/guides/assets/images/validation_error_messages.png diff --git a/railties/guides/files/javascripts/code_highlighter.js b/railties/guides/assets/javascripts/code_highlighter.js similarity index 100% rename from railties/guides/files/javascripts/code_highlighter.js rename to railties/guides/assets/javascripts/code_highlighter.js diff --git a/railties/guides/files/javascripts/guides.js b/railties/guides/assets/javascripts/guides.js similarity index 100% rename from railties/guides/files/javascripts/guides.js rename to railties/guides/assets/javascripts/guides.js diff --git a/railties/guides/files/javascripts/highlighters.js b/railties/guides/assets/javascripts/highlighters.js similarity index 100% rename from railties/guides/files/javascripts/highlighters.js rename to railties/guides/assets/javascripts/highlighters.js diff --git a/railties/guides/files/stylesheets/main.css b/railties/guides/assets/stylesheets/main.css similarity index 89% rename from railties/guides/files/stylesheets/main.css rename to railties/guides/assets/stylesheets/main.css index 2fd0a2f37e..7ccae2c87e 100644 --- a/railties/guides/files/stylesheets/main.css +++ b/railties/guides/assets/stylesheets/main.css @@ -92,7 +92,7 @@ body { } #header { - background: #c52f24 url(../../images/header_tile.gif) repeat-x; + background: #c52f24 url(../images/header_tile.gif) repeat-x; color: #FFF; padding: 1.5em 0; position: relative; @@ -100,7 +100,7 @@ body { } #feature { - background: #d5e9f6 url(../../images/feature_tile.gif) repeat-x; + background: #d5e9f6 url(../images/feature_tile.gif) repeat-x; color: #333; padding: 0.5em 0 1.5em; } @@ -132,7 +132,7 @@ body { #footer { padding: 2em 0; - background: url(../../images/footer_tile.gif) repeat-x; + background: url(../images/footer_tile.gif) repeat-x; } #footer .wrapper { padding-left: 2em; @@ -179,7 +179,7 @@ a, a:link, a:visited { } #header .nav .index a { - background: #980905 url(../../images/nav_arrow.gif) no-repeat right top; + background: #980905 url(../images/nav_arrow.gif) no-repeat right top; padding-right: 1em; position: relative; z-index: 15; @@ -285,7 +285,7 @@ h6 { #header h1 { float: left; - background: url(../../images/rails_guides_logo.gif) no-repeat; + background: url(../images/rails_guides_logo.gif) no-repeat; width: 297px; text-indent: -9999em; margin: 0; @@ -306,7 +306,7 @@ h6 { #feature ul {margin-left: 0;} #feature ul li { list-style: none; - background: url(../../images/check_bullet.gif) no-repeat left 0.5em; + background: url(../images/check_bullet.gif) no-repeat left 0.5em; padding: 0.5em 1.75em 0.5em 1.75em; font-size: 1.1428em; font-weight: bold; @@ -325,12 +325,12 @@ h6 { font-size: 1.2857em; padding: 0.125em 0 0.25em 0; margin-bottom: 0; - /*background: url(../../images/book_icon.gif) no-repeat left top; + /*background: url(../images/book_icon.gif) no-repeat left top; padding: 0.125em 0 0.25em 28px;*/ } #mainCol dd.ticket, #subCol dd.ticket { - background: #fff9d8 url(../../images/tab_yellow.gif) no-repeat left top; + background: #fff9d8 url(../images/tab_yellow.gif) no-repeat left top; border: none; padding: 1.25em 1em 1.25em 48px; margin-left: 0; @@ -338,7 +338,7 @@ h6 { } #mainCol div.warning, #subCol dd.warning { - background: #f9d9d8 url(../../images/tab_red.gif) no-repeat left top; + background: #f9d9d8 url(../images/tab_red.gif) no-repeat left top; border: none; padding: 1.25em 1.25em 1.25em 48px; margin-left: 0; @@ -355,7 +355,7 @@ h6 { #subCol .chapters ul li { list-style: none; padding: 0 0 0 1em; - background: url(../../images/bullet.gif) no-repeat left 0.45em; + background: url(../images/bullet.gif) no-repeat left 0.45em; margin-left: 0; font-size: 1em; font-weight: normal; @@ -366,7 +366,7 @@ tt { } div.code_container { - background: #EEE url(../../images/tab_grey.gif) no-repeat left top; + background: #EEE url(../images/tab_grey.gif) no-repeat left top; padding: 0.25em 1em 0.5em 48px; } @@ -378,14 +378,14 @@ code { } .note { - background: #fff9d8 url(../../images/tab_note.gif) no-repeat left top; + background: #fff9d8 url(../images/tab_note.gif) no-repeat left top; border: none; padding: 1em 1em 0.25em 48px; margin: 0.25em 0 1.5em 0; } .info { - background: #d5e9f6 url(../../images/tab_info.gif) no-repeat left top; + background: #d5e9f6 url(../images/tab_info.gif) no-repeat left top; border: none; padding: 1em 1em 0.25em 48px; margin: 0.25em 0 1.5em 0; @@ -395,7 +395,7 @@ code { #mainCol ul li { list-style:none; - background: url(../../images/grey_bullet.gif) no-repeat left 0.5em; + background: url(../images/grey_bullet.gif) no-repeat left 0.5em; padding-left: 1em; margin-left: 0; } diff --git a/railties/guides/files/stylesheets/print.css b/railties/guides/assets/stylesheets/print.css similarity index 100% rename from railties/guides/files/stylesheets/print.css rename to railties/guides/assets/stylesheets/print.css diff --git a/railties/guides/files/stylesheets/reset.css b/railties/guides/assets/stylesheets/reset.css similarity index 100% rename from railties/guides/files/stylesheets/reset.css rename to railties/guides/assets/stylesheets/reset.css diff --git a/railties/guides/files/stylesheets/style.css b/railties/guides/assets/stylesheets/style.css similarity index 100% rename from railties/guides/files/stylesheets/style.css rename to railties/guides/assets/stylesheets/style.css diff --git a/railties/guides/files/stylesheets/syntax.css b/railties/guides/assets/stylesheets/syntax.css similarity index 100% rename from railties/guides/files/stylesheets/syntax.css rename to railties/guides/assets/stylesheets/syntax.css diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 1454aed6e4..b8c1913819 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -107,8 +107,7 @@ module RailsGuides end def copy_assets - FileUtils.cp_r(File.join(guides_dir, 'images'), output_dir) - FileUtils.cp_r(File.join(guides_dir, 'files'), output_dir) + FileUtils.cp_r(Dir.glob("#{guides_dir}/assets/*"), output_dir) end def output_file_for(guide) diff --git a/railties/guides/source/contribute.textile b/railties/guides/source/contribute.textile index 1203e38a4e..8c64df5362 100644 --- a/railties/guides/source/contribute.textile +++ b/railties/guides/source/contribute.textile @@ -9,7 +9,7 @@ h3. How to Contribute? * We have an open commit policy: anyone is welcome to contribute, but you'll need to ask for commit access. * PM lifo at "GitHub":http://github.com asking for "docrails":http://github.com/lifo/docrails/tree/master commit access. * Guides are written in Textile, and reside at railties/guides/source in the docrails project. -* All images are in the railties/guides/images directory. +* Assets are stored in the +railties/guides/assets+ directory. * Sample format : "Active Record Associations":http://github.com/lifo/docrails/blob/3e56a3832415476fdd1cb963980d0ae390ac1ed3/railties/guides/source/association_basics.textile * Sample output : "Active Record Associations":association_basics.html * You can build the Guides during testing by running +rake generate_guides+ in the +railties+ directory. diff --git a/railties/guides/source/layout.html.erb b/railties/guides/source/layout.html.erb index 9819db1f89..b280101d25 100644 --- a/railties/guides/source/layout.html.erb +++ b/railties/guides/source/layout.html.erb @@ -7,13 +7,13 @@ <%= yield(:page_title) || 'Ruby on Rails guides' %> - - - + + + - - - + + +