From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 19 Nov 2013 19:18:11 +0000 (-0800)
Subject: Eliminate loading flash for welcome overlay
X-Git-Tag: live~4653^2~38
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bd21a1f7ffe1bff79cc3e249119e26ec946c7cc4?hp=e91956d0f7ea6f2b0719a1459110ad3a09d2ee9a

Eliminate loading flash for welcome overlay
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 59e231381..365d33e3a 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -198,22 +198,19 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
-    page.pushstate = function(path) {
+    page.pushstate = function() {
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})
         .panBy([-350, 0], {animate: false});
-      OSM.loadSidebarContent(path);
-      page.load();
     };
 
     page.load = function() {
       return map.getState();
     };
 
-    page.popstate = function(path) {
+    page.popstate = function() {
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});
-      OSM.loadSidebarContent(path);
     };
 
     page.unload = function() {
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index a7591ba21..ebc5109c6 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -649,12 +649,22 @@ nav.secondary {
     }
   }
 
+  .welcome {
+    display: none;
+  }
+
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
     border-bottom-right-radius: 5px;
     overflow: hidden;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }
   }
 
   .welcome {
diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 39b946af0..e9d0a4779 100644
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -122,7 +122,7 @@ nav.secondary {
 }
 
 #sidebar .welcome {
-  display: none;
+  display: none !important;
 }
 
 .leaflet-top.leaflet-right {
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 2170705b0..2fe8b9b3b 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -40,6 +40,15 @@
       <%= render :partial => "layouts/flash" %>
       <%= yield %>
     </div>
+
+    <% unless @user %>
+      <div class="welcome">
+        <h2><%= t 'layouts.intro_header' %></h2>
+        <p><%= t 'layouts.intro_text' %></p>
+        <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
+        <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.sign_up') %></a>
+      </div>
+    <% end %>
   </div>
 
   <noscript>
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 6f215235c..7603bb1bd 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,13 +1,4 @@
 <%
-    set_title()
-    content_for(:content_class) { "overlay-sidebar" }
+   set_title()
+   content_for(:content_class) { "overlay-sidebar" }
 %>
-
-<% unless @user %>
-  <div class="welcome">
-    <h2><%= t 'layouts.intro_header' %></h2>
-    <p><%= t 'layouts.intro_text' %></p>
-    <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
-    <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.sign_up') %></a>
-  </div>
-<% end %>