Factor javascript include tag to layout

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 36d8734a13370c62d8c0bbf258215e2750bfda66..05e3d4391254d8630139352cee9640bca3fc869e 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,6 +1,5 @@
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index deae710db1baaed1bd61133f89629096cb5d6489..92ccb775de328247603a4a5ae23cf78184d2017f 100644 (file)
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index 98b6745e42dd180d8acb972125d2a3bd0c7d1ebc..6f1a3f0b74f11f53275a898786153f0b0ab689aa 100644 (file)
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 90c1f358d9af784a993d7afe1805d2867d054313..8ccd525a3d4c1fbfab599a5aa8bbfa235febc922 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,6 +1,5 @@
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 9d1cee107eda45587c36c232b1124c4797f202bd..1e3af0df29bd174556b9ac59c42919e4a3ac7388 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index c22df2f1e7adda7e4c81d2426400b362a2b4079a..5f419e6c7a17741b79457e8084ccf66261d43f76 100644 (file)
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index f6e8b7f0182d1121f8d48f5c200723f9d1e6cb30..e5493d3f982b23d0eb2907006169ff7fb31e87e5 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index 8bc50e307044cddee001f44812c0f37836060a49..7fe4feeb27cfe0e483fbff8dfcce76c452e731a2 100644 (file)
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>

-  <%= javascript_include_tag 'index' %>

 <% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 19707cd3f24f7998c0a35087b01695d100c4225f..965b66484b47127f54326a125515a5ed628a6dfa 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,5 +1,4 @@
 <% content_for :head do -%>
 <% content_for :head do -%>

-  <%= javascript_include_tag "index" %>

   <%= javascript_include_tag "changeset" %>
 
   <% unless params[:friends] or params[:nearby] -%>
   <%= javascript_include_tag "changeset" %>
 
   <% unless params[:friends] or params[:nearby] -%>

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index cedfdb9c2bf043daba9692564ecb9b9614db7602..09c7d0d8e90646335db7661a816fbe8cc06f5223 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -1,3 +1,7 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "index" %>
+<% end %>
+

 <% content_for :content do %>
   <div id="sidebar">
     <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
 <% content_for :content do %>
   <div id="sidebar">
     <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 0cabc0c2df3437e92c77d718945709c76dac6a8d..63afa3dd06bda662edcf0de9a788e6432bb7cb4a 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "index" %>
-<% end %>
-

 <% content_for :sidebar do %>
   <h2><%= t 'export.start_rjs.export' %></h2>
   <%= form_tag :controller => "export", :action => "finish" do %>
 <% content_for :sidebar do %>
   <h2><%= t 'export.start_rjs.export' %></h2>
   <%= form_tag :controller => "export", :action => "finish" do %>

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 204adb1fb0ad6f7196f7836bdfdb9ed16a7cee63..a98810172f8e95af89e112ce1396c8bd0378f4fc 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "index" %>
-<% end %>
-

 <% content_for :sidebar do %>
   <h2>
     <%= t 'layouts.intro_header' %>
 <% content_for :sidebar do %>
   <h2>
     <%= t 'layouts.intro_header' %>