From 2db680dd9835bdfb01ebfff90398ae5a9d8b45da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Fri, 3 Dec 2010 09:48:47 +0200
Subject: Refactored nav partial, added 'blog home' to locale and removed
 unneeded <nav></nav> tags.

---
 app/views/blog/posts/_nav.html.erb  | 20 +++++++++-----------
 app/views/blog/posts/_post.html.erb |  4 +---
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'app/views/blog')

diff --git a/app/views/blog/posts/_nav.html.erb b/app/views/blog/posts/_nav.html.erb
index 50391ee..c73a294 100644
--- a/app/views/blog/posts/_nav.html.erb
+++ b/app/views/blog/posts/_nav.html.erb
@@ -1,13 +1,11 @@
-<% if next_or_previous?(@blog_post) -%>
-  <nav id="next_prev_article">
-    <% if @blog_post.next.present? -%>
-      <%= link_to raw(truncate(@blog_post.next.title) + "&nbsp;&#187;"), @blog_post.next, :class => 'next' %>
-    <% end -%>
+<nav id="next_prev_article">
+  <% if @blog_post.next.present? -%>
+    <%= link_to (truncate(@blog_post.next.title) + " &#187;").html_safe, @blog_post.next, :class => 'next' %>
+  <% end -%>
 
-    <%= link_to 'Blog Home', blog_root_path, :class => 'home' %>
+  <%= link_to t('blog.posts.show.blog_home'), blog_root_path, :class => 'home' %>
 
-    <% if @blog_post.prev.present? -%>
-      <%= link_to "&#171;&nbsp;".html_safe + truncate(@blog_post.prev.title), @blog_post.prev, :class => 'prev' %>
-    <% end -%>
-  </nav><!-- /next_prev_article -->
-<% end -%>
+  <% if @blog_post.prev.present? -%>
+    <%= link_to ("&#171; " + truncate(@blog_post.prev.title)).html_safe, @blog_post.prev, :class => 'prev' %>
+  <% end -%>
+</nav><!-- /next_prev_article -->
diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb
index 6fb8e64..fc58af6 100644
--- a/app/views/blog/posts/_post.html.erb
+++ b/app/views/blog/posts/_post.html.erb
@@ -28,7 +28,5 @@
 </article>
 <%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%>
 <% if next_or_previous?(@blog_post) -%>
-  <nav id="next_prev_article">
-    <%= render 'nav' %>
-  </nav><!-- /next_prev_article -->
+  <%= render 'nav' %>
 <% end -%>
-- 
cgit v1.2.3