Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Walkthrough updates #3921

Merged
merged 91 commits into from
Apr 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
b55cebe
Move d3curtain to uiCurtain, remove unused event dispatch
bhousel Mar 22, 2017
a015b44
"step" -> "chapter" - each chapter contains many steps
bhousel Mar 22, 2017
681ee5a
Prevent crash when missing datum
bhousel Mar 22, 2017
db39fc6
Improve event handling and functions for the navigation steps
bhousel Mar 22, 2017
697cef1
Fix zoom/pan for the intro curtain
bhousel Mar 22, 2017
d949fe0
Fix faulty datum test from 681ee5a
bhousel Mar 22, 2017
833a67f
Allow history to set checkpoints and reset to them
bhousel Mar 23, 2017
8200cbb
Use checkpoints to reset history to known states in walkthrough
bhousel Mar 23, 2017
61d1d1f
Make chapters code more consistent
bhousel Mar 23, 2017
09d3e2d
Code cleanups, move local feature names to helper
bhousel Mar 23, 2017
468c1e4
All graphics from iD-sprite are now symbols that can be used
bhousel Mar 24, 2017
85be712
Use flex for walkthrough navigation bar, add walkthrough logo
bhousel Mar 24, 2017
7432db7
Attach intro to id-container, not document.body
bhousel Mar 24, 2017
424ad63
Fix rtl for tooltip-illustrations, replace 'done' with next icon
bhousel Mar 24, 2017
5259940
Support "top" placement so we can tooltip the navigation menu
bhousel Mar 25, 2017
6cc524a
Improve walkthrough tooltip placement, fix for RTL too
bhousel Mar 25, 2017
b7267e0
Add ability to put an OK button on the curtain-tooltip
bhousel Mar 26, 2017
86330ef
Move welcome to its own chapter
bhousel Mar 26, 2017
df20825
Add selected step to navigation, let user free play at end of chapter
bhousel Mar 28, 2017
c6a40b2
Add Play step to each chapter of the walkthrough
bhousel Mar 28, 2017
063d560
Ensure each step can cleanup after itself and continueTo reliably
bhousel Mar 28, 2017
7873f0c
Relax rules for using keyboard shortcuts in the walkthrough
bhousel Mar 29, 2017
4c02363
Dispatch done before calling reveal in playsteps (to style the buttons)
bhousel Mar 29, 2017
7da34f4
Pacify eslint
bhousel Mar 29, 2017
ae6ce86
Add continue/cleanups/restarts for each step of areas chapter
bhousel Mar 30, 2017
7358766
Don't update hash, imagery_used when changing background in walkthrough
bhousel Mar 30, 2017
dabf855
Add continue/cleanups/restarts for each step of lines chapter
bhousel Mar 30, 2017
5459f54
Add copyBox to copy immutable ClientRects
bhousel Mar 30, 2017
d591228
Don't allow geolocate while in walkthrough
bhousel Mar 30, 2017
ad5c976
Don't allow user to re-enter walkthrough if already in walkthrough
bhousel Mar 30, 2017
f2f21a0
Allow combobox to nest under id-container instead of body
bhousel Mar 31, 2017
e1e366c
Add a description to the park instead of a name
bhousel Mar 31, 2017
5f44c9a
Add combobox menus to id-container instead of document.body
bhousel Mar 31, 2017
140e457
Use span for button labels, so pointer events go to the button
bhousel Mar 31, 2017
d772869
Allow user to hit escape to leave select mode in walkthrough
bhousel Mar 31, 2017
3b01166
Add more info about editing, teach Undo
bhousel Mar 31, 2017
5f627c8
Localize a few more walkthrough names, start buildings chapter
bhousel Apr 2, 2017
b923a6d
Add timeout so Name Road step will reveal properly
bhousel Apr 3, 2017
0af9df7
Add house tracing steps to building chapter
bhousel Apr 3, 2017
bb7b60c
Add square buildings steps to building chapter
bhousel Apr 3, 2017
d173e06
Add circle buildings steps to building chapter too
bhousel Apr 3, 2017
93b9507
Add a tooltip illustration for buildings
bhousel Apr 4, 2017
8e9ae09
Fix abbreviations in the intro graph
bhousel Apr 4, 2017
6d63f0b
Adjust circle tracing instructions
bhousel Apr 4, 2017
526bb75
pacify eslint
bhousel Apr 4, 2017
2e81e71
Add history.toIntroGraph() for saving the edited introGraph to JSON
bhousel Apr 4, 2017
9933a36
Slim down the intro graph
bhousel Apr 4, 2017
b7f9308
Add data for Buildings, footpaths etc, to intro_graph
bhousel Apr 4, 2017
ce642b7
Add POIs, Addresses, Buildings, Sidewalks, etc
bhousel Apr 4, 2017
d3bff9e
Renumber introGraph to shrink it even more
bhousel Apr 5, 2017
bea7f3c
export lodash (to help with debugging)
bhousel Apr 5, 2017
912d565
Update walkthrough name localization, no more hardcoded osmids
bhousel Apr 5, 2017
500dbfa
Remove road routes, update names, make all lanes localizable
bhousel Apr 5, 2017
be73f1c
In area chapter, make sure user really added Description field
bhousel Apr 5, 2017
36b90fa
More adjustments to walkthrough language, timing
bhousel Apr 6, 2017
ef1e703
Remove some unused roads from intrograph, add paper street 12th avenue
bhousel Apr 6, 2017
8fe33d9
Teach realigning roads by moving nodes, adding midpoints
bhousel Apr 6, 2017
fc774a1
Adjust language, keep Wood road selected when editing midpoint/endpoint
bhousel Apr 6, 2017
2abf7a7
Add step to walkthrough up to split road
bhousel Apr 7, 2017
246f078
More detailed poi mapping in intro graph
bhousel Apr 7, 2017
436c32e
Update delete lines walkthrough steps
bhousel Apr 8, 2017
7371f86
Allow curtain to be called with a null box (no cutout)
bhousel Apr 10, 2017
ec1e5cb
Finish delete lines section of the walkthrough, add selectMenuItem he…
bhousel Apr 10, 2017
8a2e163
Adjust timings, language, transitions in walkthrough
bhousel Apr 10, 2017
b9f5001
Simplify language
bhousel Apr 12, 2017
87618f9
Make it so preset.init() can be called again to reset the datastructures
bhousel Apr 12, 2017
a16ae21
Clear away recent presets when switching to a new chapter
bhousel Apr 12, 2017
5b81ea1
Be less strict about where the endpoint can go
bhousel Apr 12, 2017
84b917c
Adjust language for placing point on the map
bhousel Apr 12, 2017
8b28772
Eliminate the very slow (3sec) transitions
bhousel Apr 12, 2017
b566cc9
Remove workaround for old Firefox bug that has been fixed
bhousel Apr 12, 2017
bdcd4fd
Use #map clientrect instread of #surface (which can be transformed)
bhousel Apr 12, 2017
7b23d26
Teach zoom, and make sure Spring Street is visible
bhousel Apr 12, 2017
8d557c9
Oxford comma
bhousel Apr 12, 2017
ecccee5
Remove transparency from intro tooltips
bhousel Apr 12, 2017
5c687e5
Gentler introduction to jargon, add some more defensive code
bhousel Apr 13, 2017
0920f29
Slight rewords in the Areas chapter
bhousel Apr 13, 2017
8989aea
Clicking a midpoint should be treated as a click on the parent way
bhousel Apr 14, 2017
633edf1
Increase delay before checking if Description field was added
bhousel Apr 14, 2017
0256252
Ask user to redraw the building if the points really are not very square
bhousel Apr 14, 2017
992a6aa
More guard code to protect against user undos and mode changes
bhousel Apr 15, 2017
dfe9120
Change the pseudomarkdown emphasis to be global and nongreedy
bhousel Apr 16, 2017
16b8d5c
More gentle introduction to jargon
bhousel Apr 17, 2017
5acad22
Catch a few more conditions where the user changed tutorial data
bhousel Apr 17, 2017
e249826
Adjust timings a few places so draw handler doesn't interrupt reveal
bhousel Apr 17, 2017
b743d37
Fixes for RTL, improve curtain placement for edit menu steps
bhousel Apr 17, 2017
28802da
Add more examples of landuse and areas
bhousel Apr 17, 2017
cf9eb22
Adjust language, remove curtain for play steps
bhousel Apr 17, 2017
dafb1dd
Use the word "nodes" consistently for child nodes along a way
bhousel Apr 17, 2017
e3152fb
Make sure user can left and right click
bhousel Apr 18, 2017
bde1c78
Break up longer text, mention Alt key to avoid point snapping
bhousel Apr 18, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 114 additions & 60 deletions css/80_app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2420,6 +2420,7 @@ div.full-screen > button:hover {
margin-top: 10px;
border-bottom: 1px solid #ccc;
border-radius: 4px;
text-align: center;
}

.help-wrap .nav {
Expand Down Expand Up @@ -3016,20 +3017,14 @@ img.tile-removing {
background-color: #ececec;
}

.modal-actions button:before,
.save-success a.button.osm:before,
.walkthrough a:before {
display: block;
content: '';
.logo {
height: 100px;
width: 100%;
max-width: 100px;
margin: auto;
margin-bottom: 10px;
background:transparent url(img/iD-sprite.svg) no-repeat -200px -460px;
}

.modal-actions :first-child {
.modal-actions > :first-child {
border-right: 1px solid #CCC;
}

Expand All @@ -3039,57 +3034,48 @@ img.tile-removing {

/* Restore Modal
------------------------------------------------------- */

.modal-actions .restore:before {
background-position: -500px -460px;
.modal-actions .logo-restore {
color: #7092FF;
}

.modal-actions .reset:before {
background-position: -600px -460px;
.modal-actions .logo-reset {
color: #E06C5E;
}

/* Success Modal
------------------------------------------------------- */

.save-success p {
padding: 15px 15px 0 15px;
}
.save-success a.details {
padding-left: 15px;
padding-left: 15px;
}
.save-success .button {
padding-top: 15px;
}

.save-success .logo-osm {
color: #7092FF;
margin-bottom: 10px;
}
.save-success a.button.social {
height: auto;
border-bottom: none;
}

.save-success .icon.social {
height: 80px;
width: 80px;
color: #7092FF;
}

.save-success .button.osm:before {
background-position: -200px -460px;
}

/* Splash Modal
------------------------------------------------------- */

.modal-actions .walkthrough:before,
.walkthrough a:before {
background-position: -300px -460px;
.modal-actions .logo-walkthrough,
.modal-actions .logo-features {
color: #7092FF;
}

.modal-actions .start:before {
background-position: -400px -460px;
}

/* Commit Modal
/* Save Mode
------------------------------------------------------- */

.mode-save a.user-info {
display: inline-block;
}
Expand Down Expand Up @@ -3249,7 +3235,6 @@ img.tile-removing {
position: absolute;
display: none;
color:#333;
text-align: left;
font-size: 12px;
}

Expand All @@ -3267,6 +3252,7 @@ img.tile-removing {

.tooltip.right {
margin-left: 20px;
text-align: left;
}

.tooltip.bottom {
Expand Down Expand Up @@ -3443,15 +3429,19 @@ img.tile-removing {
.map-control .tooltip {
min-width: 160px;
}

/* Move over tooltips that are near the edge of screen */
.add-point .tooltip {
left: 33.3333% !important;
}

.curtain-tooltip.intro-points-add .tooltip-arrow,
.add-point .tooltip .tooltip-arrow {
left: 60px;
}
[dir='rtl'] .add-point .tooltip .tooltip-arrow {
left: auto;
right: 60px;
}


/* radial menu (deprecated) */

Expand Down Expand Up @@ -3601,6 +3591,8 @@ img.tile-removing {
}

.intro-nav-wrap {
display: flex;
flex-direction: row;
position: absolute;
left: 0;
right: 0;
Expand All @@ -3609,34 +3601,67 @@ img.tile-removing {
z-index: 1001;
}

.intro-nav-wrap button.step {
width: 20%;
.intro-nav-wrap .intro-nav-wrap-logo {
flex: 0 0 auto;
height: 40px;
width: 40px;
color: white;
margin: 0px 20px;
vertical-align: middle;
}

.intro-nav-wrap .joined {
flex: 1 1 auto;
display: flex;
flex-direction: row;
}

.intro-nav-wrap button.chapter {
flex: 1 1 100%;
padding: 0px 20px;
}

.intro-nav-wrap button.chapter.next {
animation-duration: 1s;
animation-name: pulse;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes pulse {
from { background: #7092ff; }
to { background: #c6d4ff; }
}

.intro-nav-wrap button.step.finished {
.intro-nav-wrap button.chapter.finished {
background: #8cd05f;
}

.intro-nav-wrap button.step .status {
margin-left: 3px;
.intro-nav-wrap button.chapter .status {
display: none;
}

.intro-nav-wrap button.step.finished .status {
.intro-nav-wrap button.chapter.finished .status {
display: inline-block;
}


.curtain-tooltip .tooltip-inner {
.curtain-tooltip.tooltip.in {
opacity: 1;
}
.curtain-tooltip.tooltip {
text-align: left;
padding: 20px;
}
[dir='rtl'] .curtain-tooltip.tooltip {
text-align: right;
}

.curtain-tooltip .tooltip-inner {
font-size: 15px;
position: relative;
padding: 20px;
}

.curtain-tooltip .tooltip-inner .bold {
.curtain-tooltip .tooltip-inner .button-section,
.curtain-tooltip .tooltip-inner .instruction {
font-weight: bold;
display: block;
border-top: 1px solid #CCC;
Expand All @@ -3646,35 +3671,65 @@ img.tile-removing {
padding: 10px 20px 0 20px;
}

.curtain-tooltip .tooltip-inner .bold:only-child {
[dir='rtl'] .curtain-tooltip .tooltip-inner .button-section button.col8 {
float: right;
}

.curtain-tooltip .tooltip-inner .instruction:only-child {
border: 0;
padding: 0;
margin: 0;
}

.curtain-tooltip .tooltip-inner .icon.pre-text {
vertical-align: text-top;
margin-right: 0;
margin-left: 0;
display: inline-block;
}

.curtain-tooltip.intro-points-describe {
top: 133px !important;
}

/* Tooltip illustrations */

.intro-points-add .tooltip-inner::before,
.intro-areas-add .tooltip-inner::before,
.intro-lines-add .tooltip-inner::before {
margin-left: -20px;
display: block;
content: "";
.tooltip-illustration {
height: 80px;
width: 200px;
background:transparent url(img/iD-sprite.svg) no-repeat 0 -320px;
margin-left: -20px;
margin-top: -10px;
}
[dir='rtl'] .tooltip-illustration {
margin-left: auto;
margin-right: -20px;
}

.intro-areas-add .tooltip-inner::before {
background-position: 0 -400px;
.curtain-tooltip.intro-mouse {
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
user-select: none;
}

.intro-lines-add .tooltip-inner::before {
background-position: 0 -480px;
.curtain-tooltip.intro-mouse .counter {
position: absolute;
display: block;
top: 50px;
width: 100%;
text-align: center;
font-weight: bold;
font-size: 14px;
z-index: 1003;
}

.curtain-tooltip.intro-mouse .tooltip-illustration use {
fill: rgba(112, 146, 255, 0);
color: rgba(112, 146, 255, 0);
}
.curtain-tooltip.intro-mouse.leftclick .tooltip-illustration use {
fill: rgba(112, 146, 255, 1);
}
.curtain-tooltip.intro-mouse.rightclick .tooltip-illustration use {
color: rgba(112, 146, 255, 1);
}

.huge-modal-button {
Expand All @@ -3686,8 +3741,7 @@ img.tile-removing {
.huge-modal-button .illustration {
height: 100px;
width: 100px;
background: rgba(0, 0, 0, 0) url(img/iD-sprite.svg) no-repeat -300px -460px;
margin: auto;
color: #7092FF;
}

.mapillary-wrap {
Expand Down
Loading