From 6f0b1348b8a0a6f31671e739441d5d45ebe287bd Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 16 Jul 2013 15:59:09 -0700
Subject: [PATCH 1/6] Add help page

---
 app/assets/stylesheets/common.css.scss | 43 +++++++++++++++++++++++++-
 app/controllers/site_controller.rb     |  3 ++
 app/views/layouts/site.html.erb        | 10 ++----
 app/views/site/help.html.erb           | 12 +++++++
 config/locales/en.yml                  | 31 +++++++++++++------
 config/routes.rb                       |  1 +
 6 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100644 app/views/site/help.html.erb

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 42467adb3a..c9b7046f97 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1108,7 +1108,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .user-terms,
 .user-confirm,
 .site-copyright,
-.site-welcome {
+.site-welcome,
+.site-help {
   #content {
     max-width: 740px;
   }
@@ -2559,3 +2560,43 @@ a.button {
     border-radius: 4px;
   }
 }
+
+.site-help {
+  #content {
+    a {
+      display: inline-block;
+      width: 45%;
+      height: 200px;
+      float: left;
+      text-align: center;
+      color: #000;
+      margin: 10px;
+      padding: 10px;
+      border-radius: 10px;
+    }
+
+    h3 {
+      margin-top: 50px;
+    }
+
+    a:hover {
+      text-decoration: none;
+    }
+
+    .welcome {
+      background-color: #D6FFB9;
+    }
+
+    .learnosm {
+      background-color: #BAFCFF;
+    }
+
+    .help {
+      background-color: #FCFFB9;
+    }
+
+    .wiki {
+      background-color: #FFB9CC;
+    }
+  }
+}
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 280f39fd8c..4945aaa4ff 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -71,6 +71,9 @@ def copyright
   def welcome
   end
 
+  def help
+  end
+
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index ed8a6cf188..4612572077 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -39,13 +39,6 @@
       </div>
       <% end %>
       <ul id="left_menu" class="left_menu">
-        <li>
-          <h4><%= t'layouts.help' %></h4>
-          <ul>
-            <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
-            <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>
-          </ul>
-        </li>
         <li>
           <h4><%= t'layouts.community' %></h4>
           <ul>
@@ -84,6 +77,9 @@
       </div>
     </div>
     <div id='top-bar'>
+      <ul class='secondary-actions'>
+        <li><%= link_to t('layouts.help'), help_path %></li>
+      </ul>
       <% if @user and @user.id %>
         <%= render :partial => "layouts/user_menu" %>
       <% else %>
diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
new file mode 100644
index 0000000000..e72aac1902
--- /dev/null
+++ b/app/views/site/help.html.erb
@@ -0,0 +1,12 @@
+<% content_for :heading do %>
+  <h2><%= t "help_page.title" %></h2>
+<% end %>
+
+<p class='introduction'><%= t "help_page.introduction" %></p>
+
+<% ['welcome', 'learnosm', 'help', 'wiki'].each do |site| %>
+  <a class='<%= site %>' href='<%= t "help_page.#{site}.url" %>'>
+    <h3><%= t "help_page.#{site}.title" %></h3>
+    <p><%= t "help_page.#{site}.description" %></p>
+  </a>
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 49f3450e95..c60fe7736a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1031,15 +1031,7 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     donate_link_text: donating
-    help: Help
-    help_centre: Help Centre
-    help_url: http://help.openstreetmap.org/
-    help_title: Help site for the project
-    wiki: Wiki
-    wiki_url: http://wiki.openstreetmap.org/
-    wiki_title: Wiki site for the project
-    documentation: Documentation
-    documentation_title: Documentation for the project
+    help: help
     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"
@@ -1207,6 +1199,27 @@ en:
         Just go to <a href='%{map_url}'>the map</a> and click the note icon:
         <span class='icon note'></span>. This will add a marker to the map, which you can move
         by dragging. Add your message, then click save, and other mappers will investigate.
+  help_page:
+    title: Getting Help
+    introduction: |
+      OpenStreetMap has several resources for learning about the project, asking and answering questions,
+      and collaboratively discussing and documenting mapping topics.
+    welcome:
+      url: http://www.openstreetmap.org/welcome
+      title: Welcome to OSM
+      description: A one-page introduction for new users
+    learnosm:
+      url: http://learnosm.org/
+      title: LearnOSM
+      description: Learn OpenStreetMap Step by Step
+    help:
+      url: https://help.openstreetmap.org/
+      title: help.openstreetmap.org
+      description: OSM's question-and-answer site
+    wiki:
+      url: http://wiki.openstreetmap.org/
+      title: wiki.openstreetmap.org
+      description: A wiki-based documentation site
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
diff --git a/config/routes.rb b/config/routes.rb
index 68a5bacf61..e4bed09562 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -126,6 +126,7 @@
   match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
   match '/copyright' => 'site#copyright', :via => :get
   match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
+  match '/help' => 'site#help', :via => :get, :as => :help
   match '/history' => 'changeset#list', :via => :get
   match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/export' => 'site#index', :export => true, :via => :get

From a93421db6ca5623e712a6577284630dd45ca167e Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Wed, 31 Jul 2013 14:53:01 -0400
Subject: [PATCH 2/6] adjustments to help page + better copy

---
 app/views/site/help.html.erb    | 16 ++++++++++------
 app/views/site/welcome.html.erb |  2 +-
 config/locales/en.yml           |  8 ++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index e72aac1902..91dc227e99 100644
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -2,11 +2,15 @@
   <h2><%= t "help_page.title" %></h2>
 <% end %>
 
-<p class='introduction'><%= t "help_page.introduction" %></p>
+<p class='introduction inner22'><%= t "help_page.introduction" %></p>
 
 <% ['welcome', 'learnosm', 'help', 'wiki'].each do |site| %>
-  <a class='<%= site %>' href='<%= t "help_page.#{site}.url" %>'>
-    <h3><%= t "help_page.#{site}.title" %></h3>
-    <p><%= t "help_page.#{site}.description" %></p>
-  </a>
-<% end %>
+  <div class='<%= site %> inner02 help-item'>
+  <h3>
+    <a href='<%= t "help_page.#{site}.url" %>'>
+      <%= t "help_page.#{site}.title" %>
+    </a>
+  </h3>
+  <p><%= t "help_page.#{site}.description" %></p>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index da775e3393..7f3d000d49 100644
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -64,4 +64,4 @@
     <p><%= t "welcome_page.add_a_note.paragraph_1_html" %></p>
     <p><%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %></p>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c60fe7736a..a0b71b5324 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1207,19 +1207,19 @@ en:
     welcome:
       url: http://www.openstreetmap.org/welcome
       title: Welcome to OSM
-      description: A one-page introduction for new users
+      description: Start with this quick guide covering the OpenStreetMap basics.
     learnosm:
       url: http://learnosm.org/
       title: LearnOSM
-      description: Learn OpenStreetMap Step by Step
+      description: Learn how to edit OpenStreetMap with the JOSM editor step-by-step.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
-      description: OSM's question-and-answer site
+      description: Ask a question or look up answers on OSM's question-and-answer site.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
-      description: A wiki-based documentation site
+      description: Browse the wiki for in-depth OSM documentation.
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"

From aea5db02ceaa7b0ee724e92d215fbb1c870b80bc Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 7 Aug 2013 17:19:19 -0700
Subject: [PATCH 3/6] Style

---
 app/assets/stylesheets/common.css.scss | 40 --------------------------
 app/views/site/help.html.erb           |  4 +--
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index c9b7046f97..fa6b71b8d0 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -2560,43 +2560,3 @@ a.button {
     border-radius: 4px;
   }
 }
-
-.site-help {
-  #content {
-    a {
-      display: inline-block;
-      width: 45%;
-      height: 200px;
-      float: left;
-      text-align: center;
-      color: #000;
-      margin: 10px;
-      padding: 10px;
-      border-radius: 10px;
-    }
-
-    h3 {
-      margin-top: 50px;
-    }
-
-    a:hover {
-      text-decoration: none;
-    }
-
-    .welcome {
-      background-color: #D6FFB9;
-    }
-
-    .learnosm {
-      background-color: #BAFCFF;
-    }
-
-    .help {
-      background-color: #FCFFB9;
-    }
-
-    .wiki {
-      background-color: #FFB9CC;
-    }
-  }
-}
diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 91dc227e99..f58af4f2d2 100644
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -2,10 +2,10 @@
   <h2><%= t "help_page.title" %></h2>
 <% end %>
 
-<p class='introduction inner22'><%= t "help_page.introduction" %></p>
+<p class='introduction'><%= t "help_page.introduction" %></p>
 
 <% ['welcome', 'learnosm', 'help', 'wiki'].each do |site| %>
-  <div class='<%= site %> inner02 help-item'>
+  <div class='<%= site %> help-item'>
   <h3>
     <a href='<%= t "help_page.#{site}.url" %>'>
       <%= t "help_page.#{site}.title" %>

From 698e203543081218fa72fc3b3fc38cc95e361d98 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sun, 18 Aug 2013 08:24:57 -0700
Subject: [PATCH 4/6] Link to help page from welcome

---
 app/views/site/welcome.html.erb | 2 +-
 config/locales/en.yml           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 7f3d000d49..60c2a3c302 100644
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -51,7 +51,7 @@
 <div class='col12 clearfix icon-list'>
   <h3><%= t "welcome_page.questions.title" %></h3>
   <span class='sprite small term question'></span>
-  <p><%= t "welcome_page.questions.paragraph_1_html" %></p>
+  <p><%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %></p>
 </div>
 
 <div class='clearfix center'>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a0b71b5324..bf3d815449 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1187,8 +1187,9 @@ en:
     questions:
       title: Any questions?
       paragraph_1_html: |
-        Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered
-        on <a href='http://help.openstreetmap.org/'>the help website</a>.
+        OpenStreetMap has several resources for learning about the project, asking and answering
+        questions, and collaboratively discussing and documenting mapping topics.
+        <a href='%{help_url}'>Get help here</a>.
     start_mapping: Start Mapping
     add_a_note:
       title: No Time To Edit? Add a Note!

From 3a50f28568a266bf7e9451ad2f339a88e0560f38 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 27 Sep 2013 12:07:29 -0700
Subject: [PATCH 5/6] Adjust header layout for user menu

---
 app/assets/stylesheets/common.css.scss | 48 +++++++++++++++-----------
 app/views/layouts/_user_menu.html.erb  |  2 +-
 app/views/layouts/site.html.erb        | 45 +++++++++++++-----------
 config/locales/en.yml                  |  7 ++--
 4 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index fa6b71b8d0..b09becd049 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -493,15 +493,21 @@ a.donate {
   right: 0;
 }
 
-#tabnav {
+#top-bar nav > ul {
   height: 29px;
   margin-bottom: 0;
+}
 
-  > li {
-    float: left;
+nav.primary {
+  float: left;
 
-    > * {
-      padding: 3px $lineheight/2;
+  > ul {
+    > li {
+      float: left;
+
+      > * {
+        padding: 3px $lineheight/2;
+      }
     }
   }
 
@@ -546,28 +552,17 @@ a.donate {
   color: #000;
 }
 
-/* Utility for styling notification numbers */
-
-.count-number {
-  padding: 2px $lineheight/4;
-  border-radius: 2px;
-  background: #d7d7ff;
-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
-}
-
-/* Rules for greeting bar in the top right corner */
-
-#greeting {
+nav.secondary {
   float: right;
   height: 100%;
 
-  &.secondary-actions {
+  > ul {
+    display: inline-block;
     padding: 3px $lineheight/2;
   }
 
-  &.dropdown {
+  .dropdown {
+    display: inline-block;
     background-color: #EEE;
     &:hover {
       background-color: #CCC;
@@ -609,6 +604,17 @@ a.donate {
   }
 }
 
+/* Utility for styling notification numbers */
+
+.count-number {
+  padding: 2px $lineheight/4;
+  border-radius: 2px;
+  background: #d7d7ff;
+  margin: 0 2px;
+  font-size: 11px;
+  color: #333;
+}
+
 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {
diff --git a/app/views/layouts/_user_menu.html.erb b/app/views/layouts/_user_menu.html.erb
index ab7d955da5..3b45ade304 100644
--- a/app/views/layouts/_user_menu.html.erb
+++ b/app/views/layouts/_user_menu.html.erb
@@ -1,4 +1,4 @@
-<div class='dropdown' id='greeting'>
+<div class='dropdown'>
   <a class='dropdown-toggle' data-toggle='dropdown' href="#">
     <%= render :partial => 'layouts/inbox' %>
     <%= @user.display_name %>
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 4612572077..8239c8c2d7 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -77,27 +77,32 @@
       </div>
     </div>
     <div id='top-bar'>
-      <ul class='secondary-actions'>
-        <li><%= link_to t('layouts.help'), help_path %></li>
-      </ul>
-      <% if @user and @user.id %>
-        <%= render :partial => "layouts/user_menu" %>
-      <% else %>
-        <ul class='secondary-actions' id='greeting'>
-          <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
-          <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+      <nav class='primary'>
+        <ul>
+          <li id="view_tab">
+            <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+          </li><li id="edit_tab">
+            <%= render :partial => 'layouts/edit_menu',
+                       :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+          </li><li id="history_tab">
+            <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+          </li>
         </ul>
-      <% end %>
-      <ul id="tabnav">
-        <li id="view_tab">
-          <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
-        </li><li id="edit_tab">
-          <%= render :partial => 'layouts/edit_menu',
-                     :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
-        </li><li id="history_tab">
-          <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
-        </li>
-      </ul>
+      </nav>
+      <nav class='secondary'>
+        <% if @user and @user.id %>
+          <ul>
+            <li><%= link_to t('layouts.help'), help_path %></li>
+          </ul>
+          <%= render :partial => "layouts/user_menu" %>
+        <% else %>
+          <ul class="secondary-actions">
+            <li><%= link_to t('layouts.help'), help_path %></li>
+            <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+            <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+          </ul>
+        <% end %>
+      </nav>
     </div>
     <div class="wrapper">
       <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bf3d815449..53cb3821e2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -998,9 +998,9 @@ en:
       alt_text: OpenStreetMap logo
     home: Go to Home Location
     logout: Logout
-    log_in: log in
+    log_in: Log In
     log_in_tooltip: Log in with an existing account
-    sign_up: sign up
+    sign_up: Sign Up
     sign_up_tooltip: Create an account for editing
     view: View
     view_tooltip: View the map
@@ -1030,8 +1030,7 @@ en:
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
-    donate_link_text: donating
-    help: help
+    help: Help
     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"

From 191a2145f553906b50ab0a87aed8be8b80b1f347 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 27 Sep 2013 12:08:57 -0700
Subject: [PATCH 6/6] Remove LearnOSM

---
 app/views/site/help.html.erb | 2 +-
 config/locales/en.yml        | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index f58af4f2d2..53d479b858 100644
--- 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', 'learnosm', 'help', 'wiki'].each do |site| %>
+<% ['welcome', 'help', 'wiki'].each do |site| %>
   <div class='<%= site %> help-item'>
   <h3>
     <a href='<%= t "help_page.#{site}.url" %>'>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 53cb3821e2..5579cc5802 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1208,10 +1208,6 @@ en:
       url: http://www.openstreetmap.org/welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
-    learnosm:
-      url: http://learnosm.org/
-      title: LearnOSM
-      description: Learn how to edit OpenStreetMap with the JOSM editor step-by-step.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org