X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/79d096499cc5f85d36bf40db37b95d3acd45d7b8..a6089e5355e383513b8be98ba9466f5024a32069:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 5f0e848ac..0d1c24df2 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,101 +1,109 @@ + - <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> - <%= javascript_include_tag 'site.js' %> - - - OpenStreetMap + <%= javascript_include_tag 'prototype' %> + <%= javascript_include_tag 'site' %> + + <%= stylesheet_link_tag 'site' %> + <%= stylesheet_link_tag 'print', :media => "print" %> + <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> + OpenStreetMap<%= ' | '+@title if @title %> -
-<% if @flash[:notice] %> -
<%= @flash[:notice] %>
-<% end %> - - <%= @content_for_layout %> + <% if flash[:notice] %> +
<%= flash[:notice] %>
+ <% end %> -
+ <%= yield %> + - - <% if @user %> - Welcome, <%= @user.email %> | - <%= link_to 'Logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%> - <% else %> - <%= link_to 'Login', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> | - <%= link_to 'Sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> - <% end %> - - -
- -
- -
- - + +