Tidy up generation of UJS data attributes

[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 0b1c0e34d5d8506576644807f48188df866b8197..4559282ca465b031dfd152baff9d6adb4ace54f2 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -28,7 +28,10 @@
     if (lat) { flashvars.lat = lat; }
     if (lon) { flashvars.lon = lon; }
     flashvars.zoom = zoom;
+    flashvars.assets = "<%= asset_path "potlatch2/assets.zip" %>";
+    flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";
     flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
+    flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";
     <% if params['gpx'] %>
     flashvars.gpx = '<%= h(params['gpx']) %>';
     <% end %>
@@ -56,7 +59,7 @@
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 
-    swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
+    swfobject.embedSWF("<%= asset_path("potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
@@ -70,11 +73,17 @@
   doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
   <% end -%>
 
-  function setPosition(lat, lon, zoom) {
-    $("#potlatch").each(function () {
-      this.setPosition(lat, lon, Math.max(zoom || 15, 13));
+  $(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"));
+
+      $("#potlatch").each(function () {
+        this.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);