Merge branch '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 248b5a0b624df4323a077fd871749ad694ce02b0..3efdd9289fd873fbb9a4697777c2406dc52b50f3 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 %>
 
   <%= 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 %>
 <% 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' %>
 <% end %>
 
 <%= render :partial => 'home_link' %>


@@ -26,14 +19,16 @@
 
 <div id="map">
   <div id="permalink">
 
 <div id="map">
   <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"
-    %> 
+    <ul class="secondary-actions">
+      <li><a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a></li>
+      <li><a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a></li>
+      <li><%= link_to t("site.index.createnote"), notes_url(:format => :json),
+          :id => "createnoteanchor",
+          :data => { :minzoom => 12 },
+          :title => "javascripts.site.createnote_tooltip",
+          :class => "geolink"
+      %></li>
+    </ul>

   </div>
 </div>
 
   </div>
 </div>
 


@@ -51,3 +46,4 @@
     </tr>
   </table>
 </div>
     </tr>
   </table>
 </div>

+