diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d1adaeff3..238ab7f63 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -231,7 +231,7 @@ $(document).ready(function () { initializeNotes(map); OSM.Index = function(map) { - var page = {}, minimized = false; + var page = {}, minimized = $('#sidebar').hasClass('minimized'); page.pushstate = page.popstate = function(path) { if (minimized) $("#sidebar").addClass("minimized"); @@ -244,14 +244,6 @@ $(document).ready(function () { $("#view_tab").removeClass("current"); }; - page.minimizeSidebar = function() { - $("#sidebar").addClass("minimized"); - map.invalidateSize(); - minimized = true; - }; - - $(document).on("click", "#sidebar_content .close", page.minimizeSidebar); - return page; }; diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js index 02dcdd440..23c503236 100644 --- a/app/assets/javascripts/index/export.js +++ b/app/assets/javascripts/index/export.js @@ -52,16 +52,18 @@ OSM.Export = function(map) { $("#export_tab").addClass("current"); $("#sidebar").removeClass("minimized"); map.invalidateSize(); - $('#sidebar_content').load(path, page.load); + $("#sidebar_content").load(path, page.load); }; page.load = function() { + $("#sidebar").removeClass("minimized"); map .addLayer(locationFilter) .on("moveend", update); $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged); $("#drag_box").click(enableFilter); + $("#sidebar_content .close").on("click", page.minimizeSidebar); update(); }; diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index ed4e2b417..d27a06943 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -99,12 +99,12 @@ OSM.History = function(map) { page.pushstate = page.popstate = function(path) { $("#history_tab").addClass("current"); - $("#sidebar").removeClass("minimized"); map.invalidateSize(); $("#sidebar_content").load(path, page.load); }; page.load = function() { + $("#sidebar").removeClass("minimized"); map .on("moveend", loadData) .addLayer(group); diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index b9e86a4c3..434135df5 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -49,12 +49,12 @@ OSM.Search = function(map) { page.pushstate = page.popstate = function(path) { var params = querystring.parse(path.substring(path.indexOf('?') + 1)); $("#query").val(params.query); - $("#sidebar").removeClass("minimized"); map.invalidateSize(); $("#sidebar_content").load(path, page.load); }; page.load = function() { + $("#sidebar").removeClass("minimized"); $(".search_results_entry").each(function() { var entry = $(this); $.ajax({ diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index b9b37da47..0d64ffae6 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,5 +1,5 @@

<%= t 'browse.changeset.changeset', :id => @changeset.id %> - +

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index c43c15468..8302f472d 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -4,7 +4,7 @@ %>

<%= t'browse.node.node_title', :node_name => @name %> - +

<%= render :partial => "node_details", :object => @node %> diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index 0ae5a36e8..cbf7853f2 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -4,7 +4,7 @@ %>

<%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %> - +

<% @node.old_nodes.reverse.each do |node| %> diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index c91005b60..061a86b06 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,5 +1,5 @@

<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> - +

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 847298199..2db0d0f44 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -4,7 +4,7 @@ %>

<%= t'browse.relation.relation_title', :relation_name => @name %> - +

<%= render :partial => "relation_details", :object => @relation %> diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index 32eb2f400..653991b9d 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -4,7 +4,7 @@ %>

<%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %> - +

<% @relation.old_relations.reverse.each do |relation| %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 4dacaf929..5b33bd49e 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -3,7 +3,7 @@ @title = t('browse.way.way') + ' | ' + @name %>

<%= t'browse.way.way_title', :way_name => @name %> - +

<%= render :partial => "way_details", :object => @way %> diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 34cfb20ad..8959a3fd4 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -4,7 +4,7 @@ %>

<%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %> - +

<% @way.old_ways.reverse.each do |way| %> diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb index 03af11ec1..e5cb104e9 100644 --- a/app/views/changeset/history.html.erb +++ b/app/views/changeset/history.html.erb @@ -21,7 +21,7 @@ %>

<%= @heading %> - +

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index e142d00b8..e3f845939 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -1,6 +1,6 @@

<%= t('site.sidebar.search_results') %> - +

<% @sources.each do |source| %>

<%= raw(t "geocoder.search.title.#{source}") %>

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index c6467382a..40aaae186 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -17,7 +17,7 @@ <% end %> <% content_for :content do %> -