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

Wrap evaluation of default values for parameters inside the HTML escaping

Browse source 
as that causes nil to become "" hence defeating the conditional default.
This commit is contained in:
Tom Hughes 2007-11-24 14:13:21 +00:00
parent 144640c9ed
commit 7de4cb19b8
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/diary_entry/new.rhtml
View file

@ -23,9 +23,9 @@
<% end %> <% end %>
<% if @user.home_lat.nil? or @user.home_lon.nil? %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
<% lon = h(params['lon']) || '-0.1' %> <% lon = h(params['lon'] || '-0.1') %>
<% lat = h(params['lat']) || '51.5' %> <% lat = h(params['lat'] || '51.5') %>
<% zoom = h(params['zoom']) || '4' %> <% zoom = h(params['zoom'] || '4') %>
<% else %> <% else %>
<% lon = @user.home_lon %> <% lon = @user.home_lon %>
<% lat = @user.home_lat %> <% lat = @user.home_lat %>

8
app/views/site/edit.rhtml
View file

@ -26,15 +26,15 @@
<% if params['mlon'] and params['mlat'] %> <% if params['mlon'] and params['mlat'] %>
<% lon = h(params['mlon']) %> <% lon = h(params['mlon']) %>
<% lat = h(params['mlat']) %> <% lat = h(params['mlat']) %>
<% zoom = h(params['zoom']) || '12' %> <% zoom = h(params['zoom'] || '12') %>
<% elsif @user and params['lon'].nil? and params['lat'].nil? %> <% elsif @user and params['lon'].nil? and params['lat'].nil? %>
<% lon = @user.home_lon %> <% lon = @user.home_lon %>
<% lat = @user.home_lat %> <% lat = @user.home_lat %>
<% zoom = '12' %> <% zoom = '12' %>
<%else%> <%else%>
<% lon = h(params['lon']) || '-0.1' %> <% lon = h(params['lon'] || '-0.1') %>
<% lat = h(params['lat']) || '51.5' %> <% lat = h(params['lat'] || '51.5') %>
<% zoom = h(params['zoom']) || '12' %> <% zoom = h(params['zoom'] || '12') %>
<% end %> <% end %>
<div id="map">You need a Flash player to use Potlatch, the <div id="map">You need a Flash player to use Potlatch, the

6
app/views/site/index.rhtml
View file

@ -43,12 +43,12 @@ by the OpenStreetMap project and it's contributors.
<% if params['lon'] and params['lat'] %> <% if params['lon'] and params['lat'] %>
<% lon = h(params['lon']) %> <% lon = h(params['lon']) %>
<% lat = h(params['lat']) %> <% lat = h(params['lat']) %>
<% zoom = h(params['zoom']) || '5' %> <% zoom = h(params['zoom'] || '5') %>
<% layers = h(params['layers']) %> <% layers = h(params['layers']) %>
<% elsif params['mlon'] and params['mlat'] %> <% elsif params['mlon'] and params['mlat'] %>
<% lon = h(params['mlon']) %> <% lon = h(params['mlon']) %>
<% lat = h(params['mlat']) %> <% lat = h(params['mlat']) %>
<% zoom = h(params['zoom']) || '12' %> <% zoom = h(params['zoom'] || '12') %>
<% layers = h(params['layers']) %> <% layers = h(params['layers']) %>
<% elsif cookies.key?("location") %> <% elsif cookies.key?("location") %>
<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %> <% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
@ -67,7 +67,7 @@ by the OpenStreetMap project and it's contributors.
<% else %> <% else %>
<% lon = '-0.1' %> <% lon = '-0.1' %>
<% lat = '51.5' %> <% lat = '51.5' %>
<% zoom = h(params['zoom']) || '5' %> <% zoom = h(params['zoom'] || '5') %>
<% layers = h(params['layers']) %> <% layers = h(params['layers']) %>
<% end %> <% end %>
<% end %> <% end %>

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

@ -34,9 +34,9 @@
</script> </script>
<% if @user.home_lat.nil? or @user.home_lon.nil? %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
<% lon = h(params['lon']) || '-0.1' %> <% lon = h(params['lon'] || '-0.1') %>
<% lat = h(params['lat']) || '51.5' %> <% lat = h(params['lat'] || '51.5') %>
<% zoom = h(params['zoom']) || '4' %> <% zoom = h(params['zoom'] || '4') %>
<% else %> <% else %>
<% marker = true %> <% marker = true %>
<% mlon = @user.home_lon %> <% mlon = @user.home_lon %>