X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1944372af802ba3096a9bd72bca2f7ab49095a33..bd12ec7a8bfdc244756272a2f4fec1f645a6d852:/app/views/user/view.html.erb?ds=sidebyside diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index f6a4d8339..e8034510b 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,27 +1,15 @@ <%= user_image @this_user %> -

<%= h(@this_user.display_name) %> - -<% UserRole::ALL_ROLES.each do |role| %> - <% if @user and @user.administrator? %> - <% if @this_user.has_role? role %> - <%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %> - <% else %> - <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %> - <% end %> - <% elsif @this_user.has_role? role %> - <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %> - <% end %> -<% end %>

+

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

<% if @user and @this_user.id == @user.id %> <%= 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.new diary entry'), :controller => 'diary_entry', :action => 'new' %> | - <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
+ <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> | <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> | @@ -64,19 +52,19 @@ <% if @user and @user.administrator? %>
<% if ["active", "confirmed"].include? @this_user.status %> - <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% elsif ["pending"].include? @this_user.status %> - <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% end %> <% if ["active", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% end %> <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% else %> - <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% end %> - <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> + <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> <% end %>
@@ -103,7 +91,7 @@

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

-
<%= htmlize(@this_user.description) %>
+
<%= @this_user.description.to_html %>
<% if @user and @this_user.id == @user.id %>
@@ -122,8 +110,8 @@ <% if friends.empty? %> <%= t 'user.view.no friends' %> <% else %> - <%= link_to t('user.view.friends_changesets'), {:controller => 'browse', :action => 'friends'} %>
- <%= link_to t('user.view.friends_diaries'), {:controller => 'diary', :action => 'friends'} %>

+ <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
+ <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>

<%= render :partial => "contact", :collection => friends %>
@@ -134,8 +122,8 @@ <% if nearby.empty? %> <%= t 'user.view.no nearby users' %> <% else %> - <%= link_to t('user.view.nearby_changesets'), {:controller => 'browse', :action => 'nearby'} %>
- <%= link_to t('user.view.nearby_diaries'), {:controller => 'diary', :action => 'nearby'} %>

+ <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
+ <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>

<%= render :partial => "contact", :collection => nearby %>