X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/44bf1d91a1ccca686f1d45ddb817d85fe3bdba9e..c372f6cc18cd8353fdd926722c10aa308bd98790:/app/views/user/view.rhtml?ds=sidebyside diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 65999abaa..37954e54b 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -1,73 +1,109 @@ -

<%= @this_user.display_name %>

+

<%= h(@this_user.display_name) %>

+
<% if @user and @this_user.id == @user.id %> -

Messages

-<% if @user.has_messages? %> -

You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length - @user.get_new_messages.length %> old messages:

+ +<%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> +| <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> +| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list_user', :display_name => @user.display_name %> +| <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> +| <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> +<% else %> + +<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %> +| <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> +| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %> +| <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> +| <% if @user and @user.is_friends_with?(@this_user) %> + <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> +<% else %> + <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> +<% end %> +<% end %> +
-
- - - - -<% if message.message_read = 0 %> - - -<%else%> - -<%end%> -<%end%> - +<% if @user and @this_user.id == @user.id %> + <%= t 'user.view.upload an image' %>
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%> + <%= file_column_field 'user', 'image' %> + <%= submit_tag t('user.view.add image') %> + +<% end %> -<%else%> +

<%= t 'user.view.description' %>

+
<%= htmlize(@this_user.description) %>
-<% @user.get_new_messages.each do |message| %> - - - -<% if message.message_read = 0 %> - -<%else%> - -<%end%> - +<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> +

<%= t 'user.view.user location' %>

-<%end%> + <%= t 'user.view.no home location' %> + <% if @user and @this_user.id == @user.id %> + <%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %> + <% end %> +<% else %> -<%end%> -
from -title -received on -mark as read -reply - +<% if @this_user != nil %> +

+<%= t 'user.view.mapper since' %><%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %> +

+<% end %> + +

<%= t 'user.view.user image heading' %>

+<% if @this_user.image %> + <%= image_tag url_for_file_column(@this_user, "image") %> + <% if @user and @this_user.id == @user.id %> + <%= button_to t('user.view.delete image'), :action => 'delete_image' %> + <% end %> +<% end %> +
-<% if params[:unread] %> -<% @user.get_all_messages.each do |message| %> -
<%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %><%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %><%= message.sent_on %><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> <%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => message.from_user_id %> message read
<%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %><%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %><%= message.sent_on %><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> message read
-
+ <% if @user and @this_user.id == @user.id %> +

<%= t 'user.view.your friends' %>

+ <% if @this_user.friends.empty? %> + <%= t 'user.view.no friends' %> + <% else %> + + <% @this_user.friends.each do |friend| %> + <% @friend = User.find_by_id(friend.friend_user_id) %> + + + + + + + <%end%> +
+ <% if @friend.image %> + <%= image_tag url_for_file_column(@friend, "image") %> + <% end %> + <%= link_to h(@friend.display_name), :controller => 'user', :action => 'view', :display_name => @friend.display_name %><% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :distance => @this_user.distance(@friend).round %><% end %>(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>)
+ <%end%> +
+ <%end%> -<%else%> -

You have no messages.

-<%end%> -
-<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %> -
-

Your account

-Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area. -
-
-<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %> + <% if @user and @this_user.id == @user.id %> +

<%= t 'user.view.nearby users' %>

+ <% if @this_user.nearby.empty? %> + <%= t 'user.view.no nearby users' %> + <% else %> -<% else %> -<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %>

-<%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>

-<%= link_to 'Diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %> +
+ <%= render :partial => 'friend_map' %> + + <% @this_user.nearby.each do |nearby| %> + + + + + + <% end %> +
<%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %><%= t 'user.view.km away', :distance => @this_user.distance(nearby).round %>(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>)
+ <% end %> + <% end %> <% end %> -
-
- -

<%= params[:display_name] %> says:

-<%= simple_format(@this_user.description) %> - +
+
+<% if @user and @this_user.id == @user.id %> +<%= link_to t('user.view.change your settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> +<% end %>