X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c45dbdae360cfbcbdc998b45e172cc30915add84..d6a8aaa3690a86820ecc6198f1d5455d8f6cbbe5:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 67994bc06..e5c7e1bdd 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,4 +1,4 @@ - + <%= render :partial => "layouts/head" %> @@ -37,7 +37,7 @@ exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export' %>
  • <%= 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} %>
    • @@ -66,7 +66,7 @@ <%= yield :optionals %> <% unless @user %> -
    +

    <%= t 'layouts.intro_1' %>

    @@ -101,8 +101,6 @@
      - <%= yield :left_menu %> -
    • <%= 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') } %>
    • <%= t'layouts.help' %>
      • <%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
        • @@ -123,14 +121,20 @@ }) %>
      • +
    • <%= 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') } %>
      • + <%= yield :left_menu %>
    +
    + <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2012'), :title => t('layouts.sotm2012'), :border => "0"), "http://stateofthemap.org/register-now/" %> +
    +
    -

    <%= t 'layouts.partners_html', +

    <%= t 'layouts.partners_html', :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), @@ -139,15 +143,6 @@

    - - <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> <%= render :partial => "layouts/piwik" %> <% end -%>