person sidebar has a view all; displays user images with names in tooltips instead of text
This commit is contained in:
parent
9095a06738
commit
03e06cb279
6 changed files with 19 additions and 20 deletions
|
|
@ -45,7 +45,15 @@ module ApplicationHelper
|
||||||
image_location = person.profile.image_url
|
image_location = person.profile.image_url
|
||||||
image_location ||= "/images/user/default.jpg"
|
image_location ||= "/images/user/default.jpg"
|
||||||
|
|
||||||
image_tag image_location, :class => "person_picture"
|
image_tag image_location, :class => "person_picture", :alt => person.real_name, :title => person.real_name
|
||||||
|
end
|
||||||
|
|
||||||
|
def person_image_link(person)
|
||||||
|
link_to person_image_tag(person), object_path(person)
|
||||||
|
end
|
||||||
|
|
||||||
|
def owner_image_link
|
||||||
|
person_image_link(User.owner)
|
||||||
end
|
end
|
||||||
|
|
||||||
def new_request(request_count)
|
def new_request(request_count)
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
.span-18.append-3.last
|
.span-18.append-3.last
|
||||||
= yield
|
= yield
|
||||||
.span-3.last
|
.span-3.last
|
||||||
= link_to person_image_tag(User.owner), root_path
|
= link_to (image_tag(current_user.profile.image_url)), root_path
|
||||||
= link_to "Edit your profile", edit_user_path(current_user)
|
= link_to "Edit your profile", edit_user_path(current_user)
|
||||||
%br
|
%br
|
||||||
%br
|
%br
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,16 @@
|
||||||
%ul#friend_stream.nav
|
%ul#friend_stream.nav
|
||||||
|
|
||||||
%h4 friends!
|
%h3 friends
|
||||||
- for friend in @friends
|
- for friend in @friends
|
||||||
%li= link_to friend.real_name, person_path(friend)
|
%li= person_image_link(friend)
|
||||||
|
|
||||||
|
= link_to "all", people_path
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
%h4 on other networks!
|
%h3 following
|
||||||
|
|
||||||
- for author in @subscribed_persons
|
- for author in @subscribed_persons
|
||||||
%li= link_to author.username, author_path(author)
|
%li= link_to author.username, author_path(author)
|
||||||
|
|
||||||
%li= link_to "add a new person", new_request_path
|
= link_to "add a new person", new_request_path
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
%li.message{:id => post.id, :class => ("mine" if mine?(post))}
|
%li.message{:id => post.id, :class => ("mine" if mine?(post))}
|
||||||
|
|
||||||
= person_image_tag(post.person)
|
= person_image_link(post.person)
|
||||||
|
|
||||||
%span.from
|
%span.from
|
||||||
= link_to post.person.real_name, post.person
|
= link_to post.person.real_name, post.person
|
||||||
|
|
|
||||||
|
|
@ -196,15 +196,10 @@ ul.comment_set {
|
||||||
padding-bottom: 8px; }
|
padding-bottom: 8px; }
|
||||||
|
|
||||||
img.person_picture {
|
img.person_picture {
|
||||||
max-width: 100%;
|
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
-webkit-border-radius: 3px;
|
-webkit-border-radius: 3px;
|
||||||
-moz-border-radius: 3px;
|
-moz-border-radius: 3px;
|
||||||
display: inline block; }
|
display: inline block;
|
||||||
|
|
||||||
li.message > img.person_picture,
|
|
||||||
li.comment > img.person_picture,
|
|
||||||
#session_action > img.person_picture {
|
|
||||||
height: 30px;
|
height: 30px;
|
||||||
display: absolute;
|
display: absolute;
|
||||||
float: left;
|
float: left;
|
||||||
|
|
|
||||||
|
|
@ -236,15 +236,10 @@ ul.comment_set
|
||||||
:bottom 8px
|
:bottom 8px
|
||||||
|
|
||||||
img.person_picture
|
img.person_picture
|
||||||
:max-width 100%
|
|
||||||
:border-radius 3px
|
:border-radius 3px
|
||||||
:-webkit-border-radius 3px
|
:-webkit-border-radius 3px
|
||||||
:-moz-border-radius 3px
|
:-moz-border-radius 3px
|
||||||
:display inline block
|
:display inline block
|
||||||
|
|
||||||
li.message > img.person_picture,
|
|
||||||
li.comment > img.person_picture,
|
|
||||||
#session_action > img.person_picture
|
|
||||||
:height 30px
|
:height 30px
|
||||||
:display absolute
|
:display absolute
|
||||||
:float left
|
:float left
|
||||||
|
|
@ -416,4 +411,4 @@ ul#publisher_content_pickers li
|
||||||
.field_with_submit
|
.field_with_submit
|
||||||
input[type='text']
|
input[type='text']
|
||||||
:width 85%
|
:width 85%
|
||||||
:display inline
|
:display inline
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue