X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d31fc7c2f5c0f43b9e65479e3f1690bdd0c2fb4a..f74c984a49695df755ed853bc42f1da0fca363e6:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 548dc35fb..8239c8c2d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,12 +1,12 @@ <%= render :partial => "layouts/head" %> - -

- <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %> -

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

-

-

+ +

+ <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %> + <%= t 'layouts.project_name.h1' %> +

+

<%= link_to(image_tag("osm_logo.png", :size => "120x120", @@ -39,13 +39,6 @@

<% end %>

-
<%= t'layouts.help' %>
-
- <%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
- <%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %>
-
<%= t'layouts.community' %>
-
-
- <%= ad = [{:image => 'sotm-birmingham-ad.png', - :title => 'State of the Map Birmingham', - :href =>'http://stateofthemap.org/'}, - {:image => 'donate-ad.png', - :title => 'Server Donation Drive', - :href =>'http://donate.openstreetmap.org/'}].sample - - link_to ad[:href], :title => ad[:title] do - image_tag ad[:image], :class => :ad - end - %> -
-
<%= h(t('layouts.make_a_donation.text')) %> @@ -99,53 +77,33 @@

<%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
<%= yield :greeting %>
<%= render :partial => "layouts/inbox" %>
<%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_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')} %>

<%= 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"), edit_path, { - :id => 'editanchor', - :title => t('javascripts.site.edit_tooltip'), - :data => { :minzoom => 13, :editor => preferred_editor }, - :class => 'geolink llz object disabled' - } %>
<%= 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.edit_with', - :editor => t("editor.#{editor}.description")), - edit_path(:editor => editor), { - :data => { :editor => editor }, - :class => "geolink llz object" - } %>

+ <% if @user and @user.id %> +

<%= link_to t('layouts.help'), help_path %>

+ <%= render :partial => "layouts/user_menu" %> + <% else %> +

<%= link_to t('layouts.help'), help_path %>
<%= 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 %> - <%= yield :editmenu %> -

<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <% if content_for? :heading %> @@ -157,8 +115,8 @@ <%= yield %>

- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - + <% if defined?(PIWIK) -%> + <% end -%>