Pagination view tweaks: use same style for posts and topics and show …

…pagination on top and bottom
IS3D · May 17, 2012 · 69199ee · 69199ee
1 parent 9e15e57
commit 69199ee
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/helpers/forem/application_helper.rb b/app/helpers/forem/application_helper.rb
@@ -16,6 +16,14 @@ def forem_markdown(text, *options)
       forem_format(text)
     end
 
+    def forem_pages_widget(collection)
+      if collection.num_pages > 1
+        ("<div class='pages'>\n" +
+        t('forem.common.pages') + ':' + forem_paginate(collection) + "\n" +
+        "</div>").html_safe
+      end
+    end
+
     def forem_paginate(collection, options={})
       if respond_to?(:will_paginate)
         # If parent app is using Will Paginate, we need to use it also

diff --git a/app/views/forem/forums/show.html.erb b/app/views/forem/forums/show.html.erb
@@ -1,10 +1,7 @@
 <%= render :partial => 'forem/forums/head', :locals => { :forum => @forum } %>
 
-<% if @topics.num_pages > 1 %>
-  <div class='pages'>
-    <%= t('forem.common.pages') -%>: <%= forem_paginate @topics %>
-  </div>
-<% end %>
+<%= forem_pages_widget(@topics) %>
+
 <table class='topics subdued' cellspacing='0'>
   <thead>
     <tr>
@@ -22,3 +19,5 @@
     <%= render @topics %>
   </tbody>
 </table>
+
+<%= forem_pages_widget(@topics) %>
diff --git a/app/views/forem/topics/show.html.erb b/app/views/forem/topics/show.html.erb
@@ -34,8 +34,11 @@
     </div>
   <% end %>
 
-  <%= forem_paginate @posts %>
+  <%= forem_pages_widget(@posts) %>
+
   <div id='posts'>
     <%= render :partial => "forem/posts/post", :collection => @posts %>
   </div>
+
+  <%= forem_pages_widget(@posts) %>
 </div>