X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8f4ed911e094d359ed630f034b76e02bc8d51705..51079ecafb73021c66c7e92d93fab723cf2bf05f:/app/views/layouts/site.html.erb?ds=sidebyside

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'
         %>
         <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
-        <li><%= link_to h(t('layouts.edit')) + '&nbsp;&#x25be;'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
+        <li><%= 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} %></li>
         <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %></li>
         <li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li>
-        <li><%= 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} %></li>
       </ul>
     </div>
 
@@ -51,14 +48,12 @@
         <% Editors::ALL_EDITORS.each do |editor| %>
           <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
         <% end %>
-        <% unless STATUS == :api_offline or STATUS == :database_offline %>
-            <li><%= link_to_function(t('browse.start_rjs.data_layer_name'), 'toggleData()') %></li>
-        <% end %>
+        <%= yield :editmenu %>
       </ul>
     </div>
 
     <script type="text/javascript">
-      createMenu("editanchor", "editmenu", 1000, "left");
+      createMenu("editanchor", "editmenu", "left");
     </script>
 
     <div id="left">
@@ -93,7 +88,7 @@
         <p><%= t 'layouts.osm_offline' %></p>
       </div>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-      <div id="sidebar-alert">
+      <div class="sidebar-alert">
         <p><%= t 'layouts.osm_read_only' %></p>
       </div>
       <% end %>
@@ -106,7 +101,6 @@
 
       <div id="left_menu" class="left_menu">
         <ul>
-          <%= yield :left_menu %>
           <li><%= t'layouts.help' %>
               <ul>
               <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
@@ -127,6 +121,8 @@
               }) %></li>
               </ul>
           </li>
+          <li><%= 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') } %></li>
+          <%= yield :left_menu %>
         </ul>
       </div>