Merge branch 'master' into notes

[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 5c470ca89fd79a9584bc90cd1d88f5843fd8ea53..194787ce0f52ce21c93f6d937a7edcca6dc638d2 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -4,13 +4,17 @@
 
 <% unless STATUS == :api_offline or STATUS == :database_offline -%>
   <% content_for :editmenu do -%>
+    <li><%= link_to t("browse.start_rjs.notes_layer_name"), notes_url(:format => :json), :id => "show_notes" %></li>
     <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
   <% end -%>
 <% end -%>
 
+<% content_for :left_menu do %>
+  <li><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></li>
+<% end %>
+
 <%= render :partial => 'home_link' %>
 <%= render :partial => 'sidebar' %>
-<%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <noscript>
@@ -24,6 +28,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>
 
@@ -41,3 +46,5 @@
     </tr>
   </table>
 </div>
+
+<div id="new-note" class="hidden"><%= render :partial => "notes/new" %></div>