Add Potlatch 2 as an editor option

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

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 0602b6f11598b855b96955ae6055c6c12a6b49f2..a89212238a26e7706b18a3239b711b284a700abe 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -17,11 +17,12 @@
 </noscript>
 
 <div id="map">
-  <div id="permalink">
-    <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
-    <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
-  </div>
-</div> 
+</div>
+
+<div id="permalink">
+  <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
+  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+</div>
 
 <div id="attribution">
   <table width="100%">
@@ -40,7 +41,7 @@
 </div>
 
 <%
-if params['mlon'] and params['mlat'] 
+if params['mlon'] and params['mlat']
     marker = true
     mlon = h(params['mlon'])
     mlat = h(params['mlat'])
@@ -68,7 +69,7 @@ if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat
     minlat = h(params['minlat'])
     maxlon = h(params['maxlon'])
     maxlat = h(params['maxlat'])
-    box = true if params['box']=="yes" 
+    box = true if params['box']=="yes"
     object_zoom = false
 end
 
@@ -80,14 +81,14 @@ if params['lon'] and params['lat']
     layers = h(params['layers'])
     object_zoom = false
 elsif params['mlon'] and params['mlat']
-    lon = h(params['mlon']) 
+    lon = h(params['mlon'])
     lat = h(params['mlat'])
     zoom =  h(params['zoom'] || '12')
     layers = h(params['layers'])
     object_zoom = false
 elsif cookies.key?("_osm_location")
     lon,lat,zoom,layers = cookies["_osm_location"].split("|")
-elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
     lon =  @user.home_lon
     lat =  @user.home_lat
     zoom = '10'
@@ -101,12 +102,12 @@ else
         maxlon = session[:location][:maxlon]
         maxlat = session[:location][:maxlat]
     else
-        lon =  '-0.1' 
-        lat =  '51.5' 
-        zoom =  h(params['zoom'] || '5') 
+        lon =  '-0.1'
+        lat =  '51.5'
+        zoom =  h(params['zoom'] || '5')
     end
 
-    layers = h(params['layers']) 
+    layers = h(params['layers'])
 end
 %>
 
@@ -125,7 +126,7 @@ end
   function mapInit(){
     map = createMap("map");
 
-    <% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %>
+    <% unless STATUS == :api_offline or STATUS == :database_offline %>
       map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
       map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
       map.addLayer(map.dataLayer);
@@ -170,7 +171,8 @@ end
         url += "/full";
       <% end %>
 
-      addObjectToMap(url, <%= object_zoom %>);
+      // IE requires Vector layers be initialised on page load, and not under deferred script conditions
+      Event.observe(window, 'load', function() { addObjectToMap(url, <%= object_zoom %>) });
     <% end %>
 
     map.events.register("moveend", map, updateLocation);
@@ -228,7 +230,7 @@ end
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
 
-    expiry.setYear(expiry.getFullYear() + 10); 
+    expiry.setYear(expiry.getFullYear() + 10);
     document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
   }
 
@@ -240,7 +242,7 @@ end
     content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
     content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
   }
-  
+
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();
@@ -264,7 +266,7 @@ end
 
     resizeMap();
   }
-  
+
   mapInit();
 
   window.onload = handleResize;