Merge branch 'release' of github.com:systemed/iD into release

css/app.css

@@ -916,6 +916,66 @@ 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;
+}
+
+/* Splash Modal
+------------------------------------------------------- */
+
+.modal-splash {
+    width: 33.3333%;
+    left: 33.3333%;
+}
+
+.logo {
+    height: 100px;
+    width: 100px;
+    margin: 0 auto 20px auto;
+    background: url(../img/logo.png) 0 0 repeat;
+}
+
+/* Commit Modal
+------------------------------------------------------- */
+
 .commit-modal .user-info {
     display: inline-block;
 }
@@ -977,10 +1037,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%;

index.html

@@ -69,6 +69,7 @@
         <script src='js/id/ui/notice.js'></script>
         <script src='js/id/ui/flash.js'></script>
         <script src='js/id/ui/save.js'></script>
+        <script src='js/id/ui/splash.js'></script>
         <script src='js/id/ui/tag_reference.js'></script>
         <script src='js/id/ui/key_reference.js'></script>
 
@@ -135,4 +136,15 @@
                 d3.select("#iD").call(id);
             });
         </script></body>
+
+<script type="text/javascript">
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-38039653-2']);
+_gaq.push(['_trackPageview']);
+(function() {
+  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();
+</script>
 </html>

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(_) {

js/id/ui/splash.js

@@ -0,0 +1,16 @@
+iD.ui.splash = function() {
+    var modal = iD.ui.modal();
+
+    modal.select('.modal')
+        .attr('class', 'modal-splash modal')
+
+    var introModal = modal.select('.content')
+        .append('div')
+        .attr('class', 'modal-section fillL');
+
+        introModal.append('div').attr('class','logo');
+
+        introModal.append('div').html("<h2 class>Welcome to the iD OpenStreetMap editor</h2><p>This is development version 0.0.0-alpha1. For more information see <a href='http://ideditor.com/'>ideditor.com</a> and report bugs at <a href='https://github.com'>github.com.systemed/iD</a>.</p>");
+
+    return modal;
+};

test/index.html

@@ -66,6 +66,7 @@
     <script src='../js/id/ui/modal.js'></script>
     <script src='../js/id/ui/flash.js'></script>
     <script src='../js/id/ui/confirm.js'></script>
+    <script src='../js/id/ui/splash.js'></script>
 
     <script src='../js/id/actions.js'></script>
     <script src='../js/id/actions/add_node.js'></script>