Fix double escaping of date markup in note feed

[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 1d45d622356f7399a043d0110a87a561d06df77c..65ca9210e11734d4209c9d4fe9b12158102bf366 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -42,6 +42,7 @@
     flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
     flashvars.connection = "XML";
     flashvars.show_help = "once";
     flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
     flashvars.connection = "XML";
     flashvars.show_help = "once";

+    flashvars.user_check = "warn";

     <% if token %>
     flashvars.oauth_token = "<%= token.token %>";
     flashvars.oauth_token_secret = "<%= token.secret %>";
     <% if token %>
     flashvars.oauth_token = "<%= token.token %>";
     flashvars.oauth_token_secret = "<%= token.secret %>";


@@ -70,13 +71,13 @@
   doSWF(params.lat, params.lon, params.zoom || 17);
   <% end -%>
 
   doSWF(params.lat, params.lon, params.zoom || 17);
   <% end -%>
 

-  $(document).ready(function () {
-    $("body").on("click", "a.set_position", function () {
-      var data = $(this).data();
+  $("body").on("click", "a.set_position", function (e) {
+    e.preventDefault();

 
 

-      $("#potlatch").each(function () {
-        this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));
-      });
+    var data = $(this).data();
+
+    $("#potlatch").each(function () {
+      this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));

     });
   });
 
     });
   });