Present the contributor terms as part of the initial signup instead of

during the account confirmation step.

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 83c414ef2ccb1fecabd2b757f92f2ad52669b868..94a3e11426a0fb215960800775d89ab66ea1b734 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -18,6 +18,15 @@ class UserController < ApplicationController
 
   cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
 
 
   cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
 

+  def terms
+    @title = t 'user.new.title'
+    @user = User.new(params[:user])
+
+    if @user.invalid?
+      render :action => 'new'
+    end
+  end
+

   def save
     @title = t 'user.new.title'
 
   def save
     @title = t 'user.new.title'
 


@@ -31,6 +40,7 @@ class UserController < ApplicationController
       @user.description = "" if @user.description.nil?
       @user.creation_ip = request.remote_ip
       @user.languages = request.user_preferred_languages
       @user.description = "" if @user.description.nil?
       @user.creation_ip = request.remote_ip
       @user.languages = request.user_preferred_languages

+      @user.terms_agreed = Time.now.getutc

 
       if @user.save
         flash[:notice] = t 'user.new.flash create success message'
 
       if @user.save
         flash[:notice] = t 'user.new.flash create success message'


@@ -209,8 +219,6 @@ class UserController < ApplicationController
         @user = token.user
         @user.active = true
         @user.email_valid = true
         @user = token.user
         @user.active = true
         @user.email_valid = true

-        @user.terms_agreed = Time.now.getutc
-        @user.consider_pd = true if params[:consider_pd]

         @user.save!
         referer = token.referer
         token.destroy
         @user.save!
         referer = token.referer
         token.destroy

diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb
index 068e6eeee91d6b707eed1a4d19d717bb4b17a50d..5a4106ee395d441efd59b6463f30d9e40a6e42ea 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -2,47 +2,9 @@
 
 <p><%= t 'user.confirm.press confirm button' %></p>
 
 
 <p><%= t 'user.confirm.press confirm button' %></p>
 

-<div id="contributorTerms">
-  <p id="first"><%= t 'legal.contributor_terms.intro' %></p>
-  <ol>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_1' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_2' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_3' %></p>
-      <p><%= t 'legal.contributor_terms.active_defn_1' %></p>
-      <p><%= t 'legal.contributor_terms.active_defn_2' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_4' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_5' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_6' %></p>
-      <ol>
-        <li><p><%= t 'legal.contributor_terms.section_6_1' %></p></li>
-        <li><p><%= t 'legal.contributor_terms.section_6_2' %></p></li>
-      </ol>
-    </li>
-    <li>
-      <p id="last"><%= t 'legal.contributor_terms.section_7' %></p>
-    </li>
-  </ol>
-</div>
-

 <form method="post">
 <form method="post">

-  <p>
-    <label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label>
-    <input id="confirm_pd_checkbox" type="checkbox" name="consider_pd"/>
-    <span class="minorNote">(<%= link_to(t('user.confirm.consider_pd_why'), t('user.confirm.consider_pd_why_url'), :target => :new)%>)</span>
-  </p>
-  <p>
-    <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/>
-    <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>"/>
-  </p>
+<input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
+<input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">

 </form>
 </form>

+
+

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index bd85664c04d7c10b00e3245d648c91f74fc93af3..b086eabf3a8024a286e0c201332fbf577a866aad 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -18,7 +18,7 @@
 
 <%= error_messages_for 'user' %>
 
 
 <%= error_messages_for 'user' %>
 

-<% form_tag :action => 'save' do %>
+<% form_tag :action => 'terms' do %>

 <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
 <table id="signupForm">
   <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
 <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
 <table id="signupForm">
   <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
new file mode 100644 (file)
index 0000000..258b6e0
--- /dev/null
+++ b/app/views/user/terms.html.erb
@@ -0,0 +1,53 @@
+<h1><%= t 'user.terms.heading' %></h1>
+
+<p><%= t 'user.terms.press accept button' %></p>
+
+<div id="contributorTerms">
+  <p id="first"><%= t 'legal.contributor_terms.intro' %></p>
+  <ol>
+    <li>
+      <p><%= t 'legal.contributor_terms.section_1' %></p>
+    </li>
+    <li>
+      <p><%= t 'legal.contributor_terms.section_2' %></p>
+    </li>
+    <li>
+      <p><%= t 'legal.contributor_terms.section_3' %></p>
+      <p><%= t 'legal.contributor_terms.active_defn_1' %></p>
+      <p><%= t 'legal.contributor_terms.active_defn_2' %></p>
+    </li>
+    <li>
+      <p><%= t 'legal.contributor_terms.section_4' %></p>
+    </li>
+    <li>
+      <p><%= t 'legal.contributor_terms.section_5' %></p>
+    </li>
+    <li>
+      <p><%= t 'legal.contributor_terms.section_6' %></p>
+      <ol>
+        <li><p><%= t 'legal.contributor_terms.section_6_1' %></p></li>
+        <li><p><%= t 'legal.contributor_terms.section_6_2' %></p></li>
+      </ol>
+    </li>
+    <li>
+      <p id="last"><%= t 'legal.contributor_terms.section_7' %></p>
+    </li>
+  </ol>
+</div>
+
+<% form_tag :action => 'save' do %>
+  <p>
+    <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
+    <%= check_box('user', 'consider_pd') %>
+    <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
+  </p>
+  <p>
+    <%= 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.button')) %>
+  </p>
+<% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c141dbe6e12bcdc43149b7c4bdb563648afcfa9c..9a5d0c792db6d95cd1b7b9b949332f58166dd0b1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1403,6 +1403,13 @@ en:
       confirm password: "Confirm Password:"
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       confirm password: "Confirm Password:"
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."

+    terms:
+      heading: Contributor terms
+      press accept button: "Please read the agreement below and press the agree button to activate your account."
+      consider_pd: "I consider my contributions to be in the Public Domain"
+      consider_pd_why: what's this?
+      consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
+      button: Agree

     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"
     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"


@@ -1494,11 +1501,8 @@ en:
       flash update success: "User information updated successfully."
     confirm:
       heading: Confirm a user account
       flash update success: "User information updated successfully."
     confirm:
       heading: Confirm a user account

-      press confirm button: "Please read the agreement below and press the agree button to activate your account."
-      consider_pd: "I consider my contributions to be in the Public Domain"
-      consider_pd_why: what's this?
-      consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
-      button: Agree
+      press confirm button: "Press the confirm button below to activate your account."
+      button: Confirm

       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."
     confirm_email:
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."
     confirm_email:

diff --git a/config/routes.rb b/config/routes.rb
index 0c0e62849770ad3627d44e6f7bc608cdbc1cfc41..e2f95f7d7265fe8d82cb286cd2e1d68486e7dbde 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -96,6 +96,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/offline', :controller => 'site', :action => 'offline'
   map.connect '/key', :controller => 'site', :action => 'key'
   map.connect '/user/new', :controller => 'user', :action => 'new'
   map.connect '/offline', :controller => 'site', :action => 'offline'
   map.connect '/key', :controller => 'site', :action => 'key'
   map.connect '/user/new', :controller => 'user', :action => 'new'

+  map.connect '/user/terms', :controller => 'user', :action => 'terms'

   map.connect '/user/save', :controller => 'user', :action => 'save'
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/confirm-email', :controller => 'user', :action => 'confirm_email'
   map.connect '/user/save', :controller => 'user', :action => 'save'
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/confirm-email', :controller => 'user', :action => 'confirm_email'