X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7d304d20f171030d8a8c5f523c9039a02f832f2..bdee581d440ba0d88e7e07355ffa3175ea9691d3:/app/views/layouts/site.html.erb?ds=inline
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 9fdee1eec..95289376e 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,32 +1,13 @@
-
-
- <%= javascript_strings %>
- <%= javascript_include_tag 'prototype' %>
- <%= javascript_include_tag 'site' %>
-
- <%= stylesheet_link_tag 'common' %>
-
- <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %>
- <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %>
- <%= 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 %>
- <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %>
-
+ <%= render :partial => "layouts/head" %>
+
+ <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
+
<%= t 'layouts.project_name.h1' %>
+
- <% if flash[:error] %>
-
<%= flash[:error] %>
- <% end %>
- <% if flash[:warning] %>
-
<%= flash[:warning] %>
- <% end %>
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
- <% end %>
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<%= yield %>
@@ -36,12 +17,7 @@
<%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %>
<%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> |
<%= yield :greeting %>
- <%
- inbox_attributes = {}
- inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
- inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
- %>
- <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |
+ <%= render :partial => "layouts/inbox" %> |
<%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%>
<% else %>
<%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
@@ -65,18 +41,30 @@
diaryclass = 'active' if params['controller'] == 'diary_entry'
%>
<%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
- <%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
+ <%= link_to t('layouts.edit') + ' ▾', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
<%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
<% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
<%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
<% else %>
<%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
<% end %>
- <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
+ <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
<%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %>
+
+
+
+
@@ -104,11 +92,11 @@
<% end %>
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
<%= t 'layouts.osm_offline' %>
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
<%= t 'layouts.osm_read_only' %>
@@ -121,10 +109,18 @@
<% end %>
+
+
+ <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
<%= yield :optionals %>
@@ -133,18 +129,6 @@
-
-
- <%= link_to(
- image_tag("cc_button.png",
- :alt => t('layouts.license.alt'),
- :border => 0,
- :width => 88,
- :height => 31,
- :title => t('layouts.license.title')),
- "http://creativecommons.org/licenses/by-sa/2.0/",
- { :rel => "license" }) %>
-