Sidebar work

diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js
index 7de65190eb609d6e3db14fac84d237989fc8e31c..b03b71154e1a6b3248ecc2dac14c926132a92d21 100644 (file)
--- a/app/assets/javascripts/edit.js
+++ b/app/assets/javascripts/edit.js
@@ -10,10 +10,9 @@ $(document).ready(function () {
   $("#search_form").submit(function (e) {
     e.preventDefault();
 
   $("#search_form").submit(function (e) {
     e.preventDefault();
 

-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));

     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val()
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val()

-    }, openSidebar);
+    });

   });
 
   $("#describe_location").click(function (e) {
   });
 
   $("#describe_location").click(function (e) {


@@ -21,11 +20,10 @@ $(document).ready(function () {
 
     var mapParams = OSM.mapParams();
 
 
     var mapParams = OSM.mapParams();
 

-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));

     $("#sidebar_content").load($(this).attr("href"), {
       lat: mapParams.lat,
       lon: mapParams.lon,
       zoom: mapParams.zoom
     $("#sidebar_content").load($(this).attr("href"), {
       lat: mapParams.lat,
       lon: mapParams.lon,
       zoom: mapParams.zoom

-    }, openSidebar);    
+    });

   });
 });
   });
 });

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d84b8ae24794562296d1b3d1a13565539497129b..d09213c5d34b90c458d693d73b1e4051bb6a4791 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -91,10 +91,6 @@ $(document).ready(function () {
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 

-  $("#sidebar").on("opened closed", function () {
-    map.invalidateSize();
-  });
-

   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index d8de69974f6a348780c4f7b5f28aaa8fab6ae0a5..f52c58019a03bf6b6238ce35d6fe045dfc116793 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -63,11 +63,8 @@ function initializeBrowse(map, params) {
 
     locationFilter.on("change", getData);
 
 
     locationFilter.on("change", getData);
 

-    $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));

     $("#sidebar_content").html(sidebarHtml);
 
     $("#sidebar_content").html(sidebarHtml);
 

-    openSidebar();
-

     if (browseObjectList) loadObjectList();
 
     map.on("moveend", updateData);
     if (browseObjectList) loadObjectList();
 
     map.on("moveend", updateData);

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index aec35ed2b19cfcfb1b5852f364e25a904b39a050..01d21cea255d52830d7e1ad091710aa67369a8e9 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -9,18 +9,16 @@ function initializeExport(map) {
       adjustButton: false
     }).addTo(map);
 
       adjustButton: false
     }).addTo(map);
 

+    update();
+

     locationFilter.on("change", update);
 
     map.on("moveend", update);
 
     locationFilter.on("change", update);
 
     map.on("moveend", update);
 

-    $("#sidebar_title").html(I18n.t('export.start_rjs.export'));
-

     $("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
 
     $("#drag_box").click(enableFilter);
 
     $("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
 
     $("#drag_box").click(enableFilter);
 

-    openSidebar();
-

     setBounds(map.getBounds());
 
     $("#sidebar").one("closed", function () {
     setBounds(map.getBounds());
 
     $("#sidebar").one("closed", function () {

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index dc4df821e8598e03d35b693c72c6251163859ae6..ce00fa0afff8c74600f757be2732e80288936253 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -21,7 +21,6 @@ function initializeSearch(map) {
 
     var bounds = map.getBounds();
 
 
     var bounds = map.getBounds();
 

-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));

     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
       zoom: map.getZoom(),
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
       zoom: map.getZoom(),


@@ -31,8 +30,6 @@ function initializeSearch(map) {
       maxlat: bounds.getNorth()
     });
 
       maxlat: bounds.getNorth()
     });
 

-    openSidebar();
-

     $("#sidebar").one("closed", function () {
       map.removeLayer(marker);
       map.removeObject();
     $("#sidebar").one("closed", function () {
       map.removeLayer(marker);
       map.removeObject();


@@ -67,11 +64,10 @@ function initializeSearch(map) {
     var center = map.getCenter(),
       zoom = map.getZoom();
 
     var center = map.getCenter(),
       zoom = map.getZoom();
 

-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));

     $("#sidebar_content").load($(this).attr("href"), {
       lat: center.lat,
       lon: center.lng,
       zoom: zoom
     $("#sidebar_content").load($(this).attr("href"), {
       lat: center.lat,
       lon: center.lng,
       zoom: zoom

-    }, openSidebar);    
+    });

   }
 }
   }
 }

diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index e126285abae64530232cd90ddfa585e237d2c14b..21a4380dc77aeb1eeef246fd43623a5ae74dcbf3 100644 (file)
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -1,20 +1,6 @@
-function openSidebar() {
-  $("#sidebar-main")
-    .hide();
-
-  $("#sidebar")
-    .trigger("closed")
-    .show()
-    .trigger("opened");
-}
-

 function closeSidebar() {
   $("#sidebar")
 function closeSidebar() {
   $("#sidebar")

-    .hide()

     .trigger("closed");
     .trigger("closed");

-
-  $("#sidebar-main")
-    .show();

 }
 
 $(document).ready(function () {
 }
 
 $(document).ready(function () {

diff --git a/app/views/browse/start.html.erb b/app/views/browse/start.html.erb
index 12012a0299c480842d03e418b03e7cf7b3088bdf..e281a97286c74d5584969804f3392a3f0e7d8d8b 100644 (file)
--- a/app/views/browse/start.html.erb
+++ b/app/views/browse/start.html.erb
@@ -1,3 +1,4 @@
+<h2><%= t 'browse.start_rjs.data_frame_title' %></h2>

 <div id="browse_controls" class='inner12'>
   <a id="browse_filter_toggle" class="button" href="#"><%= t'browse.start_rjs.manually_select' %></a>
   <a id="browse_hide_areas_box" class="button" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
 <div id="browse_controls" class='inner12'>
   <a id="browse_filter_toggle" class="button" href="#"><%= t'browse.start_rjs.manually_select' %></a>
   <a id="browse_hide_areas_box" class="button" href="#"><%= t'browse.start_rjs.hide_areas' %></a>

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index 6e25588b62f9121df5bf80ef38607d270063f5d8..007516dd6cb1e8fda435c5f5d51160eb666a1572 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,3 +1,4 @@
+<h2><%= t('site.sidebar.search_results') %></h2>

 <% @sources.each do |source| %>
   <h4><%= raw(t "geocoder.search.title.#{source}") %></h4>
   <div class="search_results_entry" id="<%= "search_#{source}" %>">
 <% @sources.each do |source| %>
   <h4><%= raw(t "geocoder.search.title.#{source}") %></h4>
   <div class="search_results_entry" id="<%= "search_#{source}" %>">

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 0b0e991824cddbde89c80f2de14a1ee77291ad1f..150541f0018cefc557e227ba111cbfd303189c91 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

+  <h2><%= t 'export.start_rjs.export' %></h2>

   <%= form_tag :controller => "export", :action => "finish" do %>
     <%= hidden_field_tag 'format', 'osm' %>
 
   <%= form_tag :controller => "export", :action => "finish" do %>
     <%= hidden_field_tag 'format', 'osm' %>
 

-    <div class="export_bounds inner12">
+    <div class="export_bounds inner22">

       <div class='export_area_inputs'>
         <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
         <br/>
       <div class='export_area_inputs'>
         <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
         <br/>


@@ -21,14 +22,14 @@
     <div id="export_osm">
       <h4><%= t'export.start.licence' %></h4>
 
     <div id="export_osm">
       <h4><%= t'export.start.licence' %></h4>
 

-      <div class="export_details inner12">
+      <div class="export_details">

         <p><%= raw t'export.start.export_details' %></p>
       </div>
 
       <div  id="export_osm_too_large">
         <h4><%= t'export.start.too_large.heading' %></h4>
 
         <p><%= raw t'export.start.export_details' %></p>
       </div>
 
       <div  id="export_osm_too_large">
         <h4><%= t'export.start.too_large.heading' %></h4>
 

-        <div class="export_details inner12">
+        <div class="export_details">

           <p><%= t'export.start.too_large.body' %></p>
           <dl>
             <dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
           <p><%= t'export.start.too_large.body' %></p>
           <dl>
             <dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>


@@ -47,7 +48,7 @@
       </div>
     </div>
 
       </div>
     </div>
 

-    <div class="inner12">
+    <div class="inner22">

       <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
     </div>
   <% end %>
       <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
     </div>
   <% end %>