Merge branch 'master' into openstreetbugs

Conflicts:
	config/environment.rb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 368e3fc20648953323c491520ff88ed0fcde12a1..7346802a923f767c5872f86a38b1a896c5f98af1 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -75,6 +75,8 @@
         </center>
       </div>
 
+      <%= yield :optionals %>
+
       <% unless @user %>
       <div id="intro">
         <p>
@@ -123,8 +125,6 @@
         <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
       </div>
 
-      <%= yield :optionals %>
-
       <center>
         <div class="donate">
           <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>

diff --git a/config/environment.rb b/config/environment.rb
index 15ec2457937e0c22ea18806c175d12dff83bd21a..58d9432f5c5d99ccadeccc28a9b36f1b1e37450a 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -18,7 +18,7 @@ Rails::Initializer.run do |config|
   unless  STATUS == :database_offline
     config.gem 'composite_primary_keys', :version => '2.2.2'
   end
-  config.gem 'libxml-ruby', :version => ['>= 1.1.1', ' < 2.0.0'], :lib => 'libxml'
+  config.gem 'libxml-ruby', :version => '~> 1.1.1', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.4.3'
   config.gem 'oauth-plugin', :version => '0.3.14'

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 66ed9e909492ca0efc6c3950cf64f617aa5d5c0c..58950a1ffa14b724e3a8296d3b3b2c89e3a52ae5 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -251,6 +251,8 @@ function setMapLayers(layerConfig) {
 
          if (c == "B") {
             map.setBaseLayer(layers[i]);
+         } else {
+            map.layers[i].setVisibility(false);
          }
       }
    } else {
@@ -260,7 +262,7 @@ function setMapLayers(layerConfig) {
                if (map.layers[i].isBaseLayer) {
                   map.setBaseLayer(map.layers[i]);
                } else {
-                   map.layers[i].setVisibility(true);
+                  map.layers[i].setVisibility(true);
                }
             } else {
                map.layers[i].setVisibility(false);