Merge branch 'master' of git://github.com/LindseyB/rstat.us

toypaj · Mar 24, 2011 · a2a17b8 · a2a17b8
2 parents ab0bb11 + 0bdd861
commit a2a17b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/public/css/internal.css b/public/css/internal.css
@@ -865,6 +865,9 @@ body {
 .user-list .even {
   background: #e5e5e5;
 }
+.pagination {
+  margin-top: 0.5em;
+}
 #next_button {
   float: right;
   margin-right: 0.5em;
@@ -873,6 +876,9 @@ body {
   float: left;
   margin-left: 0.5em;
 }
+.pagination #next_button, .pagination #prev_button {
+  margin: 0em;
+}
 #sites {
   width: 350px;
   float: left;

diff --git a/views/dashboard.haml b/views/dashboard.haml
@@ -7,10 +7,11 @@
 != haml :_navigation
 #timeline.updates
   != haml :_updates, :locals => {:updates => @updates.to_a.sort{|a, b| b.created_at <=> a.created_at }}
-  - unless @prev_page.nil?
-    %a.button{:href => @prev_page, :id => "prev_button"}
-      &laquo; Previous
+  %nav.pagination
+    - unless @prev_page.nil?
+      %a.button{:href => @prev_page, :id => "prev_button"}
+        &laquo; Previous
 
-  - unless @next_page.nil?
-    %a.button{:href => @next_page, :id => "next_button"}
-      Next &raquo;
+    - unless @next_page.nil?
+      %a.button{:href => @next_page, :id => "next_button"}
+        Next &raquo;