Rework the signup and settings methods to make them a bit clearer

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 767220c7905ed0be8bae70bf324a07f6c1c77be7..1478c5773cda99cf2b59c9b15f6fbfc4eaba6cb3 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,16 +1,33 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

+  layout 'site', :except => [:key, :permalink]
+

   before_filter :authorize_web
   before_filter :authorize_web

+  before_filter :set_locale

   before_filter :require_user, :only => [:edit]
 
   before_filter :require_user, :only => [:edit]
 

-  def goto_way
-    way = Way.find(params[:id])
+  def export
+    render :action => 'index'
+  end

 
 

-    begin
-      node = way.way_nodes.first.node
-      redirect_to :controller => 'site', :action => 'index', :lat => node.latitude, :lon => node.longitude, :zoom => 6
-    rescue
-      redirect_to :back
+  def permalink
+    lon, lat, zoom = ShortLink::decode(params[:code])
+    new_params = params.clone
+    new_params.delete :code
+    if new_params.has_key? :m
+      new_params.delete :m
+      new_params[:mlat] = lat
+      new_params[:mlon] = lon
+    else
+      new_params[:lat] = lat
+      new_params[:lon] = lon

     end
     end

+    new_params[:zoom] = zoom
+    new_params[:controller] = 'site'
+    new_params[:action] = 'index'
+    redirect_to new_params

   end
 
   end
 

+  def key
+    expires_in 7.days, :public => true
+  end

 end
 end