group header now has a page_title field.

This commit is contained in:
Daniel Vincent Grippi 2010-09-08 20:52:35 -07:00
parent 2a9e988b1f
commit 134bdab49d
8 changed files with 44 additions and 14 deletions

View file

@ -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

View file

@ -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;"}

View file

@ -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

View file

@ -1,3 +1,6 @@
- content_for :page_title do
Home
%ul#stream
- for post in @posts
= render type_partial(post), :post => post

View file

@ -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

View file

@ -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

View file

@ -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;

View file

@ -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