<% if @this_user.image %>
- <%= image_tag url_for_file_column(@this_user, "image") %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+ <% if @user and @this_user.id == @user.id %>
+ <%= button_to 'Delete Image', :action => 'delete_image' %>
+ <% end %>
<% end %>
@@ -28,19 +41,19 @@
Upload an image
<%= form_tag({:action=>'upload_image'}, :multipart => true)%>
<%= file_column_field 'user', 'image' %>
-
+ <%= submit_tag 'Add Image' %>
<% end %>
-
Description
<%= simple_format(@this_user.description) %>
+
Description
+
<%= htmlize(@this_user.description) %>
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
User location
No home location has been set.
<% if @user and @this_user.id == @user.id %>
- You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
+ If you set your location, a pretty map and stuff will appear below. You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
<% end %>
<% else %>
@@ -58,7 +71,7 @@
<%= image_tag url_for_file_column(@friend, "image") %>
<% end %>
-
@@ -89,3 +102,9 @@
<% end %>
<% end %>
<% end %>
+
+
+
+<% if @user and @this_user.id == @user.id %>
+<%= link_to 'change your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+<% end %>
\ No newline at end of file