DG IZ; moved info on the person show page
This commit is contained in:
parent
5812bbd1f1
commit
f70ade6705
7 changed files with 28 additions and 21 deletions
|
|
@ -7,6 +7,9 @@
|
||||||
= content_for :page_title do
|
= content_for :page_title do
|
||||||
= link_to "Albums", albums_path
|
= link_to "Albums", albums_path
|
||||||
|
|
||||||
|
- content_for :left_pane do
|
||||||
|
= render "shared/group_friends"
|
||||||
|
|
||||||
%h1.big_text
|
%h1.big_text
|
||||||
Albums
|
Albums
|
||||||
.right
|
.right
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,9 @@
|
||||||
= content_for :page_title do
|
= content_for :page_title do
|
||||||
= link_to @album.name, @album
|
= link_to @album.name, @album
|
||||||
|
|
||||||
|
- content_for :left_pane do
|
||||||
|
= render "shared/group_friends"
|
||||||
|
|
||||||
|
|
||||||
.album_id{:id => @album.id, :style => "display:hidden;"}
|
.album_id{:id => @album.id, :style => "display:hidden;"}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
Home
|
Home
|
||||||
|
|
||||||
|
- content_for :left_pane do
|
||||||
|
= render "shared/group_friends"
|
||||||
|
|
||||||
%ul#stream
|
%ul#stream
|
||||||
- for post in @posts
|
- for post in @posts
|
||||||
= render type_partial(post), :post => post unless post.class == Album
|
= render type_partial(post), :post => post unless post.class == Album
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
Home
|
Home
|
||||||
|
|
||||||
|
- content_for :left_pane do
|
||||||
|
= render "shared/group_friends"
|
||||||
|
|
||||||
%ul#stream
|
%ul#stream
|
||||||
- for post in @posts
|
- for post in @posts
|
||||||
= render type_partial(post), :post => post
|
= render type_partial(post), :post => post
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,8 @@
|
||||||
|
|
||||||
.container
|
.container
|
||||||
.span-5.last
|
.span-5.last
|
||||||
= render "shared/group_friends"
|
|
||||||
|
= yield :left_pane
|
||||||
|
|
||||||
.span-19.last
|
.span-19.last
|
||||||
= yield
|
= yield
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
.span-20.last
|
- content_for :page_title do
|
||||||
#profile.span-19.last
|
= @person.real_name
|
||||||
|
|
||||||
|
- content_for :left_pane do
|
||||||
|
#profile
|
||||||
.profile_photo
|
.profile_photo
|
||||||
= person_image_link(@person)
|
= person_image_link(@person)
|
||||||
|
|
||||||
%h1
|
|
||||||
= @person.real_name
|
|
||||||
- if @person != current_user.person && current_user.friends.include?(@person)
|
|
||||||
.right
|
|
||||||
= link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
|
|
||||||
|
|
||||||
%ul
|
%ul
|
||||||
-unless @posts.first.nil?
|
-unless @posts.first.nil?
|
||||||
%li
|
%li
|
||||||
|
|
@ -22,19 +18,14 @@
|
||||||
= hidden_field_tag :from, :from, :value => @groups_with_person.first.id
|
= hidden_field_tag :from, :from, :value => @groups_with_person.first.id
|
||||||
= hidden_field_tag :friend_id, :friend_id, :value => @person.id
|
= hidden_field_tag :friend_id, :friend_id, :value => @person.id
|
||||||
= submit_tag "save"
|
= submit_tag "save"
|
||||||
%li
|
|
||||||
url:
|
- if @person != current_user.person && current_user.friends.include?(@person)
|
||||||
= @person.url
|
= link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
|
||||||
|
|
||||||
- unless @latest_status_message.nil?
|
.span-20.last
|
||||||
%h1.pinched
|
|
||||||
%span
|
|
||||||
= "\"#{@latest_status_message.message}\""
|
|
||||||
%span="posted: #{how_long_ago(@latest_status_message)}"
|
|
||||||
|
|
||||||
.span-20.last
|
.span-19.last
|
||||||
- if @posts
|
- if @posts
|
||||||
%h3= "stream - #{@post_count} item(s)"
|
|
||||||
%ul#stream
|
%ul#stream
|
||||||
- for post in @posts
|
- for post in @posts
|
||||||
= render type_partial(post), :post => post unless post.class == Album
|
= render type_partial(post), :post => post unless post.class == Album
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@
|
||||||
= content_for :page_title do
|
= content_for :page_title do
|
||||||
= link_to "Photo", @photo
|
= link_to "Photo", @photo
|
||||||
|
|
||||||
|
- content_for :left_pane do
|
||||||
|
= render "shared/group_friends"
|
||||||
|
|
||||||
|
|
||||||
%h1.big_text
|
%h1.big_text
|
||||||
= @photo.image
|
= @photo.image
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue