X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/222d31e435f003ec59e84860d2fa5129449f69de..79d3ee46545f1a5b60d40bfe8a803974a97d0a09:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 95c273e40..91fcea0ea 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,101 +1,130 @@ + - <%= 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<%= ' | '+ h(@title) if @title %> -
-<% if @flash[:notice] %> -
<%= @flash[:notice] %>
-<% end %> - - <%= @content_for_layout %> + <% if @notice || flash[:notice] %> +
<%= @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 %> - - -
- -
- -
- - + +