X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8f4ed911e094d359ed630f034b76e02bc8d51705..51079ecafb73021c66c7e92d93fab723cf2bf05f:/app/views/layouts/site.html.erb?ds=inline
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 423a7b72c..2c6752ab9 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -31,18 +31,15 @@
editclass = 'geolink llz object minzoom13 disabled'
historyclass = 'geolink bbox minzoom11'
exportclass = 'geolink llz layers'
- traceclass = ''
- viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index'
- editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit'
- historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list'
+ viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index'
+ editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit'
+ historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list'
exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export'
- traceclass += ' active' if params['controller'] == 'trace'
%>
<%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
- <%= link_to h(t('layouts.edit')) + ' ▾'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
+ <%= link_to h(t('layouts.edit')) + content_tag(:span, "â¾", :class => "menuicon"), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
<%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
<%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
- <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
@@ -51,14 +48,12 @@
<% Editors::ALL_EDITORS.each do |editor| %>
<%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %>
<% end %>
- <% unless STATUS == :api_offline or STATUS == :database_offline %>
- <%= link_to_function(t('browse.start_rjs.data_layer_name'), 'toggleData()') %>
- <% end %>
+ <%= yield :editmenu %>
@@ -93,7 +88,7 @@
<%= t 'layouts.osm_offline' %>
<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-