X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0884e7b43192bf924f505d12e3d9810e61da7ac9..02de53eb45f31242bed45537aab2598d8f7dffae:/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 4c12bfe14..7f55fb38b 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,17 +1,15 @@
-
+
<%= render :partial => "layouts/head" %>
-
+
<%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
<%= t 'layouts.project_name.h1' %>
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
-
<%= yield %>
-
<% if @user and @user.id %>
@@ -26,129 +24,156 @@
<% end %>
- <%
- viewclass = 'geolink llz layers'
- 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'
- 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 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} %>
+ - <%= link_to t('layouts.view'), {
+ :controller => 'site',
+ :action => 'index'
+ }, {
+ :id => 'viewanchor',
+ :title => t('layouts.view_tooltip'),
+ :class => 'geolink llz layers'
+ } %>
+ - <%= link_to h(t('layouts.edit')) + content_tag(:span, "â¾", :class => "menuicon"), {
+ :controller => 'site',
+ :action => 'edit'
+ }, {
+ :id => 'editanchor',
+ :title => t('javascripts.site.edit_tooltip'),
+ :data => { :minzoom => 13 },
+ :class => 'geolink llz object disabled'
+ } %>
+ - <%= link_to t('layouts.history'), {
+ :controller => 'changeset',
+ :action => 'list'
+ }, {
+ :id => 'historyanchor',
+ :data => { :minzoom => 11 },
+ :title => t('javascripts.site.history_tooltip'),
+ :class => 'geolink bbox'
+ } %>
+ - <%= link_to t('layouts.export'), {
+ :controller => 'site',
+ :action => 'export'
+ }, {
+ :id => 'exportanchor',
+ :title => t('layouts.export_tooltip'),
+ :class => 'geolink llz layers'
+ } %>
-
-
-
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ :controller => 'site',
+ :action => 'index') %>
<%= t 'layouts.project_name.h1' %>
<%= t('layouts.tag_line') %>
-
<%= yield :optionals %>
-
<% unless @user %>
-