Merge branch 'master' into notes

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

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index c4df0021f5d099ef3bad8e2d7bc20b7372488a1a..d48fd799d2629ca98a6c3ebdb5b6070c0d97b280 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -7,7 +7,6 @@
 <% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
 
 <script type="text/javascript" defer="defer">
 <% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
 
 <script type="text/javascript" defer="defer">

-  var brokenContentSize = $("content").offsetWidth == 0;

   var changesaved=true;
   var winie=false; if (document.all && window.print) { winie=true; }
   
   var changesaved=true;
   var winie=false; if (document.all && window.print) { winie=true; }
   


@@ -43,9 +42,18 @@
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
     // 700,600 for fixed size, 100%,100% for resizable
   }
 

-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);
+  <% else -%>
+  var params = OSM.mapParams();
+  doSWF(params.lat, params.lon, params.zoom || 17);
+  <% end -%>

 
 

-  function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom || 15);
-  }
+  $(document).ready(function () {
+    $("body").on("click", "a.set_position", function () {
+      var data = $(this).data();
+
+      doSWF(data.lat, data.lon, data.zoom || 15);
+    });
+  });

 </script>
 </script>