Merge branch 'master' into openid

[rails.git] / app / views / site / edit.html.erb

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index b29c0f200e84032f4b0464f98a29a1a436f00c9f..e5bffd1e4566c5490541e9a2c6e4322570308a6b 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -1,7 +1,7 @@
-<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+<% if STATUS == :database_offline or STATUS == :api_offline %>
 <p><%= t 'layouts.osm_offline' %>
 </p>
-<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
 <p><%= t 'layouts.osm_read_only' %>
 </p>
 <% elsif !@user.data_public? %>
@@ -20,7 +20,7 @@
 <%= render :partial => 'search' %>
 
 <%
-session[:token] = @user.tokens.create.token unless session[:token]
+session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
 
 # Decide on a lat lon to initialise potlatch with. Various ways of doing this
 if params['lon'] and params['lat']
@@ -88,7 +88,7 @@ zoom='14' if zoom.nil?
   doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
 
   function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom);
+    doSWF(lat, lon, zoom || 15);
   }
 
   function resizeContent() {