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

Reduce welcome email to minimal text

Browse source 
Instead, redirect newly-confirmed users to the welcome
page. If confirmation is not required, redirect immediately
and don't send an email.
This commit is contained in:
John Firebaugh 2013-07-15 17:53:03 -07:00
parent e3aaa6dd4b
commit 2690342b08
7 changed files with 10 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/views/notifier/signup_confirm.html.erb
View file

@ -2,23 +2,8 @@
<p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
<% if @url -%>
<p><%= t("notifier.signup_confirm.confirm") %></p>
<p><%= link_to @url, @url %></p>
<% end -%>
<p><%= t("notifier.signup_confirm.welcome") %></p>
<p><%= raw(t("notifier.signup_confirm_html.introductory_video", :introductory_video_link => link_to(t('notifier.signup_confirm_html.video_to_openstreetmap'), "http://showmedo.com/videos/video?name=1800000&fromSeriesID=180"))) %>
<%= raw(t("notifier.signup_confirm_html.more_videos", :more_videos_link => link_to(t('notifier.signup_confirm_html.more_videos_here'), "http://showmedo.com/videos/series?name=mS2P1ZqS6"))) %></p>
<p><%= raw(t("notifier.signup_confirm_html.get_reading")) %></p>
<p><%= raw(t("notifier.signup_confirm_html.ask_questions")) %></p>
<p><%= raw(t("notifier.signup_confirm_html.wiki_signup")) %></p>
<p><%= raw(t("notifier.signup_confirm_html.user_wiki_page")) %></p>
<p><%= raw(t("notifier.signup_confirm_html.current_user")) %></p>

33
app/views/notifier/signup_confirm.text.erb
View file

@ -2,41 +2,8 @@
<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %>
<% if @url -%>
<%= fp(t("notifier.signup_confirm.confirm")) %>
<%= @url %>
<% end -%>
<%= fp(t("notifier.signup_confirm.welcome")) %>
<%= fp(t("notifier.signup_confirm_plain.introductory_video")) %>
http://showmedo.com/videos/video?name=1800000&fromSeriesID=180
<%= fp(t("notifier.signup_confirm_plain.more_videos")) %>
http://showmedo.com/videos/series?name=mS2P1ZqS6
<%= fp(t("notifier.signup_confirm_plain.the_wiki")) %>
<%= t("notifier.signup_confirm_plain.the_wiki_url") %>
<%= fp(t("notifier.signup_confirm_plain.blog_and_twitter")) %>
http://blog.openstreetmap.org/
http://twitter.com/openstreetmap
<%= fp(t("notifier.signup_confirm_plain.ask_questions")) %>
http://help.openstreetmap.org/
<%= fp(t("notifier.signup_confirm_plain.wiki_signup")) %>
<%= t("notifier.signup_confirm_plain.wiki_signup_url") %>
<%= fp(t("notifier.signup_confirm_plain.user_wiki_page")) %>
<%= fp(t("notifier.signup_confirm_plain.current_user")) %>
http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region