Dont fetch images from internet

rails · Oct 21, 2008 · 5ca4cac · 5ca4cac
1 parent 4a73524
commit 5ca4cac
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/railties/Rakefile b/railties/Rakefile
@@ -299,7 +299,7 @@ task :guides do
       input  = File.join(source, entry)
       output = File.join(html, entry).sub(/\.txt$/, '')
     end
-    
+
     begin
       puts "GENERATING => #{output}"
       ENV['MANUALSONRAILS_TOC'] = 'no' if indexless.include?(entry)
@@ -311,6 +311,10 @@ task :guides do
       ENV.delete('MANUALSONRAILS_TOC')
     end
   end
+
+  # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled.
+  FileUtils.cp_r File.join(source, 'images'), File.join(html, 'images')
+  FileUtils.cp_r File.join(source, 'stylesheets'), File.join(html, 'stylesheets')
 end
 
 # Generate GEM ----------------------------------------------------------------------------

diff --git a/railties/doc/guides/source/images/bullet.gif b/railties/doc/guides/source/images/bullet.gif
diff --git a/railties/doc/guides/source/images/header_backdrop.png b/railties/doc/guides/source/images/header_backdrop.png
diff --git a/railties/doc/guides/source/images/rails_logo_remix.gif b/railties/doc/guides/source/images/rails_logo_remix.gif
diff --git a/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif b/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif
diff --git a/railties/doc/guides/source/templates/guides.html.erb b/railties/doc/guides/source/templates/guides.html.erb
@@ -20,7 +20,7 @@
 <body>
 	<div id="header" <% if !show_toc %> class="notoc"<% end %>>
 		<div id="logo">
-			<a href="http://www.rubyonrails.org/" title="Ruby on Rails"><img src="http://web.rubyonrails.com/images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
+			<a href="http://guides.rubyonrails.org/" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
 		</div>
 
 		<h1 id="site_title"><span>Ruby on Rails</span></h1>

diff --git a/railties/doc/guides/source/templates/inline.css b/railties/doc/guides/source/templates/inline.css
@@ -67,7 +67,7 @@ dd {
 }
 
 div#header h1#site_title {
-	background: url('http://web.rubyonrails.com/images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
+	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
 	position: absolute;
 	width: 392px;
 	height: 55px;