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

Ajaxify the country selection on the terms page

Browse source
This commit is contained in:
Tom Hughes 2010-04-27 10:01:40 +01:00
parent 972278a223
commit adb0883d17
4 changed files with 58 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/user_controller.rb
View file

@ -25,7 +25,11 @@ class UserController < ApplicationController
@legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || APP_CONFIG['default_legale']
@text = OSM.legal_text_for_country(@legale)
if @user.invalid?
if request.xhr?
render :update do |page|
page.replace_html "contributorTerms", :partial => "terms"
end
elsif @user.invalid?
render :action => 'new'
end
end

30
app/views/user/_terms.html.erb Normal file
View file

@ -0,0 +1,30 @@
<p id="first"><%= @text['intro'] %></p>
<ol>
<li>
<p><%= @text['section_1'] %></p>
</li>
<li>
<p><%= @text['section_2'] %></p>
</li>
<li>
<p><%= @text['section_3'] %></p>
<p><%= @text['active_defn_1'] %></p>
<p><%= @text['active_defn_2'] %></p>
</li>
<li>
<p><%= @text['section_4'] %></p>
</li>
<li>
<p><%= @text['section_5'] %></p>
</li>
<li>
<p><%= @text['section_6'] %></p>
<ol>
<li><p><%= @text['section_6_1'] %></p></li>
<li><p><%= @text['section_6_2'] %></p></li>
</ol>
</li>
<li>
<p id="last"><%= @text['section_7'] %></p>
</li>
</ol>

58
app/views/user/terms.html.erb
View file

@ -4,51 +4,25 @@
<!-- legale is <%= @legale %> -->
<% form_tag :action => 'terms' do %>
<p><%= t 'user.terms.legale_select' %></p>
<% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
<%= radio_button_tag 'legale', legale, @legale == legale %>
<%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %><br/>
<% end %>
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
<%= hidden_field('user', 'email') %>
<%= hidden_field('user', 'email_confirmation') %>
<%= hidden_field('user', 'display_name') %>
<%= hidden_field('user', 'pass_crypt') %>
<%= hidden_field('user', 'pass_crypt_confirmation') %>
<%= submit_tag(t('user.terms.legale_button')) %>
<p>
<%= t 'user.terms.legale_select' %>
<% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
<%=
radio_button_tag 'legale', legale, @legale == legale,
:onchange => remote_function(
:before => update_page do |page|
page.replace_html 'contributorTerms', image_tag('searching.gif')
end,
:url => {:legale => legale}
)
%>
<%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
<% end %>
</p>
<% end %>
<div id="contributorTerms">
<p id="first"><%= @text['intro'] %></p>
<ol>
<li>
<p><%= @text['section_1'] %></p>
</li>
<li>
<p><%= @text['section_2'] %></p>
</li>
<li>
<p><%= @text['section_3'] %></p>
<p><%= @text['active_defn_1'] %></p>
<p><%= @text['active_defn_2'] %></p>
</li>
<li>
<p><%= @text['section_4'] %></p>
</li>
<li>
<p><%= @text['section_5'] %></p>
</li>
<li>
<p><%= @text['section_6'] %></p>
<ol>
<li><p><%= @text['section_6_1'] %></p></li>
<li><p><%= @text['section_6_2'] %></p></li>
</ol>
</li>
<li>
<p id="last"><%= @text['section_7'] %></p>
</li>
</ol>
<%= render :partial => "terms" %>
</div>
<% form_tag :action => 'save' do %>

7
public/stylesheets/common.css
View file

@ -562,6 +562,13 @@ div#contributorTerms ol {
margin-bottom: 0px;
}
div#contributorTerms img {
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 10%;
}
/* Rules for the account settings page */
#accountForm td {