From edd19cbd0a083384c9076141ad0ca49c9efe3ac3 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 17 Dec 2015 15:15:26 -0500
Subject: [PATCH] Display Help button in walkthrough, stay on it longer (closes
 #2364)

---
 data/core.yaml                  |  2 +-
 dist/locales/en.json            |  2 +-
 js/id/ui/intro/start_editing.js | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index cd6a67377..2f6a87cbe 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -726,7 +726,7 @@ en:
       "wrong_preset": "You didn't select the Residential road type. **Click here to choose again**"
     startediting:
       title: "Start Editing"
-      help: "More documentation and this walkthrough are available here."
+      help: "You can replay this walkthrough or view more documentation by clicking the {button} Help button."
       save: "Don't forget to regularly save your changes!"
       start: "Start mapping!"
 
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c9d4b5f64..76c721d5a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -554,7 +554,7 @@
         },
         "startediting": {
             "title": "Start Editing",
-            "help": "More documentation and this walkthrough are available here.",
+            "help": "You can replay this walkthrough or view more documentation by clicking the {button} Help button.",
             "save": "Don't forget to regularly save your changes!",
             "start": "Start mapping!"
         }
diff --git a/js/id/ui/intro/start_editing.js b/js/id/ui/intro/start_editing.js
index 5b56b1a99..c690a20c0 100644
--- a/js/id/ui/intro/start_editing.js
+++ b/js/id/ui/intro/start_editing.js
@@ -12,15 +12,16 @@ iD.ui.intro.startEditing = function(context, reveal) {
     }
 
     step.enter = function() {
-        reveal('.map-control.help-control', t('intro.startediting.help'));
+        reveal('.map-control.help-control',
+            t('intro.startediting.help', { button: iD.ui.intro.icon('#icon-help', 'pre-text') }));
 
         timeout(function() {
             reveal('#bar button.save', t('intro.startediting.save'));
-        }, 3500);
+        }, 5000);
 
         timeout(function() {
             reveal('#surface');
-        }, 7000);
+        }, 10000);
 
         timeout(function() {
             modal = iD.ui.modal(context.container());
@@ -35,7 +36,7 @@ iD.ui.intro.startEditing = function(context, reveal) {
                     .append('button')
                         .attr('class', 'modal-section huge-modal-button')
                         .on('click', function() {
-                                modal.remove();
+                            modal.remove();
                         });
 
                 startbutton.append('div')
@@ -44,7 +45,7 @@ iD.ui.intro.startEditing = function(context, reveal) {
                     .text(t('intro.startediting.start'));
 
             event.startEditing();
-        }, 7500);
+        }, 10500);
     };
 
     step.exit = function() {