Use relative URLs rather than hard coding the server name

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

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 57a45f2abb027216bfccab58f5de221e72cf720e..6073e0adf446e95c9156e56eaf2b9f92fc5ab200 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -14,7 +14,7 @@
   
   window.onbeforeunload=function() {
     if (!changesaved) {
-      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
+      return '<%= escape_javascript(t('site.edit.potlatch2_unsaved_changes')) %>';
     }
   }
 
@@ -24,9 +24,12 @@
     fo.addParam("base","/potlatch2");
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }
+    <% if params['gpx'] %>
+    fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
+    <% end %>
     fo.addVariable("zoom",zoom);
-    fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
-    fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
+    fo.addVariable("api","/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","/api/crossdomain.xml");
     fo.addVariable("connection","XML");
     fo.addVariable("oauth_token","<%= token.token %>");
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
@@ -34,12 +37,17 @@
     fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
     fo.addVariable("maximise_function","maximiseMap");
     fo.addVariable("minimise_function","minimiseMap");
+    fo.addVariable("move_function","mapMoved");
     fo.write("map");
   }
 
   doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
 
   function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom || 15);
+    $("potlatch").setPosition(lat, lon, Math.max(zoom || 15, 13));
+  }
+
+  function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
+    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
   }
 </script>