X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5d07b6d76c9488334608d3db57c5bc79bb6d177d..a62141ce7f745fa67b5f04f216f5b47f78c10e78:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 59b7c304b..ed8a6cf18 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,130 +1,121 @@
-
-
-
- <%= 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" }) %>
- <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
- <%= yield :head %>
-
- <% if @notice || flash[:notice] %>
-
<%= @notice || flash[:notice] %>
- <% end %>
-
- <%= yield %>
-
-
-
-
-
- <%= t 'layouts.project_name.h1' %>
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
- <%= t('layouts.tag_line') %>
-
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ root_path) %>
+ <%= t 'layouts.project_name.h1' %>
+ <%= t('layouts.tag_line') %>
-
+ <%= yield :optionals %>
<% unless @user %>
-
-
- <%= t 'layouts.intro_1' %>
-
-
- <%= t 'layouts.intro_2' %>
-
+
<% end %>
-
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
-
- <%= t 'layouts.osm_offline' %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
+
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
-
- <%= t 'layouts.osm_read_only' %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
+
<% end %>
-
- <% if false %>
-
+
+ <% if @user and @user.id %>
+ <%= render :partial => "layouts/user_menu" %>
+ <% else %>
+
+ - <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
+ - <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
+
+ <% end %>
+
+ -
+ <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+
-
+ <%= render :partial => 'layouts/edit_menu',
+ :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+
-
+ <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+
+
+
+
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
<% end %>
-
-
+ <% if defined?(PIWIK) -%>
+
+ <% end -%>