Extract browse.js static asset

[rails.git] / app / views / browse / _map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 6df060d5cf0b6f2b26eaf58c3dfc63337fd32ac8..340e26132bf8e94e7fc6803beab960a271f5535b 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag 'openlayers.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <iframe id="linkloader" style="display: none">
 <%= javascript_include_tag 'map.js' %>
 
 <iframe id="linkloader" style="display: none">


@@ -11,12 +10,12 @@
   <span id="loading"><%= t 'browse.map.loading' %></span>
   <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
   <br />
   <span id="loading"><%= t 'browse.map.loading' %></span>
   <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
   <br />

-  <%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
+  <%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>

   <% unless map.instance_of? Changeset %>
     <br />
   <% unless map.instance_of? Changeset %>
     <br />

-    <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
+    <%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>

     <br />
     <br />

-    <%= link_to("", { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
+    <%= link_to(h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>

   <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>


@@ -41,8 +40,6 @@
 
 <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
   <script type="text/javascript">
 
 <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
   <script type="text/javascript">

-    OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-

     function remoteEditHandler(event, bbox, select) {
       var left = bbox.left - 0.0001;
       var top = bbox.top + 0.0001;
     function remoteEditHandler(event, bbox, select) {
       var left = bbox.left - 0.0001;
       var top = bbox.top + 0.0001;


@@ -79,7 +76,7 @@
         var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
         var centre = bbox.getCenterLonLat();
 
         var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
         var centre = bbox.getCenterLonLat();
 

-        setMapExtent(bbox);
+        map.zoomToExtent(proj(bbox));

         addBoxToMap(bbox);
 
         $("#loading").hide();
         addBoxToMap(bbox);
 
         $("#loading").hide();


@@ -110,6 +107,9 @@
           url += "/" + previous_version;
         }
 
           url += "/" + previous_version;
         }
 

+        $("#object_larger_map").hide();
+        $("#object_edit").hide();
+

         addObjectToMap(url, true, function(extent) {
           $("#loading").hide();
           $("#browse_map .geolink").show();
         addObjectToMap(url, true, function(extent) {
           $("#loading").hide();
           $("#browse_map .geolink").show();


@@ -129,7 +129,6 @@
             });
             <% end -%>
 
             });
             <% end -%>
 

-            <% unless map.instance_of? Changeset -%>

             $("#remote_object_edit").click(function (event) {
               return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
             });
             $("#remote_object_edit").click(function (event) {
               return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
             });


@@ -140,9 +139,8 @@
             });
             <% end -%>
 
             });
             <% end -%>
 

-            $("#object_larger_map").html("<%=j t('browse.map.larger.' + map.class.to_s.downcase) %>");
-            $("#object_edit").html("<%=j t('browse.map.edit.' + map.class.to_s.downcase) %>");
-            <% end -%>
+            $("#object_larger_map").show();
+            $("#object_edit").show();

 
             updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);
           } else {
 
             updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);
           } else {


@@ -151,8 +149,8 @@
         });
       <% end -%>
 
         });
       <% end -%>
 

-      createMenu("area_edit", "area_edit_menu", 1000, "right");
-      createMenu("object_edit", "object_edit_menu", 1000, "right");
+      createMenu("area_edit", "area_edit_menu", "right");
+      createMenu("object_edit", "object_edit_menu", "right");

     }
 
     window.onload = init;
     }
 
     window.onload = init;