Merge 7922:8377 from trunk.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index fa31d848ba2f3ab39806270f5e63a1360c366cb5..482ed85b89880744e8d556d5082c41a0f627889c 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -8,8 +8,15 @@
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 

+<noscript>
+  <div id="noscript">
+    <p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
+    <p>OpenStreetMap uses javascript for its slippy map.</p>
+    <p>You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.</p>
+  </div>
+</noscript>
+

 <div id="map">
 <div id="map">

-<div id="datalink"><%= link_to_remote 'See Data', {:url => {:controller => 'browse', :action => 'start'}}, {:href => url_for( {:controller => 'browse', :action => 'index'}), :id => 'browseanchor', :title => 'browse data'} %></div>

 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
 </div> 
 
 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
 </div> 
 


@@ -22,7 +29,7 @@
 <tr>
 <td colspan="2" align="center">
 Licensed under the Creative Commons Attribution-Share Alike 2.0 license
 <tr>
 <td colspan="2" align="center">
 Licensed under the Creative Commons Attribution-Share Alike 2.0 license

-by the OpenStreetMap project and it's contributors.
+by the OpenStreetMap project and its contributors.

 </td>
 </table>
 </div>
 </td>
 </table>
 </div>


@@ -51,8 +58,8 @@ by the OpenStreetMap project and it's contributors.
 <% lat = h(params['mlat']) %>
 <% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>
 <% lat = h(params['mlat']) %>
 <% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>

-<% elsif cookies.key?("location") %>
-<% lon,lat,zoom,layers = cookies["location"].split(",") %>
+<% 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? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>


@@ -69,8 +76,8 @@ by the OpenStreetMap project and it's contributors.
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  h(params['zoom'] || '5') %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  h(params['zoom'] || '5') %>

-<% layers = h(params['layers']) %>

 <% end %>
 <% end %>

+<% layers = h(params['layers']) %>

 <% end %>
 
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <% end %>
 
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>


@@ -87,6 +94,10 @@ by the OpenStreetMap project and it's contributors.
   function mapInit(){
     map = createMap("map");
 
   function mapInit(){
     map = createMap("map");
 

+    map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+    map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+    map.addLayer(map.dataLayer);
+

     <% if bbox %>
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
     <% if bbox %>
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 


@@ -102,7 +113,7 @@ by the OpenStreetMap project and it's contributors.
     setMapCenter(centre, zoom);
     <% end %>
 
     setMapCenter(centre, zoom);
     <% end %>
 

-    <% if layers %>
+    <% if !layers.nil? and !layers.empty? %>

     setMapLayers("<%= layers %>");
     <% end %>
 
     setMapLayers("<%= layers %>");
     <% end %>
 


@@ -119,6 +130,14 @@ by the OpenStreetMap project and it's contributors.
     handleResize();
   }
 
     handleResize();
   }
 

+  function toggleData() {
+    if (map.dataLayer.visibility) {
+      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+    } else {
+      closeSidebar();
+    }
+  }
+

   function getPosition() {
     return getMapCenter();
   }
   function getPosition() {
     return getMapCenter();
   }


@@ -141,7 +160,7 @@ by the OpenStreetMap project and it's contributors.
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 

-    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;

   }
 
   function resizeContent() {
   }
 
   function resizeContent() {