Layout cleanup

[rails.git] / app / views / layouts / _head.html.erb

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 0461c93e5335a0c4f89aedb6c6edb3b0c766977f..84f566e81b8280a92ef53d975abe1fe04726d456 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -5,13 +5,11 @@
   <%= 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 "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" %>
-  <%= stylesheet_link_tag "leaflet.draw" %>
+  <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>

   <!--[if IE]>
     <%= stylesheet_link_tag "leaflet.ie" %>
   <!--[if IE]>
     <%= stylesheet_link_tag "leaflet.ie" %>

-    <%= stylesheet_link_tag "leaflet.draw.ie" %>

     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>

-  <![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <![endif]-->

   <%= 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" }) %>
   <%= 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" }) %>


@@ -27,16 +25,19 @@
     I18n.defaultLocale = "<%= I18n.default_locale %>";
     I18n.locale = "<%= I18n.locale %>";
     I18n.fallbacks = true;
     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 %>;
     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 %>;
     OSM.location = <%= session[:location].to_json.html_safe %>;

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

     OSM.preferred_editor = <%= preferred_editor.to_json.html_safe %>;
     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 -%>

   </script>
   <title><%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %></title>
 </head>
   </script>
   <title><%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %></title>
 </head>