X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/22c7d4c3f9a298b0834db7e8b4764c545de2c0bb..6cb69b5e4be820b3f30d0f9eef9bbeb39fab5231:/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 522330d3b..95289376e 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,34 +1,13 @@ - - - <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'site' %> - <%= javascript_include_tag 'menu' %> - - <%= stylesheet_link_tag 'common' %> - - <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %> - <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %> - <%= stylesheet_link_tag 'print', :media => "print" %> - <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> - <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> - <%= style_rules %> - <%= yield :head %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> - + <%= 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' %>

- <% if flash[:error] %> -

<%= flash[:error] %>

- <% end %> - <% if flash[:warning] %> -

<%= flash[:warning] %>

- <% end %> - <% if flash[:notice] %> -

<%= flash[:notice] %>

- <% end %> + <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= yield %>

@@ -62,7 +41,7 @@ diaryclass = 'active' if params['controller'] == 'diary_entry' %>

<%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>

<%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>

<%= link_to t('layouts.edit') + ' ▾', {: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} %>

<% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>

<%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>

@@ -131,16 +110,19 @@

<%= t 'layouts.help_and_wiki', - :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')), - :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title')) - %>
<%= 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')) %>
<%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
<%= t 'layouts.community_blogs' %>
<%= t 'layouts.foundation' %>

+ <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %> +

+ <%= yield :optionals %>