diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 96e7f36adc378d699558993f295bf95cc1b27f10..114eef205d3776fb8dcb5a36fc9cf78e0ecebba6 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -24,7 +24,7 @@ }); = content_for :page_title do - = link_to "Home", aspects_path + = link_to "â—‚ Home", aspects_path - content_for :left_pane do = render "shared/aspect_friends" @@ -32,7 +32,8 @@ - content_for :publish do %h1 Albums - = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"} + .right + = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"} .yo{:style => "display:none;" } #new_album_pane diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index b0d6710db66700b3c18029d1003b04cb71faf5b1..10a239c64ce66850ba64267bf2588a22b9b05bd4 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -25,7 +25,7 @@ }); = content_for :page_title do - = link_to "Albums", albums_path + = link_to "â—‚ Albums", albums_path - content_for :left_pane do = render "shared/aspect_friends" diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9275e8c17f12a53ea85a54aff06384f16fbc7e4b..0d510228ce78ad9e9d16f1a7f19c7e031def91e1 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -86,7 +86,7 @@ .page_title = yield :page_title - .span-19.last + .span-19.last{ :style => "position:relative;" } = yield :publish .container diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index d659124a735618cdd07d0837a787c844d5e78db6..a7fc49647437439dc40669ace1b9c11f28b7d712 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -30,26 +30,26 @@ }); = content_for :page_title do - = link_to "Photo", @photo + = link_to "â—‚ #{@photo.album.name}", @photo.album - content_for :left_pane do = render "shared/aspect_friends" +- content_for :publish do + %h1 + = @photo.image -%h1.big_text - = @photo.image - - .right - -if current_user.owns? @album - = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button" - -.sub_header = link_to "<< prev", url_to_prev(@photo, @album) | = link_to "full size", @photo.url | = link_to "next >>", url_to_next(@photo, @album) + .right + -if current_user.owns? @album + = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button" + + %div{:id => @photo.id} #show_photo = linked_scaled_photo @photo, @album