Skip to content

Commit

Permalink
Don't use checkboxes in walkthrough navigation
Browse files Browse the repository at this point in the history
(closes #3247)
  • Loading branch information
bhousel committed Jul 24, 2016
1 parent 0755847 commit f4979db
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
5 changes: 3 additions & 2 deletions css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 6 additions & 4 deletions modules/ui/intro/intro.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit f4979db

Please sign in to comment.