guides assets are now centralized in the assets directory, with standard subdirs

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;
 }

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)

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.

railties/guides/source/layout.html.erb

@@ -7,13 +7,13 @@
 
 <title><%= yield(:page_title) || 'Ruby on Rails guides' %></title>
 
-<link rel="stylesheet" type="text/css" href="files/stylesheets/style.css" />
-<link rel="stylesheet" type="text/css" href="files/stylesheets/syntax.css" />
-<link rel="stylesheet" type="text/css" href="files/stylesheets/print.css" media="print" />
+<link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
+<link rel="stylesheet" type="text/css" href="stylesheets/syntax.css" />
+<link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" />
 
-<script type="text/javascript" src="files/javascripts/guides.js"></script>
-<script type="text/javascript" src="files/javascripts/code_highlighter.js"></script>
-<script type="text/javascript" src="files/javascripts/highlighters.js"></script>
+<script type="text/javascript" src="javascripts/guides.js"></script>
+<script type="text/javascript" src="javascripts/code_highlighter.js"></script>
+<script type="text/javascript" src="javascripts/highlighters.js"></script>
 
 </head>
 <body class="guide">