Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

guides assets are now centralized in the assets directory, with stand…

…ard subdirs
  • Loading branch information...
commit ac8b71cc2032bd352cbe6c078bdff55b236cab8a 1 parent c52bec7
@fxn fxn authored
Showing with 22 additions and 23 deletions.
  1. 0  railties/guides/{ → assets}/images/belongs_to.png
  2. 0  railties/guides/{ → assets}/images/book_icon.gif
  3. 0  railties/guides/{ → assets}/images/bullet.gif
  4. 0  railties/guides/{ → assets}/images/challenge.png
  5. 0  railties/guides/{ → assets}/images/chapters_icon.gif
  6. 0  railties/guides/{ → assets}/images/check_bullet.gif
  7. 0  railties/guides/{ → assets}/images/credits_pic_blank.gif
  8. 0  railties/guides/{ → assets}/images/csrf.png
  9. 0  railties/guides/{ → assets}/images/customized_error_messages.png
  10. 0  railties/guides/{ → assets}/images/edge_badge.png
  11. 0  railties/guides/{ → assets}/images/error_messages.png
  12. 0  railties/guides/{ → assets}/images/feature_tile.gif
  13. 0  railties/guides/{ → assets}/images/footer_tile.gif
  14. 0  railties/guides/{ → assets}/images/fxn.png
  15. 0  railties/guides/{ → assets}/images/grey_bullet.gif
  16. 0  railties/guides/{ → assets}/images/habtm.png
  17. 0  railties/guides/{ → assets}/images/has_many.png
  18. 0  railties/guides/{ → assets}/images/has_many_through.png
  19. 0  railties/guides/{ → assets}/images/has_one.png
  20. 0  railties/guides/{ → assets}/images/has_one_through.png
  21. 0  railties/guides/{ → assets}/images/header_backdrop.png
  22. 0  railties/guides/{ → assets}/images/header_tile.gif
  23. 0  railties/guides/{ → assets}/images/i18n/demo_localized_pirate.png
  24. 0  railties/guides/{ → assets}/images/i18n/demo_translated_en.png
  25. 0  railties/guides/{ → assets}/images/i18n/demo_translated_pirate.png
  26. 0  railties/guides/{ → assets}/images/i18n/demo_translation_missing.png
  27. 0  railties/guides/{ → assets}/images/i18n/demo_untranslated.png
  28. 0  railties/guides/{ → assets}/images/icons/README
  29. 0  railties/guides/{ → assets}/images/icons/callouts/1.png
  30. 0  railties/guides/{ → assets}/images/icons/callouts/10.png
  31. 0  railties/guides/{ → assets}/images/icons/callouts/11.png
  32. 0  railties/guides/{ → assets}/images/icons/callouts/12.png
  33. 0  railties/guides/{ → assets}/images/icons/callouts/13.png
  34. 0  railties/guides/{ → assets}/images/icons/callouts/14.png
  35. 0  railties/guides/{ → assets}/images/icons/callouts/15.png
  36. 0  railties/guides/{ → assets}/images/icons/callouts/2.png
  37. 0  railties/guides/{ → assets}/images/icons/callouts/3.png
  38. 0  railties/guides/{ → assets}/images/icons/callouts/4.png
  39. 0  railties/guides/{ → assets}/images/icons/callouts/5.png
  40. 0  railties/guides/{ → assets}/images/icons/callouts/6.png
  41. 0  railties/guides/{ → assets}/images/icons/callouts/7.png
  42. 0  railties/guides/{ → assets}/images/icons/callouts/8.png
  43. 0  railties/guides/{ → assets}/images/icons/callouts/9.png
  44. 0  railties/guides/{ → assets}/images/icons/caution.png
  45. 0  railties/guides/{ → assets}/images/icons/example.png
  46. 0  railties/guides/{ → assets}/images/icons/home.png
  47. 0  railties/guides/{ → assets}/images/icons/important.png
  48. 0  railties/guides/{ → assets}/images/icons/next.png
  49. 0  railties/guides/{ → assets}/images/icons/note.png
  50. 0  railties/guides/{ → assets}/images/icons/prev.png
  51. 0  railties/guides/{ → assets}/images/icons/tip.png
  52. 0  railties/guides/{ → assets}/images/icons/up.png
  53. 0  railties/guides/{ → assets}/images/icons/warning.png
  54. 0  railties/guides/{ → assets}/images/nav_arrow.gif
  55. 0  railties/guides/{ → assets}/images/polymorphic.png
  56. 0  railties/guides/{ → assets}/images/posts_index.png
  57. 0  railties/guides/{ → assets}/images/rails_guides_logo.gif
  58. 0  railties/guides/{ → assets}/images/rails_logo_remix.gif
  59. 0  railties/guides/{ → assets}/images/rails_welcome.png
  60. 0  railties/guides/{ → assets}/images/session_fixation.png
  61. 0  railties/guides/{ → assets}/images/tab_grey.gif
  62. 0  railties/guides/{ → assets}/images/tab_info.gif
  63. 0  railties/guides/{ → assets}/images/tab_note.gif
  64. 0  railties/guides/{ → assets}/images/tab_red.gif
  65. 0  railties/guides/{ → assets}/images/tab_yellow.gif
  66. 0  railties/guides/{ → assets}/images/tab_yellow.png
  67. 0  railties/guides/{ → assets}/images/validation_error_messages.png
  68. 0  railties/guides/{files → assets}/javascripts/code_highlighter.js
  69. 0  railties/guides/{files → assets}/javascripts/guides.js
  70. 0  railties/guides/{files → assets}/javascripts/highlighters.js
  71. +14 −14 railties/guides/{files → assets}/stylesheets/main.css
  72. 0  railties/guides/{files → assets}/stylesheets/print.css
  73. 0  railties/guides/{files → assets}/stylesheets/reset.css
  74. 0  railties/guides/{files → assets}/stylesheets/style.css
  75. 0  railties/guides/{files → assets}/stylesheets/syntax.css
  76. +1 −2  railties/guides/rails_guides/generator.rb
  77. +1 −1  railties/guides/source/contribute.textile
  78. +6 −6 railties/guides/source/layout.html.erb
View
0  railties/guides/images/belongs_to.png → railties/guides/assets/images/belongs_to.png
File renamed without changes
View
0  railties/guides/images/book_icon.gif → railties/guides/assets/images/book_icon.gif
File renamed without changes
View
0  railties/guides/images/bullet.gif → railties/guides/assets/images/bullet.gif
File renamed without changes
View
0  railties/guides/images/challenge.png → railties/guides/assets/images/challenge.png
File renamed without changes
View
0  railties/guides/images/chapters_icon.gif → ...es/guides/assets/images/chapters_icon.gif
File renamed without changes
View
0  railties/guides/images/check_bullet.gif → ...ies/guides/assets/images/check_bullet.gif
File renamed without changes
View
0  railties/guides/images/credits_pic_blank.gif → ...uides/assets/images/credits_pic_blank.gif
File renamed without changes
View
0  railties/guides/images/csrf.png → railties/guides/assets/images/csrf.png
File renamed without changes
View
0  ...ides/images/customized_error_messages.png → ...sets/images/customized_error_messages.png
File renamed without changes
View
0  railties/guides/images/edge_badge.png → railties/guides/assets/images/edge_badge.png
File renamed without changes
View
0  railties/guides/images/error_messages.png → ...s/guides/assets/images/error_messages.png
File renamed without changes
View
0  railties/guides/images/feature_tile.gif → ...ies/guides/assets/images/feature_tile.gif
File renamed without changes
View
0  railties/guides/images/footer_tile.gif → ...ties/guides/assets/images/footer_tile.gif
File renamed without changes
View
0  railties/guides/images/fxn.png → railties/guides/assets/images/fxn.png
File renamed without changes
View
0  railties/guides/images/grey_bullet.gif → ...ties/guides/assets/images/grey_bullet.gif
File renamed without changes
View
0  railties/guides/images/habtm.png → railties/guides/assets/images/habtm.png
File renamed without changes
View
0  railties/guides/images/has_many.png → railties/guides/assets/images/has_many.png
File renamed without changes
View
0  railties/guides/images/has_many_through.png → ...guides/assets/images/has_many_through.png
File renamed without changes
View
0  railties/guides/images/has_one.png → railties/guides/assets/images/has_one.png
File renamed without changes
View
0  railties/guides/images/has_one_through.png → .../guides/assets/images/has_one_through.png
File renamed without changes
View
0  railties/guides/images/header_backdrop.png → .../guides/assets/images/header_backdrop.png
File renamed without changes
View
0  railties/guides/images/header_tile.gif → ...ties/guides/assets/images/header_tile.gif
File renamed without changes
View
0  ...des/images/i18n/demo_localized_pirate.png → ...ets/images/i18n/demo_localized_pirate.png
File renamed without changes
View
0  ...guides/images/i18n/demo_translated_en.png → ...assets/images/i18n/demo_translated_en.png
File renamed without changes
View
0  ...es/images/i18n/demo_translated_pirate.png → ...ts/images/i18n/demo_translated_pirate.png
File renamed without changes
View
0  .../images/i18n/demo_translation_missing.png → .../images/i18n/demo_translation_missing.png
Diff not rendered
View
0  .../guides/images/i18n/demo_untranslated.png → .../assets/images/i18n/demo_untranslated.png
Diff not rendered
View
0  railties/guides/images/icons/README → railties/guides/assets/images/icons/README
File renamed without changes
View
0  railties/guides/images/icons/callouts/1.png → ...guides/assets/images/icons/callouts/1.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/10.png → ...uides/assets/images/icons/callouts/10.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/11.png → ...uides/assets/images/icons/callouts/11.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/12.png → ...uides/assets/images/icons/callouts/12.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/13.png → ...uides/assets/images/icons/callouts/13.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/14.png → ...uides/assets/images/icons/callouts/14.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/15.png → ...uides/assets/images/icons/callouts/15.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/2.png → ...guides/assets/images/icons/callouts/2.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/3.png → ...guides/assets/images/icons/callouts/3.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/4.png → ...guides/assets/images/icons/callouts/4.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/5.png → ...guides/assets/images/icons/callouts/5.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/6.png → ...guides/assets/images/icons/callouts/6.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/7.png → ...guides/assets/images/icons/callouts/7.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/8.png → ...guides/assets/images/icons/callouts/8.png
Diff not rendered
View
0  railties/guides/images/icons/callouts/9.png → ...guides/assets/images/icons/callouts/9.png
Diff not rendered
View
0  railties/guides/images/icons/caution.png → ...es/guides/assets/images/icons/caution.png
Diff not rendered
View
0  railties/guides/images/icons/example.png → ...es/guides/assets/images/icons/example.png
Diff not rendered
View
0  railties/guides/images/icons/home.png → railties/guides/assets/images/icons/home.png
Diff not rendered
View
0  railties/guides/images/icons/important.png → .../guides/assets/images/icons/important.png
Diff not rendered
View
0  railties/guides/images/icons/next.png → railties/guides/assets/images/icons/next.png
Diff not rendered
View
0  railties/guides/images/icons/note.png → railties/guides/assets/images/icons/note.png
Diff not rendered
View
0  railties/guides/images/icons/prev.png → railties/guides/assets/images/icons/prev.png
Diff not rendered
View
0  railties/guides/images/icons/tip.png → railties/guides/assets/images/icons/tip.png
Diff not rendered
View
0  railties/guides/images/icons/up.png → railties/guides/assets/images/icons/up.png
Diff not rendered
View
0  railties/guides/images/icons/warning.png → ...es/guides/assets/images/icons/warning.png
Diff not rendered
View
0  railties/guides/images/nav_arrow.gif → railties/guides/assets/images/nav_arrow.gif
Diff not rendered
View
0  railties/guides/images/polymorphic.png → ...ties/guides/assets/images/polymorphic.png
Diff not rendered
View
0  railties/guides/images/posts_index.png → ...ties/guides/assets/images/posts_index.png
Diff not rendered
View
0  railties/guides/images/rails_guides_logo.gif → ...uides/assets/images/rails_guides_logo.gif
Diff not rendered
View
0  railties/guides/images/rails_logo_remix.gif → ...guides/assets/images/rails_logo_remix.gif
Diff not rendered
View
0  railties/guides/images/rails_welcome.png → ...es/guides/assets/images/rails_welcome.png
Diff not rendered
View
0  railties/guides/images/session_fixation.png → ...guides/assets/images/session_fixation.png
Diff not rendered
View
0  railties/guides/images/tab_grey.gif → railties/guides/assets/images/tab_grey.gif
Diff not rendered
View
0  railties/guides/images/tab_info.gif → railties/guides/assets/images/tab_info.gif
Diff not rendered
View
0  railties/guides/images/tab_note.gif → railties/guides/assets/images/tab_note.gif
Diff not rendered
View
0  railties/guides/images/tab_red.gif → railties/guides/assets/images/tab_red.gif
Diff not rendered
View
0  railties/guides/images/tab_yellow.gif → railties/guides/assets/images/tab_yellow.gif
Diff not rendered
View
0  railties/guides/images/tab_yellow.png → railties/guides/assets/images/tab_yellow.png
Diff not rendered
View
0  ...ides/images/validation_error_messages.png → ...sets/images/validation_error_messages.png
Diff not rendered
View
0  ...des/files/javascripts/code_highlighter.js → ...es/assets/javascripts/code_highlighter.js
File renamed without changes
View
0  railties/guides/files/javascripts/guides.js → railties/guides/assets/javascripts/guides.js
File renamed without changes
View
0  .../guides/files/javascripts/highlighters.js → ...guides/assets/javascripts/highlighters.js
File renamed without changes
View
28 railties/guides/files/stylesheets/main.css → 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;
}
View
0  railties/guides/files/stylesheets/print.css → railties/guides/assets/stylesheets/print.css
File renamed without changes
View
0  railties/guides/files/stylesheets/reset.css → railties/guides/assets/stylesheets/reset.css
File renamed without changes
View
0  railties/guides/files/stylesheets/style.css → railties/guides/assets/stylesheets/style.css
File renamed without changes
View
0  railties/guides/files/stylesheets/syntax.css → ...ties/guides/assets/stylesheets/syntax.css
File renamed without changes
View
3  railties/guides/rails_guides/generator.rb
@@ -107,8 +107,7 @@ def select_only(guides)
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)
View
2  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.
View
12 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">
Please sign in to comment.
Something went wrong with that request. Please try again.