X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63970defb0bb4e06fda7ba39cf7e82396072ead1..36203ebe261d38bab5a17ac866c6ed384d70e978:/app/views/user/view.rhtml?ds=inline

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 4a7bd669c..f27ce6f0a 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,5 +1,5 @@
 <% @this_user = User.find_by_display_name(@this_user.display_name) %>
-<h2><%= @this_user.display_name %></h2>
+<h2><%= h(@this_user.display_name) %></h2>
 <div id="userinformation">
 <% if @user and @this_user.id == @user.id %>
 <%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
@@ -18,6 +18,21 @@
 <% end %>
 </div>
 
+<h3>User image</h3>
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+<br />
+
+<% if @user and @this_user.id == @user.id %>
+  Upload an image<br />
+  <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+    <%= file_column_field 'user', 'image' %>
+    <input type="submit" name="Upload" />
+  </form>
+<% end %>
+
+<h3>Description</h3>
 <div id="description"><%= simple_format(@this_user.description) %></div>
 
 <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
@@ -25,7 +40,7 @@
 
   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 %>
 
@@ -38,7 +53,12 @@
       <% @this_user.friends.each do |friend| %>
       <% @friend = User.find_by_id(friend.friend_user_id) %>
       <tr>
-      <td class="username"><%= link_to @friend.display_name, :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
+      <td class="image">
+      <% if @friend.image %>
+        <%= image_tag url_for_file_column(@friend, "image") %>
+      <% end %>
+      </td>
+      <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
       <td><% if @friend.home_lon and @friend.home_lat %><%= @this_user.distance(@friend).round %>km away<% end %></td>
       <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
@@ -55,12 +75,12 @@
       There are no users who admit to mapping nearby yet.
     <% else %>
 
-    <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 300px;"></div>
+    <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px;"></div>
     <%= render :partial => 'friend_map' %>
       <table id="nearbyusers">
       <% @this_user.nearby.each do |nearby| %>
       <tr>
-      <td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
+      <td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
       <td><%= @this_user.distance(nearby).round %>km away</td>
       <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
       </tr>