X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4143b3f77043ba4fe6a45c2432a1dfa3213f1fd2..359371b31c33d062ca31c4cc48876c81e4e6ef26:/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 1729f6818..d9a65b342 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -19,7 +19,7 @@
<%= 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 %>
|
@@ -103,7 +103,7 @@
<%= t 'user.view.description' %>
-<%= htmlize(@this_user.description) %>
+<%= @this_user.description.to_html %>
<% if @user and @this_user.id == @user.id %>
@@ -122,8 +122,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 +134,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 %>