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 ab1eaa1dc48833cee1625d00ca8eaa0db54c2004..c979c52bb857cfc205c4a820d5ae5645b9a0b16e 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -2,15 +2,8 @@
   <%= javascript_include_tag "index" %>
 <% end %>
 
-<% 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>
+  <li><h4><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></h4></li>
 <% end %>
 
 <%= render :partial => 'home_link' %>
@@ -28,7 +21,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>
-    <%= link_to t("site.index.createnote"), notes_url,
+    <%= link_to t("site.index.createnote"), notes_url(:format => :json),
         :id => "createnoteanchor",
         :data => { :minzoom => 12 },
         :title => "javascripts.site.createnote_tooltip",
@@ -51,5 +44,3 @@
     </tr>
   </table>
 </div>
-
-<div id="new-note" class="hidden"><%= render :partial => "notes/new" %></div>