Merge branch 'master' into redesign

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index cb57ddc3a3f20b683d9de7c22982a114655af6ec..1757e771a9fc085a5c85c8b8c7906d5ebdf56aad 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,6 +1,6 @@
 class SiteController < ApplicationController
   layout 'site'
-  layout 'map', :only => [:index, :export]
+  layout :map_layout, :only => [:index, :export]
 
   before_filter :authorize_web
   before_filter :set_locale
@@ -41,12 +41,11 @@ class SiteController < ApplicationController
     editor = preferred_editor
 
     if editor == "remote"
+      require_oauth
       render :action => :index
       return
     end
 
-    @extra_body_class = "site-edit-#{editor}"
-
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat