Add links to the Beginners' guide, mailing lists and forums to the help page

From a pure design and content view (where the content is factual) a link
to learnosm.org would really be better. Potentially learnosm could be forked
and a version hosted on OSMF infrastructure with the marketing verbiage
for HOTs view of the world removed.

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index a1b1adb9227949f6a2c0af3c89443d260acc70c3..21d29aa95c085574d02ba12ba3ced1874bf3f541 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -4,7 +4,7 @@
 
 <p class='introduction'><%= t "help_page.introduction" %></p>
 
-<% ['welcome', 'help', 'wiki'].each do |site| %>
+<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'wiki'].each do |site| %>
   <% unless site == 'welcome' && !@user %>
   <div class='<%= site %> help-item'>
   <h3>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad6638cfb9c27f8827e6ab981f7a6ccf04683128..701bae2dddfc37c45f49ba44e3c50c138aa2c18a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1152,10 +1152,22 @@ en:
       url: /welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Beginners' Guide
+      description: Community maintained guide for beginners.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Ask a question or look up answers on OSM's question-and-answer site.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Mailing Lists
+      description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forums
+      description: The same as above for those that prefer a bulletin board style interface.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org