Fix scroll bar issue on edit pages

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 7c8ee32b3f9f382504d98768b8994404c515b050..1757e771a9fc085a5c85c8b8c7906d5ebdf56aad 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,9 +1,10 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'site', :except => [:key, :permalink]
-  layout false, :only => [:key, :permalink]
+  layout 'site'
+  layout :map_layout, :only => [:index, :export]

 
   before_filter :authorize_web
   before_filter :set_locale
 
   before_filter :authorize_web
   before_filter :set_locale

+  before_filter :redirect_browse_params, :only => :index

   before_filter :redirect_map_params, :only => [:index, :edit, :export]
   before_filter :require_user, :only => [:edit, :welcome]
   before_filter :require_oauth, :only => [:index]
   before_filter :redirect_map_params, :only => [:index, :edit, :export]
   before_filter :require_user, :only => [:edit, :welcome]
   before_filter :require_oauth, :only => [:index]


@@ -33,18 +34,18 @@ class SiteController < ApplicationController
 
   def key
     expires_in 7.days, :public => true
 
   def key
     expires_in 7.days, :public => true

+    render :layout => false

   end
 
   def edit
   end
 
   def edit

-    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+    editor = preferred_editor

 
     if editor == "remote"
 
     if editor == "remote"

+      require_oauth

       render :action => :index
       return
     end
 
       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
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat


@@ -53,6 +54,10 @@ class SiteController < ApplicationController
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon

+    elsif params[:note]
+      note = Note.find(params[:note])
+      @lat = note.lat
+      @lon = note.lon

     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude


@@ -67,6 +72,12 @@ class SiteController < ApplicationController
   def welcome
   end
 
   def welcome
   end
 

+  def help
+  end
+
+  def about
+  end
+

   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end


@@ -77,6 +88,18 @@ class SiteController < ApplicationController
 
   private
 
 
   private
 

+  def redirect_browse_params
+    if params[:node]
+      redirect_to node_path(params[:node])
+    elsif params[:way]
+      redirect_to way_path(params[:way])
+    elsif params[:relation]
+      redirect_to relation_path(params[:relation])
+    elsif params[:note]
+      redirect_to browse_note_path(params[:note])
+    end
+  end
+

   def redirect_map_params
     anchor = []
 
   def redirect_map_params
     anchor = []