From: Tom Hughes Date: Thu, 6 Sep 2012 20:49:02 +0000 (+0100) Subject: Use named routes in the layout X-Git-Tag: live~5361 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/800dbbf41b65d0976af94d3b9ef5e0227e1f4285?ds=sidebyside Use named routes in the layout --- diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 7f55fb38b..abc266775 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -3,7 +3,7 @@ <%= 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') %> + <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), root_path) %>

<%= t 'layouts.project_name.h1' %>

@@ -13,47 +13,35 @@
<% if @user and @user.id %> - <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %> - <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> | + <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %> + <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | <%= yield :greeting %> <%= render :partial => "layouts/inbox" %> | - <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> + <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> <% else %> - <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> | - <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> + <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> | + <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> <% end %>
    -
  • <%= link_to t('layouts.view'), { - :controller => 'site', - :action => 'index' - }, { +
  • <%= link_to t('layouts.view'), root_path, { :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' - }, { +
  • <%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, { :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' - }, { +
  • <%= link_to t('layouts.history'), browse_changesets_path, { :id => 'historyanchor', :data => { :minzoom => 11 }, :title => t('javascripts.site.history_tooltip'), :class => 'geolink bbox' } %>
    • -
  • <%= link_to t('layouts.export'), { - :controller => 'site', - :action => 'export' - }, { +
  • <%= link_to t('layouts.export'), export_path, { :id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => 'geolink llz layers' @@ -64,11 +52,8 @@
      <% Editors::ALL_EDITORS.each do |editor| %>
    • <%= link_to t('layouts.edit_with', - :editor => t("editor.#{editor}.description")), { - :controller => 'site', - :action => 'edit', - :editor => editor - }, { + :editor => t("editor.#{editor}.description")), + edit_path(:editor => editor), { :id => editor + 'anchor', :class => "geolink llz object" } %>
      • @@ -84,8 +69,7 @@ <%= link_to(image_tag("osm_logo.png", :size => "120x120", :alt => t('layouts.logo.alt_text')), - :controller => 'site', - :action => 'index') %>
      + root_path) %>

      <%= t 'layouts.project_name.h1' %>

      <%= t('layouts.tag_line') %>

@@ -97,10 +81,8 @@ <%= t 'layouts.intro_2_html', :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"), :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')), - :license => link_to(t('layouts.intro_2_license'), - url_for({:controller => 'site', :action => 'copyright'})), - :create_account => link_to(t('layouts.intro_2_create_account'), - url_for({:controller => 'user', :action => 'new'})) + :license => link_to(t('layouts.intro_2_license'), copyright_path), + :create_account => link_to(t('layouts.intro_2_create_account'), user_new_path) %>

@@ -125,29 +107,19 @@
  • <%= t'layouts.community' %>
    • -
  • <%= link_to t('layouts.gps_traces'), { - :controller => 'trace', - :action => 'list', - :display_name => nil, - :tag => nil, - :page => nil - }, { +
  • <%= link_to t('layouts.gps_traces'), traces_path, { :id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') } %>