X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4e78648d4694dcd1d64467e03b735b003b0feeac..8ec415b060c4321fad3fa42f3038148aa94c9b90:/app/views/layouts/_head.html.erb diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 2dda3d799..993544bae 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,8 +1,6 @@ - <%= javascript_strings %> - <%= javascript_include_tag "site" %> - <%= javascript_include_tag "menu" %> + <%= javascript_include_tag "application" %> <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %> <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %> @@ -13,8 +11,16 @@ <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") }) %> <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> + <% if flash[:piwik_goal] -%> + <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %> + <% end -%> <%= style_rules %> <%= yield :head %> <%= csrf_meta_tag %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> + + <%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %>