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 8180cee02a8d7db07c6b6b5e9195c76752253a9f..d48fd799d2629ca98a6c3ebdb5b6070c0d97b280 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -42,16 +42,18 @@
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
     // 700,600 for fixed size, 100%,100% for resizable
   }
 

+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);
+  <% else -%>

   var params = OSM.mapParams();
   doSWF(params.lat, params.lon, params.zoom || 17);
   var params = OSM.mapParams();
   doSWF(params.lat, params.lon, params.zoom || 17);

+  <% end -%>

 
   $(document).ready(function () {
     $("body").on("click", "a.set_position", function () {
 
   $(document).ready(function () {
     $("body").on("click", "a.set_position", function () {

-      var lat = parseFloat($(this).attr("data-lat"));
-      var lon = parseFloat($(this).attr("data-lon"));
-      var zoom = parseInt($(this).attr("data-zoom"));
+      var data = $(this).data();

 
 

-      doSWF(lat, lon, zoom || 15);
+      doSWF(data.lat, data.lon, data.zoom || 15);

     });
   });
 </script>
     });
   });
 </script>