X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02de53eb45f31242bed45537aab2598d8f7dffae..b1308a87be1aaa0c6e5fd27e0635ef22b76e8081:/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 7f55fb38b..1d23aba0d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,91 +1,17 @@ - + <%= 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", :alt => t('layouts.logo.alt_text')), root_path) %>

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

-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - <%= yield %> -
-
- - <% 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} %> | - <%= 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')}%> - <% 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')} %> - <% end %> - - -
- - -
+
@@ -97,10 +23,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) %>

@@ -119,50 +43,36 @@

<%= raw t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %>

<% end %> -
-
-
- <%= link_to image_tag("sotm.png", - :alt => t('layouts.sotm2012'), - :title => t('layouts.sotm2012'), - :border => "0"), "http://stateofthemap.org/register-now/" %> -
- + } %> + + <%= yield :left_menu %> + + +
+ + +
+ + +
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
+ <%= yield :heading %> +
+ <% end %> +
+ <%= yield %> +
+
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> <% end -%>