-<h2><%= @this_user.display_name %></h2>
+<% @this_user = User.find_by_display_name(@this_user.display_name) %>
+<h2><%= h(@this_user.display_name) %></h2>
+<div id="userinformation">
<% if @user and @this_user.id == @user.id %>
-<h3>Messages</h3>
-<% if @user.has_messages? %>
-<p>You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length - @user.get_new_messages.length %> old messages:</p>
+<%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+| <%= link_to 'new diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+| <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %>
+| <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+<% else %>
+<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+| <%= link_to 'diary', :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
+| <%= link_to 'traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
+| <% if @user and @user.is_friends_with?(@this_user) %>
+ <%= link_to 'remove as friend', :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
+<% else %>
+ <%= link_to 'add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
+<% end %>
+<% end %>
+</div>
-<div id = "messages">
-<table class="messages">
-<th>from<th>
-<th>title<th>
-<th>received on<th>
-<th>mark as read<th>
-<th>reply<th>
-<th><th>
+<h3>User image</h3>
+<% if @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 %>
+<br />
-<% if params[:unread] %>
-<% @user.get_all_messages.each do |message| %>
-<tr><td><%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %></td>
-<td><%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %></td>
-<td><%= message.sent_on %></td>
-<% if message.message_read = 0 %>
-<td><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> </td>
-<td><%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => message.from_user_id %> </td>
-<%else%>
-<td>message read</td>
-<%end%>
-<%end%>
-</tr>
+<% if @user and @this_user.id == @user.id %>
+ Upload an image<br />
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+ <%= file_column_field 'user', 'image' %>
+ <%= submit_tag 'Add Image' %>
+ </form>
+<% end %>
-<%else%>
+<h3>Description</h3>
+<div id="description"><%= htmlize(@this_user.description) %></div>
-<% @user.get_new_messages.each do |message| %>
-<tr><td><%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %></td>
-<td><%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %></td>
-<td><%= message.sent_on %></td>
-<% if message.message_read = 0 %>
-<td><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> </td>
-<%else%>
-<td>message read</td>
-<%end%>
-</tr>
+<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+<h3>User location</h3>
-<%end%>
+ No home location has been set.
+ <% if @user and @this_user.id == @user.id %>
+ 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 %>
-<%end%>
-</table>
-</div>
+ <% if @user and @this_user.id == @user.id %>
+ <h3>Your friends</h3>
+ <% if @this_user.friends.empty? %>
+ You have not added any friends yet.
+ <% else %>
+ <table id="friends">
+ <% @this_user.friends.each do |friend| %>
+ <% @friend = User.find_by_id(friend.friend_user_id) %>
+ <tr>
+ <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>
+ <%end%>
+ </table>
+ <%end%>
+ <br/>
+ <%end%>
-<%else%>
-<p>You have no messages. </p>
-<%end%>
-<br />
-<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
-<br />
-<h3>Your account</h3>
-Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area.
-<br />
-<br />
-<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %>
+ <% if @user and @this_user.id == @user.id %>
+ <h3>Nearby users:</h3>
+ <% if @this_user.nearby.empty? %>
+ There are no users who admit to mapping nearby yet.
+ <% else %>
-<% else %>
-<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /><br />
-<%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
-<%= link_to 'Diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %>
+ <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 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>
+ <% end %>
+ </table>
+ <% end %>
+ <% end %>
<% end %>
-<br />
-<br />
-
-<p><%= params[:display_name] %> says: </p>
-<%= simple_format(@this_user.description) %>
-
-
projects / rails.git / blobdiff