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

Merging 16820:16891 from trunk.

Browse source
This commit is contained in:
Matt Amos 2009-08-06 16:24:39 +00:00
commit 0d5be22cb5
45 changed files with 206 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/views/changeset/_bbox.atom.builder Normal file
View file

@ -0,0 +1 @@
xml.a(bbox.to_s, :href => url_for(:controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes"))

1
app/views/changeset/_bbox.html.erb Normal file
View file

@ -0,0 +1 @@
<%= link_to bbox.to_s, :controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes" %>

1
app/views/changeset/_user.atom.builder Normal file
View file

@ -0,0 +1 @@
xml.a(user.display_name, :href => url_for(:controller => "user", :action => "view", :display_name => user.display_name))

1
app/views/changeset/_user.html.erb Normal file
View file

@ -0,0 +1 @@
<%= link_to user.display_name, :controller => "user", :action => "view", :display_name => user.display_name %>

6
app/views/user/reset_password.html.erb
View file

@ -1,12 +1,12 @@
<h1><%= t 'user.reset_password.heading' %></h1>
<h1><%= t 'user.reset_password.heading', :user => @user.display_name %></h1>
<%= error_messages_for :user %>
<% form_tag do %>
<%= hidden_field_tag(:token, params[:token]) %>
<table id="loginForm">
<tr><td class="fieldName"><%= t 'user.reset_password.password' %></td><td><%= password_field(:user, :pass_crypt,{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
<tr><td class="fieldName"><%= t 'user.reset_password.confirm password' %></td><td><%= password_field(:user, :pass_crypt_confirmation,{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
<tr><td class="fieldName"><%= t 'user.reset_password.password' %></td><td><%= password_field(:user, :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
<tr><td class="fieldName"><%= t 'user.reset_password.confirm password' %></td><td><%= password_field(:user, :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
<tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
<tr><td></td><td align=right><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>