X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6ebc3f5c183f021db1d05b03ecb1c728bb8ed73..d3b42fef34849eafb281512fc8794d8bfb138719:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 75bac67ab..3c84dc47f 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,101 +1,103 @@ + - <%= 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' %> + <%= 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 %> - - <% if @user %> - Welcome, <%= @user.display_name %> | - <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%> - <% else %> - <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> | - <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> - <% end %> - - -
- -
- -
- - - <% unless @user %> -
- OpenStreetMap is a free editable map of the whole world. It is made by people like you. -

- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth. -

- OpenStreetMap's hosting is kindly supported by the UCL VR Centre and bytemark. -

- <% end %> - -
- Help & Wiki
- News blog
- Shop
-
- + + <% if @user and @user.id %> + Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %> + <%= yield :greeting %> + <%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | + <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> + <% else %> + <%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> | + <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> + <% end %> + + +
+
    + <% + viewclass = '' + editclass = '' + traceclass = '' + viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' + editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' + editclass = 'active' if params['controller'] == 'campaign' + traceclass = 'active' if params['controller'] == 'trace' + %> +
  • <%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass } %>
    • +
  • <%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass } %>
    • +
  • <%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %>
    • +
+
+
-
+ -
+ <% unless @user %> +
+ OpenStreetMap is a free editable map of the whole world. It is made by people like you. +

+ OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth. +

+ OpenStreetMap's hosting is kindly supported by the UCL VR Centre and bytemark. +

+ <% end %> - - - + +
+ +