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 b7a9df068c618b042d522b389b3674abf2a50e0e..8aa318a3fb8f9587b46f68058032872076e79995 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -25,6 +25,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>
 
@@ -127,6 +128,7 @@ end
 
 <%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
+<%= javascript_include_tag 'notes.js' %>
 
 <%= render :partial => 'resize' %>
 
@@ -136,6 +138,10 @@ end
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
+  <% if @user %>
+    var loginName = "<%= @user.display_name %>"
+  <% end %>
+
   function mapInit(){
     map = createMap("map");
 
@@ -145,6 +151,12 @@ end
           displayInLayerSwitcher: false
       });
       map.addLayer(map.dataLayer);
+
+      var noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), 11);
+
+      <% if params[:notes] == "yes" -%>
+      noteLayer.setVisibility(true);
+      <% end -%>
     <% end %>
 
     <% unless object_zoom %>