From 134bdab49d549384d22151283b431dce68ec2121 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Wed, 8 Sep 2010 20:52:35 -0700
Subject: [PATCH] group header now has a page_title field.
---
app/views/albums/index.html.haml | 4 +++-
app/views/albums/show.html.haml | 13 +++++--------
app/views/groups/index.html.haml | 3 +++
app/views/groups/show.html.haml | 3 +++
app/views/layouts/application.html.haml | 8 ++++++--
app/views/photos/show.html.haml | 4 +++-
public/stylesheets/application.css | 10 +++++++++-
public/stylesheets/sass/application.sass | 13 ++++++++++++-
8 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 2be320629c..87902a523c 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -4,7 +4,9 @@
$("#add_album_button").fancybox();
});
-.back= link_to "⇧ home", root_path
+= content_for :page_title do
+ = link_to "Albums", albums_path
+
%h1.big_text
Albums
.right
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 80abbacd6e..5e6e648176 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -5,19 +5,16 @@
});
});
+= content_for :page_title do
+ = link_to @album.name, @album
+
.album_id{:id => @album.id, :style => "display:hidden;"}
-.back= link_to '⇧ albums', albums_path
-%h1.big_text
+%h1.big_text
= @album.name
- -if current_user.owns? @album
- .right
- #add_photo_loader
- = image_tag 'ajax-loader.gif'
- = link_to 'Add Photos', '#new_photo_pane', :class => 'button', :id => "add_photo_button"
-
+-if current_user.owns? @album
=render 'photos/new_photo'
.yo{:style => "display:none;"}
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index 6c3039aef6..e4e18829e6 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+ Home
+
%ul#stream
- for post in @posts
= render type_partial(post), :post => post unless post.class == Album
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 64a7a48a57..822a33ef43 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+ Home
+
%ul#stream
- for post in @posts
= render type_partial(post), :post => post
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 63ef4736a1..c53434d963 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -60,10 +60,14 @@
.span-5.last
- if @group == :all
%h1
- All Groups
+ = link_to "All Groups", root_path
- else
%h1
- = @group.name
+ = link_to @group.name, @group
+
+ .page_title
+ = yield :page_title
+
.span-19.last
= render "shared/publisher", :group_ids => :all
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 27afac74ce..51c7234f51 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -10,8 +10,10 @@
}
});
+= content_for :page_title do
+ = link_to "Photo", @photo
+
-.back= link_to "⇧ #{@album.name}", album_path(@album)
%h1.big_text
= @photo.image
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 65f6223214..d5c0f5b909 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -96,6 +96,7 @@ header {
position: relative;
display: inline;
float: right;
+ z-index: 3;
padding-right: 10px; }
header #session_action a.new_requests {
color: #df0101; }
@@ -107,7 +108,14 @@ header {
height: 85px; }
header #group_header h1 {
margin-bottom: 0;
- margin-top: 27px; }
+ margin-top: 15px; }
+ header #group_header a {
+ color: #111111; }
+ header #group_header a:hover {
+ background: none;
+ color: #333333; }
+ header #group_header .page_title {
+ text-transform: uppercase; }
#show_filters {
z-index: 100;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 278745ed4f..c86603a279 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -128,7 +128,18 @@ header
h1
:margin
:bottom 0
- :top 27px
+ :top 15px
+
+ a
+ :color #111
+ &:hover
+ :background none
+ :color #333
+
+ .page_title
+ :text
+ :transform uppercase
+
#show_filters
:z-index 100
--
GitLab