From fd8d92a09573cc4ade0bda98cc2840cb7680325d Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 9 Aug 2010 20:23:01 -0700
Subject: [PATCH] moved next/prev links in photo show to be inline with full
 size link.

---
 app/helpers/photos_helper.rb             |  2 +-
 app/views/photos/show.html.haml          | 11 ++++-------
 public/stylesheets/application.css       |  3 ---
 public/stylesheets/sass/application.sass |  4 ----
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index b858aaf7e..b9231fe94 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -5,7 +5,7 @@ module PhotosHelper
   end
 
   def link_to_prev(photo, album)
-    link_to "<< previous", photo_path(album.prev_photo(photo)), :rel => "prefetch"
+    link_to "<< prev", photo_path(album.prev_photo(photo)), :rel => "prefetch"
   end
 
   def link_to_next(photo, album)
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index e27988446..9cae263dd 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -7,21 +7,18 @@
     = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button"
 
 .sub_header
+  = link_to_prev @photo, @album
+  |
   = link_to "full size", @photo.image.url
+  |
+  = link_to_next @photo, @album
 
 %div{:id => @photo.id}
-
   #show_photo
     = linked_scaled_photo @photo, @album
-
     .caption
       = @photo.caption
 
-  #next_prev_links
-    = link_to_prev @photo, @album
-    |
-    = link_to_next @photo, @album
-
   #content_bottom
     .back
       = link_to "⇧ #{@album.name}", album_path(@album)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6867646cb..0e4fa22ef 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -414,9 +414,6 @@ h1.big_text {
   margin-bottom: 20px;
   color: #999999; }
 
-#next_prev_links {
-  text-align: center; }
-
 .image_thumb {
   display: inline-block;
   width: 100px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0db9a9a97..66c7101f6 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -516,10 +516,6 @@ h1.big_text
     :bottom 20px
   :color #999
 
-#next_prev_links
-  :text-align center
-
-
 .image_thumb
   :display inline-block
   :width 100px