Remove unused friend controller and related test harness

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

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index d94f871b7541ddeb389b85284be0922dceb084ab..e2f783731b7ff50f6107e5af77ee7661963724b8 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,5 +1,7 @@
 <% if defined? ID_KEY %>
-  <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
+  <div id="map">
+    <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
+  </div>
   <script>
     var coord = {};
     <% if @lat && @lon && @zoom -%>
@@ -7,12 +9,17 @@
     coord.lon = <%= @lon %>;
     coord.zoom = <%= @zoom %>;
     <% else -%>
-    var params = OSM.mapParams();
-    coord.lat = params.lat;
-    coord.lon = params.lon;
-    coord.zoom = params.zoom;
+    coord = OSM.mapParams();
     <% end -%>
-    $('#id-embed').attr('src', 'id_iframe#map=' + coord.zoom + '/' + coord.lon + '/' + coord.lat);
+
+    var hash;
+    if (coord.object) {
+      hash = '#id=' + coord.object.type[0] + coord.object.id;
+    } else {
+      hash = '#map=' + (coord.zoom || 17) + '/' + coord.lon + '/' + coord.lat
+    }
+
+    $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>' + hash);
   </script>
 <% else %>
   <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>