Refactor archive helper

Now returns a list in an li instead of full markup
Progressbar · Dec 8, 2011 · 7d8588d · 7d8588d
1 parent f3d32c1
commit 7d8588d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/app/helpers/blog_posts_helper.rb b/app/helpers/blog_posts_helper.rb
@@ -2,9 +2,7 @@ module BlogPostsHelper
   def blog_archive_list
     posts = BlogPost.live.select('published_at').all_previous
     return nil if posts.blank?
-    html = '<section id="blog_archive_list"><h2>'
-    html << t('archives', :scope => 'blog.shared')
-    html << '</h2><nav><ul>'
+    html = ''
     links = []
     super_old_links = []
 
@@ -34,7 +32,6 @@ def blog_archive_list
       html << link_to(text, archive_blog_posts_path(:year => year))
       html << "</li>"
     end
-    html << '</ul></nav></section>'
     html.html_safe
   end
 

diff --git a/app/views/blog/posts/archive.html.erb b/app/views/blog/posts/archive.html.erb
@@ -13,7 +13,7 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>

diff --git a/app/views/blog/posts/index.html.erb b/app/views/blog/posts/index.html.erb
@@ -17,7 +17,7 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>

diff --git a/app/views/blog/posts/tagged.html.erb b/app/views/blog/posts/tagged.html.erb
@@ -15,7 +15,7 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>

diff --git a/app/views/blog/shared/_archive_list.html.erb b/app/views/blog/shared/_archive_list.html.erb
@@ -0,0 +1,9 @@
+<%
+  archive_posts = blog_archive_list
+%>
+<% if archive_posts.any? %>
+  <h2><%= t('archives', :scope => 'blog.shared') %></h2>
+  <ul>
+    <%= archive_posts %>
+  </ul>
+<% end %>
diff --git a/app/views/blog/shared/_posts.html.erb b/app/views/blog/shared/_posts.html.erb