From 01b14a66e88c1221f4cee94f78da11c36f531258 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Mon, 13 Sep 2010 22:51:51 -0700
Subject: [PATCH] fixed photo show header
---
app/views/albums/index.html.haml | 5 +++--
app/views/albums/show.html.haml | 2 +-
app/views/layouts/application.html.haml | 2 +-
app/views/photos/show.html.haml | 18 +++++++++---------
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 96e7f36adc..114eef205d 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 b0d6710db6..10a239c64c 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 9275e8c17f..0d510228ce 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 d659124a73..a7fc496474 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
--
GitLab