cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More display name escaping.

Browse source
This commit is contained in:
Tom Hughes 2008-03-04 16:53:08 +00:00
parent 0d70728fe2
commit a6089e5355
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/site.rhtml
View file

@ -20,7 +20,7 @@
<span id="greeting"> <span id="greeting">
<% if @user and @user.id %> <% if @user and @user.id %>
Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | Welcome, <%= link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> |
<% @inbox_weight = 'bold' if @user.new_messages.size > 0 %> <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %>
<%= yield :greeting %> <%= yield :greeting %>
<%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | <%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |

6
app/views/user/view.rhtml
View file

@ -1,5 +1,5 @@
<% @this_user = User.find_by_display_name(@this_user.display_name) %> <% @this_user = User.find_by_display_name(@this_user.display_name) %>
<h2><%= @this_user.display_name %></h2> <h2><%= h(@this_user.display_name) %></h2>
<div id="userinformation"> <div id="userinformation">
<% if @user and @this_user.id == @user.id %> <% if @user and @this_user.id == @user.id %>
<%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> <%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
@ -58,7 +58,7 @@
<%= image_tag url_for_file_column(@friend, "image") %> <%= image_tag url_for_file_column(@friend, "image") %>
<% end %> <% end %>
</td> </td>
<td class="username"><%= link_to @friend.display_name, :controller => 'user', :action => 'view', :display_name => @friend.display_name %></td> <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view', :display_name => @friend.display_name %></td>
<td><% if @friend.home_lon and @friend.home_lat %><%= @this_user.distance(@friend).round %>km away<% end %></td> <td><% if @friend.home_lon and @friend.home_lat %><%= @this_user.distance(@friend).round %>km away<% end %></td>
<td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td> <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
</tr> </tr>
@ -80,7 +80,7 @@
<table id="nearbyusers"> <table id="nearbyusers">
<% @this_user.nearby.each do |nearby| %> <% @this_user.nearby.each do |nearby| %>
<tr> <tr>
<td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %></td> <td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %></td>
<td><%= @this_user.distance(nearby).round %>km away</td> <td><%= @this_user.distance(nearby).round %>km away</td>
<td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td> <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
</tr> </tr>