Prefer using _html locale keys to the raw function

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index b323ff1580d5901c7d1ffff86ac1645baddf8dbb..0369401eb8eb523dfd9d34201ff25c83a2f1362e 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,18 +1,6 @@
 <%= user_image @this_user %>
 
 <%= user_image @this_user %>
 

-<h2><%= 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 %></h2>
+<h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2>

 
 <div id="userinformation">
   <% if @user and @this_user.id == @user.id %>
 
 <div id="userinformation">
   <% if @user and @this_user.id == @user.id %>


@@ -103,7 +91,7 @@
 
 <h3><%= t 'user.view.description' %></h3>
 
 
 <h3><%= t 'user.view.description' %></h3>
 

-<div id="description"><%= htmlize(@this_user.description) %></div>
+<div id="description"><%= @this_user.description.to_html %></div>

 
 <% if @user and @this_user.id == @user.id %>
   <div id="map" class="user_map">
 
 <% if @user and @this_user.id == @user.id %>
   <div id="map" class="user_map">