add mappam... also stuff in user controller that must have been done by TomH?

[rails.git] / app / views / site / edit.rhtml

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 55cdcfed62b70b256c26c6cd41563b03c4112b84..a1b0a4925fb93b2b51af5d4fcd788b43ccdd1819 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,7 +1,23 @@
-<div id="mapcontent">Sorry, you need a Flash player to use Potlatch, the
+<%= render :partial => 'search' %>
+
+<% if params['mlon'] and params['mlat'] %>
+<% lon =  params['mlon'] %>
+<% lat =  params['mlat']  %>
+<% zoom =  params['zoom'] || '12' %>
+<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% lon =  @user.home_lon %>
+<% lat =  @user.home_lat %>
+<% zoom = '12' %>
+<%else%>
+<% lon =  params['lon'] || '-0.1' %>
+<% lat =  params['lat'] || '51.5' %>
+<% zoom =  params['zoom'] || '12' %>
+<% end %>
+
+<div id="mapcontent">You need a Flash player to use Potlatch, the

     OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
 
     OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
 

-    <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available 
+    <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available

     for editing OpenStreetMap.</div>
   <script type="text/javascript" src="/javascripts/swfobject.js"></script>
   <script type="text/javascript">
     for editing OpenStreetMap.</div>
   <script type="text/javascript" src="/javascripts/swfobject.js"></script>
   <script type="text/javascript">


@@ -10,13 +26,10 @@
       fo.addVariable('lat',lat);
       fo.addVariable('long',lon);
       fo.addVariable('scale',sc);
       fo.addVariable('lat',lat);
       fo.addVariable('long',lon);
       fo.addVariable('scale',sc);

-      fo.addVariable('token','tokenstring');
+      fo.addVariable('token','<%= @user.token %>');

       fo.write("mapcontent");
     }
       fo.write("mapcontent");
     }

-<% lon =  params['lon'] || '-0.1' %>
-<% lat =  params['lat'] || '51.5' %>
-<% zoom =  params['zoom'] || '12' %>

 
 

-    doSWF(<%= lat %>,<%= lon %>,12);
+    doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);

 
 </script>
 
 </script>