Fix escaping of unicode character in edit menu name

[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 2aca75f5322f26f75167ed1052b7f6d2b10473b3..4cb2b9e5ae5466ba035ded6291b434b5d49f8203 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,4 +1,4 @@
-<%= user_image @this_user, :style => "float: right" %>
+<%= user_image @this_user %>

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


@@ -90,13 +90,11 @@
 <div id="description"><%= htmlize(@this_user.description) %></div>
 
 <% if @user and @this_user.id == @user.id %>
 <div id="description"><%= htmlize(@this_user.description) %></div>
 
 <% if @user and @this_user.id == @user.id %>

-  <div id="map" class="user_map" style="border: 1px solid black; position: relative; width: 400px; height: 400px; float: right;">
+  <div id="map" class="user_map">

     <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
     <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>

-      <p style="position: absolute; top: 0; bottom: 0; width: 90%; height: 30%; margin: auto 5%">
-        <%= 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) %>
-      </p>
+      <p id="no_home_location"><%= raw(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)) %></p>

     <% else %>
     <% else %>

-      <%= render :partial => 'map' %>
+      <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %>

     <% end %>
   </div>
 
     <% end %>
   </div>