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 3adc55f55dee37e2ef2e00679b6a2f92ca00cfb4..d4c33fcfd42900a21cb7e67273026bc3ec2d73ad 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -2,20 +2,19 @@
   <%= javascript_include_tag "index" %>
 <% end %>
 
-<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
-  <% content_for :greeting do %>
-    <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> |
-  <% end %>
-<% 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><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' %>
 <%= render :partial => 'sidebar' %>
-<%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <noscript>
@@ -29,6 +28,12 @@
   <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(:format => :json),
+        :id => "createnoteanchor",
+        :data => { :minzoom => 12 },
+        :title => "javascripts.site.createnote_tooltip",
+        :class => "geolink"
+    %> 
   </div>
 </div>