Merge branch 'master' into openstreetbugs

[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 8f8d8737be1780be7b1fe12263272c759bb05111..58bc59c204b53cc3e6c252e627eb24476687b923 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -6,6 +6,7 @@
 
 <% unless STATUS == :api_offline or STATUS == :database_offline -%>
   <% content_for :editmenu do -%>
+    <li><%= link_to t("browse.start_rjs.notes_layer_name"), "#", :id => "show_notes" %></li>
     <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
   <% end -%>
 <% end -%>
@@ -25,6 +26,7 @@
   <div id="permalink">
     <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a>
     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+    <a href="#" id="createnoteanchor">Report a problem</a>     
   </div>
 </div>
 
@@ -48,9 +50,27 @@
   var map;
   var params = OSM.mapParams();
 
+  <% if @user %>
+    var loginName = "<%= @user.display_name %>"
+  <% end %>
+
   function mapInit(){
     map = createMap("map");
 
+    <% unless STATUS == :api_offline or STATUS == :database_offline %>
+      map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
+          visibility: false,
+          displayInLayerSwitcher: false
+      });
+      map.addLayer(map.dataLayer);
+
+      map.noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), 11);
+
+      <% if params[:notes] == "yes" -%>
+      map.noteLayer.setVisibility(true);
+      <% end -%>
+    <% end %>
+
     if (!params.object_zoom) {
       if (params.bbox) {
         var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
@@ -91,6 +111,10 @@
   }
 
   $(document).ready(function () {
+    $("#show_notes").click(function () {
+      map.noteLayer.setVisibility(true);
+    });
+
     $("#show_data").click(function (e) {
       $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
         startBrowse(sidebarHtml);