Potlatch v0.2a: display GPS traces, some bugfixes

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

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index ecb977656fa890f97d9e249f92f0b1d0715b2e81..b1c5555866a69b957cb9a39b224833911600ccfb 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -4,7 +4,7 @@
 </p>
 <% else %>
 <% content_for :greeting do %>
-<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>
@@ -39,10 +39,12 @@
   var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
 
   function doSWF(lat,lon,sc) {
+    if (sc < 11) sc = 11;
     fo.addVariable('lat',lat);
     fo.addVariable('long',lon);
     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');
+<% if params['gpx'] %>    fo.addVariable('gpx','<%= params['gpx']+"/data" %>'); <% end %>
     fo.write("map");
   }