Modified: branches/rails2/app/views/users/_listing.rhtml (2771 => 2772)
--- branches/rails2/app/views/users/_listing.rhtml 2011-10-31 12:08:08 UTC (rev 2771)
+++ branches/rails2/app/views/users/_listing.rhtml 2011-10-31 13:05:13 UTC (rev 2772)
@@ -34,27 +34,31 @@
<% if user.profile %>
+ <% separator ="" %>
<p style="font-size: 85%;">
<% unless user.profile.website.blank? %>
<b>Website:</b>
- <%= link_to h(user.profile.website), h(user.profile.website), :popup => true %>
- |
+ <%= link_to h(user.profile.website), h(user.profile.website), :rel => "nofollow", :popup => true %>
+ <% separator = "|" %>
<% end %>
<% unless user.profile.email.blank? %>
+ <%= separator %>
<b>Email (public):</b>
<%= mail_to user.profile.email, nil, { :encode => "hex", :replace_at => " [at] " } %>
<% end %>
</p>
+ <% separator ="" %>
<p style="font-size: 85%;">
<% unless user.profile.field_or_industry.blank? %>
<b>Field/Industry:</b>
<%= h user.profile.field_or_industry %>
- |
+ <% separator = "|" %>
<% end %>
<% unless user.profile.occupation_or_roles.blank? %>
+ <%= separator %>
<b>Occupation/Role(s):</b>
<%= h user.profile.occupation_or_roles %>
<% end %>
@@ -79,7 +83,7 @@
<% if logged_in? && this_user_is_friend_of_current_user %>
<% master_id, friendship_obj = current_user.friendship_from_self_id_and_friends_id(user.id) %>
- <%= icon "friend_delete", user_friendship_path(master_id, friendship_obj) + "?return_to=" + currentusers_things_url('friends'), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %>
+ <%= icon "friend_delete", user_friendship_path(current_user, friendship_obj) + "?return_to=" + currentusers_things_url('friends'), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %>
<% end %>
<% end %>
Modified: branches/rails2/app/views/users/show.rhtml (2771 => 2772)
--- branches/rails2/app/views/users/show.rhtml 2011-10-31 12:08:08 UTC (rev 2771)
+++ branches/rails2/app/views/users/show.rhtml 2011-10-31 13:05:13 UTC (rev 2772)
@@ -47,7 +47,7 @@
<li><%= icon("message", new_message_path(:user_id => @user.id), nil, nil, "Send Message") %></li>
<% if this_user_is_friend_of_current_user %>
<% master_id, friendship_obj = current_user.friendship_from_self_id_and_friends_id(@user.id) %>
- <li><%= icon "friend_delete", user_friendship_path(master_id, friendship_obj) + "?return_to=" + user_path(@user), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %></li>
+ <li><%= icon "friend_delete", user_friendship_path(current_user, friendship_obj) + "?return_to=" + user_path(@user), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %></li>
<% end %>
<% end %>