Rework the PD question on the confirmation screen.
authorTom Hughes <tom@compton.nu>
Tue, 23 Mar 2010 17:50:54 +0000 (17:50 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 23 Mar 2010 17:50:54 +0000 (17:50 +0000)
app/views/user/confirm.html.erb
config/locales/en.yml

index 100206c..068e6ee 100644 (file)
@@ -38,8 +38,8 @@
 <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"/><br/>
+    <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] %>"/>
index 3cf5a9c..c141dbe 100644 (file)
@@ -1495,7 +1495,9 @@ en:
     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 <a href=\"http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain\">Public Domain</a>."
+      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
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."