diff options
| -rw-r--r-- | app/views/user/_user_listing_single.rhtml | 10 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 10 |
2 files changed, 19 insertions, 1 deletions
diff --git a/app/views/user/_user_listing_single.rhtml b/app/views/user/_user_listing_single.rhtml index 4f0496fd8..0113e5a65 100644 --- a/app/views/user/_user_listing_single.rhtml +++ b/app/views/user/_user_listing_single.rhtml @@ -2,8 +2,16 @@ @highlight_words = [] end %> <div class="user_listing"> + <% if display_user.profile_photo %> + <div class="user_photo_on_search"> + <a href="<%=user_url(display_user)%>"> + <img src="<%= get_profile_photo_url(:url_name => display_user.url_name) %>"> + </a> + </div> + <% end %> + <span class="head"> - <%= link_to highlight_words(display_user.name, @highlight_words), user_url(display_user) %> + <%= link_to highlight_words(display_user.name, @highlight_words), user_url(display_user) %> </span> <span class="bottomline"> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 62bc217bd..3786087d5 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -1147,6 +1147,16 @@ div.act_link img { padding: 2px; } +.user_photo_on_search img { + width: 48px; + height: 48px; + float: left; + vertical-align: middle; + border: 1px solid #dddddd; + margin-right: 5px; + padding: 2px; +} + #user_change_password_email, #user_not_logged_in { clear: left; } |