From 639f1b6977394f4f0b20b2736615b76b727433a8 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 30 Jan 2013 16:44:27 -0500 Subject: [PATCH 1/6] Stub in splash screen (#567) --- index.html | 1 + js/id/id.js | 5 +++++ js/id/ui/splash.js | 11 +++++++++++ test/index.html | 1 + 4 files changed, 18 insertions(+) create mode 100644 js/id/ui/splash.js diff --git a/index.html b/index.html index af436a86e..dd7a2a648 100644 --- a/index.html +++ b/index.html @@ -69,6 +69,7 @@ + diff --git a/js/id/id.js b/js/id/id.js index ab6dd37f2..853aeceaa 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -245,6 +245,11 @@ window.iD = function(container) { .on('login.editor', connection.authenticate)); controller.enter(iD.modes.Browse()); + +// if (!localStorage.sawSplash) { + iD.ui.splash(); +// localStorage.sawSplash = true; +// } } editor.connection = function(_) { diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js new file mode 100644 index 000000000..ef17f7fca --- /dev/null +++ b/js/id/ui/splash.js @@ -0,0 +1,11 @@ +iD.ui.splash = function() { + var modal = iD.ui.modal(); + + modal.select('.modal') + .classed('modal-splash', true); + + modal.select('.content') + .html('Welcome to iD!'); + + return modal; +}; diff --git a/test/index.html b/test/index.html index 859d5b95d..c9ac23ba5 100644 --- a/test/index.html +++ b/test/index.html @@ -66,6 +66,7 @@ + From 578d4eebdfde86143e75b308d81db7f79077d052 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 30 Jan 2013 19:40:41 -0500 Subject: [PATCH 2/6] everything but logo. --- css/app.css | 48 ++++++++++++++++++++++++++++++++++++++++++++++ js/id/ui/splash.js | 13 +++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/css/app.css b/css/app.css index 8ba20a02c..361ecd2f7 100644 --- a/css/app.css +++ b/css/app.css @@ -908,6 +908,54 @@ div.typeahead a:first-child { left:0px; right:0px; top:0px; bottom:0px; } +.modal-section { + padding: 20px; +} + +.modal-section.header { + border-radius: 4px 4px 0 0; +} + +.modal-section:last-child { + border-radius: 0 0 4px 4px; +} + +.modal-section:only-child { border-radius: 4px; +} + +.modal-section .buttons { + padding-top: 10px; + width: 100%; +} + +.modal-section img.wiki-image { + max-width: 100%; + max-height: 300px; + display: block; +} + +.modal-flash .content { + box-shadow: none; + border-radius: 4px; + background: #111; + color: #eee; +} + +.modal-flash .close-modal { + display:none; +} + +.loading-modal { + text-align: center; +} + +/* Intro Modal +------------------------------------------------------- */ + + +/* Commit Modal +------------------------------------------------------- */ + .commit-modal .user-info { display: inline-block; } diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js index ef17f7fca..952809c75 100644 --- a/js/id/ui/splash.js +++ b/js/id/ui/splash.js @@ -2,10 +2,15 @@ iD.ui.splash = function() { var modal = iD.ui.modal(); modal.select('.modal') - .classed('modal-splash', true); + .attr('class', 'modal-splash modal') - modal.select('.content') - .html('Welcome to iD!'); + var introModal = modal.select('.content') + .append('div') + .attr('class', 'header modal-section fillL'); + + introModal.append('div').attr('class','logo'); + + introModal.html("

Welcome to the iD OpenStreetMap editor

This is development version 0.0.0-alpha1. For more information see ideditor.com and report bugs at github.com.systemed/iD

"); return modal; -}; +}; \ No newline at end of file From 16b42b8e81c011e3e5034944fb60d8829f9bff60 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 30 Jan 2013 19:51:51 -0500 Subject: [PATCH 3/6] adding logo. --- css/app.css | 6 + img/logo.png | Bin 0 -> 3693 bytes img/source/logo.svg | 1205 +++++++++++++++++++++++++++++++++++++++++++ js/id/ui/splash.js | 2 +- 4 files changed, 1212 insertions(+), 1 deletion(-) create mode 100644 img/logo.png create mode 100644 img/source/logo.svg diff --git a/css/app.css b/css/app.css index 361ecd2f7..e7e9edd03 100644 --- a/css/app.css +++ b/css/app.css @@ -952,6 +952,12 @@ div.typeahead a:first-child { /* Intro Modal ------------------------------------------------------- */ +.logo { + height: 100px; + width: 100px; + margin: 0 auto 20px auto; + background: url(../img/logo.png) 0 0 repeat; +} /* Commit Modal ------------------------------------------------------- */ diff --git a/img/logo.png b/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6afa01f1b68a4bd7558836529d015c69ddd5665a GIT binary patch literal 3693 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + iD + + + + + + + + + + + + + + + + + + + + + + + + + A javascript OpenStreetMap Editor + + + + + + + + + + + iD + + + + + + + + + + + + + + + + + + + + + + + A Javascript OpenStreetMap Editor + + + + + + + + + + + + + + + + + + + + + + + D3.js + + + + + + iD + + + + + + + + + + + iD + + + diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js index 952809c75..4f8a40935 100644 --- a/js/id/ui/splash.js +++ b/js/id/ui/splash.js @@ -10,7 +10,7 @@ iD.ui.splash = function() { introModal.append('div').attr('class','logo'); - introModal.html("

Welcome to the iD OpenStreetMap editor

This is development version 0.0.0-alpha1. For more information see ideditor.com and report bugs at github.com.systemed/iD

"); + introModal.append('div').html("

Welcome to the iD OpenStreetMap editor

This is development version 0.0.0-alpha1. For more information see ideditor.com and report bugs at github.com.systemed/iD.

"); return modal; }; \ No newline at end of file From bd4c91c61228ddad6f089623249823a117cb4cdf Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Thu, 31 Jan 2013 13:25:20 -0500 Subject: [PATCH 4/6] modal touch-ups. --- css/app.css | 14 ++++++++------ js/id/ui/splash.js | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/css/app.css b/css/app.css index e7e9edd03..118fa64ea 100644 --- a/css/app.css +++ b/css/app.css @@ -920,7 +920,8 @@ div.typeahead a:first-child { border-radius: 0 0 4px 4px; } -.modal-section:only-child { border-radius: 4px; +.modal-section:only-child { + border-radius: 4px; } .modal-section .buttons { @@ -949,9 +950,14 @@ div.typeahead a:first-child { text-align: center; } -/* Intro Modal +/* Splash Modal ------------------------------------------------------- */ +.modal-splash { + width: 33.3333%; + left: 33.3333%; +} + .logo { height: 100px; width: 100px; @@ -1028,10 +1034,6 @@ div.typeahead a:first-child { border-radius: 4px 4px 0 0; } -.modal-section:last-child { - border-radius: 0 0 4px 4px; -} - .modal-section .buttons { padding-top: 10px; width: 100%; diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js index 4f8a40935..43489fab1 100644 --- a/js/id/ui/splash.js +++ b/js/id/ui/splash.js @@ -6,11 +6,11 @@ iD.ui.splash = function() { var introModal = modal.select('.content') .append('div') - .attr('class', 'header modal-section fillL'); + .attr('class', 'modal-section fillL'); introModal.append('div').attr('class','logo'); - introModal.append('div').html("

Welcome to the iD OpenStreetMap editor

This is development version 0.0.0-alpha1. For more information see ideditor.com and report bugs at github.com.systemed/iD.

"); + introModal.append('div').html("

Welcome to the iD OpenStreetMap editor

This is development version 0.0.0-alpha1. For more information see ideditor.com and report bugs at github.com.systemed/iD.

"); return modal; }; \ No newline at end of file From dea18306d00d96c1e3af89ab1579719b8a1ebd3e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 31 Jan 2013 13:30:18 -0500 Subject: [PATCH 5/6] Uncomment localStorage --- js/id/id.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/id/id.js b/js/id/id.js index 853aeceaa..ac700f846 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -246,10 +246,10 @@ window.iD = function(container) { controller.enter(iD.modes.Browse()); -// if (!localStorage.sawSplash) { + if (!localStorage.sawSplash) { iD.ui.splash(); -// localStorage.sawSplash = true; -// } + localStorage.sawSplash = true; + } } editor.connection = function(_) { From 2613312d12984e25d68def10c6d6f0e3b209517a Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Thu, 31 Jan 2013 11:39:51 -0500 Subject: [PATCH 6/6] Add google analytics. --- index.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/index.html b/index.html index dd7a2a648..2b30b8f83 100644 --- a/index.html +++ b/index.html @@ -128,4 +128,15 @@ d3.select("#iD").call(id); }); + +