X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..7499fbc6e43897d30e088f14391c1203777cf929:/app/views/layouts/site.html.erb?ds=sidebyside
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 779ff6cb3..ed8c1456b 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,11 +1,14 @@
-
+
+
<%= javascript_include_tag 'prototype' %>
<%= javascript_include_tag 'site' %>
- <%= stylesheet_link_tag 'site' %>
- <%= stylesheet_link_tag 'print', :media => "print" %>
+
+ <%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %>
+ <%= stylesheet_link_tag 'site', :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 %>
@@ -47,14 +50,14 @@
traceclass = ''
viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index'
editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit'
- historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox'
+ historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list'
exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export'
traceclass = 'active' if params['controller'] == 'trace'
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('layouts.edit_tooltip'), :class => editclass} %>
- <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %>
+ <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('layouts.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 %>
@@ -81,7 +84,7 @@
<%= t 'layouts.intro_1' %>
- <%= t 'layouts.intro_2' %>.
+ <%= t 'layouts.intro_2' %>
<%= t 'layouts.intro_3',
@@ -93,11 +96,12 @@
<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
- <%= t 'layouts.offline' %>
+ <%= t 'layouts.osm_offline' %>
<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
- <%= t 'layouts.read_only' %>
+ <%= t 'layouts.osm_read_only' %>
+
<% end %>
<% if false %>
@@ -113,10 +117,6 @@
<%= yield :left_menu %>
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/register" %>
-
-
<%= yield :optionals %>