nicer signup confirmation email

diff --git a/app/views/notifier/signup_confirm.text.html.rhtml b/app/views/notifier/signup_confirm.text.html.rhtml
index 61ab877936f0d49fd4a6f97ba0d19cbb41fb3972..3831ab91b0dee0768ab256d101a2058b7596db5e 100644 (file)
--- a/app/views/notifier/signup_confirm.text.html.rhtml
+++ b/app/views/notifier/signup_confirm.text.html.rhtml
@@ -1,12 +1,16 @@
-<p>Hi,</p>
+<p>Hi there!</p>
 
 <p>Someone (hopefully you) would like to create an account over at
    <%= SERVER_URL %>.</p>
 
-<p>If this is you, please click the link below to confirm that account.</p>
+<p>If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap</p>
 
 <p><a href="<%= @url %>"><%= @url %></a></p>
 
+<p>You can watch an introductory video to OpenStreetMap <a href="http://showmedo.com/videos/video?name=1800000&fromSeriesID=180">video here</a>. There are more <a href="http://showmedo.com/videos/series?name=mS2P1ZqS6">videos here</a>.
+
+Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+
 <p>You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.</p>
 
 <p>It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/index.php/Category:Users_in_London">[[Category:Users_in_London]]</a>.</p> 

diff --git a/app/views/notifier/signup_confirm.text.plain.rhtml b/app/views/notifier/signup_confirm.text.plain.rhtml
index 5b93428574f21c6c77b7fb4baebeb837497692c2..444891d673fe4af0ebd8263330b338d7e8264ae8 100644 (file)
--- a/app/views/notifier/signup_confirm.text.plain.rhtml
+++ b/app/views/notifier/signup_confirm.text.plain.rhtml
@@ -1,15 +1,32 @@
-Hi,
+Hi there!
 
 Someone (hopefully you) would like to create an account over at
 <%= SERVER_URL %>
 
-If this is you, please click the link below to confirm that account.
+If this is you, welcome! Please click the link below to confirm that
+account and read on for more information about OpenStreetMap.
 
 <%= @url %>
 
+You can watch an introductory video to OpenStreetMap here:
+
+       http://showmedo.com/videos/video?name=1800000&fromSeriesID=180  
+
+There are more videos here:
+
+       http://showmedo.com/videos/series?name=mS2P1ZqS6        
+
+Get reading about OpenStreetMap on the wiki:
+
+       http://wiki.openstreetmap.org/wiki/Beginners%27_Guide
+
+OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:
+
+       http://www.opengeodata.org/
+
 You may also want to sign up to the OpenStreetMap wiki at:
 
-http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page
+       http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page
 
 It is recommended that you create a user wiki page, which includes
 category tags noting where you are, such as [[Category:Users_in_London]].

diff --git a/app/views/user/confirm.rhtml b/app/views/user/confirm.rhtml
index 5577b7068889c6c2694644ed477bbea77cf21fd7..ea2aab814a57efe5f1d05abd188bc9bad36ce57f 100644 (file)
--- a/app/views/user/confirm.rhtml
+++ b/app/views/user/confirm.rhtml
@@ -2,6 +2,8 @@
 
 <p>Press the confirm button below to activate your account.</p>
 
+<!-- FIXME this is deeply fucked up that the confirmation page should then get you to add a button -->
+
 <form method="post">
 <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
 <input type="submit" name="confirm_action" value="Confrm">