X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43243e4c920bf472eb2c95ccdd6926dfbe2b7d4e..d2a43c7e4a5b0129a337e1c0eaa55a116d306669:/app/views/layouts/_head.html.erb diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index c85594189..84f566e81 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -2,10 +2,14 @@ <%= javascript_include_tag "application" %> - <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %> - <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %> - <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %> - + <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %> + <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %> + <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> + <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %> + <%= favicon_link_tag "favicon.ico" %> <%= favicon_link_tag "osm_logo.png", :rel => "apple-touch-icon", :type => "image/png" %> <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> @@ -21,16 +25,19 @@ I18n.defaultLocale = "<%= I18n.default_locale %>"; I18n.locale = "<%= I18n.locale %>"; I18n.fallbacks = true; - - <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> + <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? -%> OSM.home = <%= { :lat => @user.home_lat, :lon => @user.home_lon }.to_json.html_safe %>; - <% end %> - - <% if session[:location] %> + <% end -%> + <% if session[:location] -%> OSM.location = <%= session[:location].to_json.html_safe %>; - <% end %> - + <% end -%> OSM.preferred_editor = <%= preferred_editor.to_json.html_safe %>; + <% if @oauth -%> + OSM.oauth_token = "<%= @oauth.token %>"; + OSM.oauth_token_secret = "<%= @oauth.secret %>"; + OSM.oauth_consumer_key = "<%= @oauth.client_application.key %>"; + OSM.oauth_consumer_secret = "<%= @oauth.client_application.secret %>"; + <% end -%> <%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %>