Standardize submit tags

[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 680c45cdebd1f2707662eb714ae7ad70caaa1474..e2f783731b7ff50f6107e5af77ee7661963724b8 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,34 +1,26 @@
 <% if defined? ID_KEY %>
 <% if defined? ID_KEY %>

-<iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
-<% token = @user.access_token(ID_KEY) %>
-<script>
-var keys = {
-    '<%= request.protocol + request.host_with_port %>': {
-        oauth_consumer_key: "<%= token.client_application.key %>",
-        oauth_secret: "<%= token.client_application.secret %>",
-        oauth_token: "<%= token.token %>",
-        oauth_token_secret: "<%= token.secret %>"
+  <div id="map">
+    <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
+  </div>
+  <script>
+    var coord = {};
+    <% if @lat && @lon && @zoom -%>
+    coord.lat = <%= @lat %>;
+    coord.lon = <%= @lon %>;
+    coord.zoom = <%= @zoom %>;
+    <% else -%>
+    coord = OSM.mapParams();
+    <% end -%>
+
+    var hash;
+    if (coord.object) {
+      hash = '#id=' + coord.object.type[0] + coord.object.id;
+    } else {
+      hash = '#map=' + (coord.zoom || 17) + '/' + coord.lon + '/' + coord.lat

     }
     }

-};

 
 

-var coord = {};
-<% if @lat && @lon && @zoom -%>
-coord.lat = <%= @lat %>;
-coord.lon = <%= @lon %>;
-coord.zoom = <%= @zoom %>;
-<% else -%>
-var params = OSM.mapParams();
-coord.lat = params.lat;
-coord.lon = params.lon;
-coord.zoom = params.zoom;
-<% end -%>
-var url = 'id_iframe#map=' + coord.zoom + '/' + coord.lon + '/' + coord.lat +
-    '&preauth=' + JSON.stringify(keys);
-$('#id-embed').attr('src', url);
-</script>
-<% else%>
-<script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>
+    $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>' + hash);
+  </script>
+<% else %>
+  <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>

 <% end %>
 <% end %>

-
-<script type="text/javascript">
-</script>