Skip to content

Commit

Permalink
Merge pull request #18493 from twoller/master
Browse files Browse the repository at this point in the history
Consistent anchor text in nav links, new image [ci skip]
  • Loading branch information
senny committed Jan 17, 2015
1 parent 3e74db6 commit 242c063
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
Binary file modified guides/assets/images/getting_started/article_with_comments.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions guides/source/getting_started.md
Expand Up @@ -1266,8 +1266,8 @@ bottom of the template:
```html+erb
...
<%= link_to 'Back', articles_path %> |
<%= link_to 'Edit', edit_article_path(@article) %>
<%= link_to 'Edit', edit_article_path(@article) %> |
<%= link_to 'Back', articles_path %>
```

And here's how our app looks so far:
Expand Down Expand Up @@ -1676,8 +1676,8 @@ So first, we'll wire up the Article show template
</p>
<% end %>
<%= link_to 'Back', articles_path %> |
<%= link_to 'Edit', edit_article_path(@article) %>
<%= link_to 'Edit', edit_article_path(@article) %> |
<%= link_to 'Back', articles_path %>
```

This adds a form on the `Article` show page that creates a new comment by
Expand Down Expand Up @@ -1757,8 +1757,8 @@ add that to the `app/views/articles/show.html.erb`.
</p>
<% end %>
<%= link_to 'Edit Article', edit_article_path(@article) %> |
<%= link_to 'Back to Articles', articles_path %>
<%= link_to 'Edit', edit_article_path(@article) %> |
<%= link_to 'Back', articles_path %>
```

Now you can add articles and comments to your blog and have them show up in the
Expand Down Expand Up @@ -1823,8 +1823,8 @@ following:
</p>
<% end %>
<%= link_to 'Edit Article', edit_article_path(@article) %> |
<%= link_to 'Back to Articles', articles_path %>
<%= link_to 'Edit', edit_article_path(@article) %> |
<%= link_to 'Back', articles_path %>
```

This will now render the partial in `app/views/comments/_comment.html.erb` once
Expand Down Expand Up @@ -1873,8 +1873,8 @@ Then you make the `app/views/articles/show.html.erb` look like the following:
<h2>Add a comment:</h2>
<%= render 'comments/form' %>
<%= link_to 'Edit Article', edit_article_path(@article) %> |
<%= link_to 'Back to Articles', articles_path %>
<%= link_to 'Edit', edit_article_path(@article) %> |
<%= link_to 'Back', articles_path %>
```

The second render just defines the partial template we want to render,
Expand Down

0 comments on commit 242c063

Please sign in to comment.