Skip to content

Commit

Permalink
Merge branch 'master' of github.com:cloudhead/dorothy
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudhead committed Feb 7, 2010
2 parents 0cd08fa + e8dd6da commit d2514ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion templates/pages/archives.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<% if archives.length > 0 %>
<% for entry in archives %>
<li>
<a href="<%= entry.url %>"><%= entry.title %></a>
<a href="<%= entry.path %>"><%= entry.title %></a>
</li>
<% end %>
<% else %>
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/index.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<% for article in articles[0...3] %>
<article class="post">
<header>
<h1><a href="<%= article.url %>"><%= article.title %></a></h1>
<h1><a href="<%= article.path %>"><%= article.title %></a></h1>
<span class="date"><%= article.date %></span>
</header>

<section class="content">
<%= article.summary %>
</section>
<div class="more"><a href="<%= article.url %>">read on &raquo;</a></div>
<div class="more"><a href="<%= article.path %>">read on &raquo;</a></div>
</article>
<% end %>
</section>
Expand Down

0 comments on commit d2514ab

Please sign in to comment.