From f4979db992fd300e4f2a0917b075997051adc04e Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 24 Jul 2016 12:31:57 -0700 Subject: [PATCH] Don't use checkboxes in walkthrough navigation (closes #3247) --- css/app.css | 5 +++-- data/core.yaml | 1 + dist/locales/en.json | 1 + modules/ui/intro/intro.js | 10 ++++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/css/app.css b/css/app.css index 5b02ce5c2..be005e6cc 100644 --- a/css/app.css +++ b/css/app.css @@ -3223,11 +3223,12 @@ img.tile-removing { background: #8cd05f; } -.intro-nav-wrap button.step .icon { +.intro-nav-wrap button.step .status { + margin-left: 3px; display: none; } -.intro-nav-wrap button.step.finished .icon { +.intro-nav-wrap button.step.finished .status { display: inline-block; } diff --git a/data/core.yaml b/data/core.yaml index 3d26200e9..046cd9d45 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -703,6 +703,7 @@ en: and outer), hold the Shift key and click on each of them to select them both, and then click the "Merge" (+) button. intro: + done: done graph: city_hall: Three Rivers City Hall fire_department: Three Rivers Fire Department diff --git a/dist/locales/en.json b/dist/locales/en.json index da46ea21f..5ea53ac71 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -531,6 +531,7 @@ "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n" }, "intro": { + "done": "done", "graph": { "city_hall": "Three Rivers City Hall", "fire_department": "Three Rivers Fire Department", diff --git a/modules/ui/intro/intro.js b/modules/ui/intro/intro.js index 4e0c44179..06263121e 100644 --- a/modules/ui/intro/intro.js +++ b/modules/ui/intro/intro.js @@ -147,16 +147,18 @@ export function intro(context) { .attr('class', 'step') .on('click', enter); - entered - .call(Icon('#icon-apply', 'pre-text')); - entered .append('label') .text(function(d) { return t(d.title); }); + entered + .append('span') + .attr('class', 'status') + .text(' - ' + t('intro.done')); + enter(steps[0]); - function enter (newStep) { + function enter(newStep) { if (step) { step.exit(); } context.enter(Browse(context));