Try and make asset tagging actually work.

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index 4e9482f3c3aa0dbfa699a6c7538c671063a84bdf..7ee1eeaede5f1d6991583bd7547ad7c685333986 100644 (file)
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -32,8 +32,8 @@
   <% zoom = '12' %>
 <% end %>
 
   <% zoom = '12' %>
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 4cd01dcc946cfd8b3a96a040ee36f51ba138cb35..5b1b8110818c75f17cb8f1aacb77fd7bfc605338 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -43,7 +43,7 @@
     <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
     for editing OpenStreetMap.
 </div>
     <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
     for editing OpenStreetMap.
 </div>

-<script type="text/javascript" src="/javascripts/swfobject.js"></script>
+<%= javascript_include_tag 'swfobject.js' %>

 <script type="text/javascript">
   var brokenContentSize = $("content").offsetWidth == 0;
   var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
 <script type="text/javascript">
   var brokenContentSize = $("content").offsetWidth == 0;
   var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index e88643588d36d0b7255814c07cfa9d4ab4f789c3..a83053c070249f81f4ad63db24a9c8ce99026075 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -72,8 +72,8 @@ by the OpenStreetMap project and it's contributors.
 <% end %>
 <% end %>
 
 <% end %>
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 
 <%= javascript_include_tag 'map.js' %>
 
 

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 851815506c00e6981c9bdab18c53e319176eb51f..c5312686adfa1f77204a0cd4ce088d797ca9cdd9 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -46,8 +46,8 @@
   <% zoom =  '12' %>
 <% end %>
 
   <% zoom =  '12' %>
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">

diff --git a/config/environment.rb b/config/environment.rb
index 0d98c70bdd409fa07346ef78c793c37584fdea79..2bc029767b0e0043017e1a00e3e5577df212477a 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,9 +7,6 @@ Process.setrlimit Process::RLIMIT_AS, 640*1024*1024, Process::RLIM_INFINITY
 # you don't control web/app server and can't set it the proper way
 ENV['RAILS_ENV'] ||= 'production'
 
 # you don't control web/app server and can't set it the proper way
 ENV['RAILS_ENV'] ||= 'production'
 

-# Don't add asset tags
-ENV["RAILS_ASSET_ID"] = ''
-

 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 


@@ -77,6 +74,24 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 

+# Hack the AssetTagHelper to make asset tagging work better
+module ActionView
+  module Helpers
+    module AssetTagHelper
+      private
+        alias :old_compute_public_path :compute_public_path
+
+        def compute_public_path(source, dir, ext)
+          path = old_compute_public_path(source, dir, ext)
+          if path =~ /(.+)\?(\d+)\??$/
+            path = "#{$1}/#{$2}"
+          end
+          path
+        end
+    end
+  end
+end
+

 # Set to :readonly to put the API in read-only mode or :offline to
 # take it completely offline
 API_STATUS = :online
 # Set to :readonly to put the API in read-only mode or :offline to
 # take it completely offline
 API_STATUS = :online

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 75647f2488bd406b2ff50090db48972b831546d2..5455e266d8b880f5251a225bc6fef3a29b5cf1bc 100644 (file)
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -7,6 +7,7 @@ server.modules = (
   "mod_cgi",
   "mod_compress",
   "mod_evasive",
   "mod_cgi",
   "mod_compress",
   "mod_evasive",

+  "mod_expire",

   "mod_fastcgi",
   "mod_redirect",
   "mod_status"
   "mod_fastcgi",
   "mod_redirect",
   "mod_status"


@@ -78,6 +79,16 @@ compress.filetype = (
   "text/plain"
 )
 
   "text/plain"
 )
 

+#
+# Set expiry for static content
+#
+expire.url = (
+  "/images/" => "access 10 years",
+  "/javascripts/" => "access 10 years",
+  "/openlayers/" => "access 10 years",
+  "/stylesheets/" => "access 10 years"
+)
+

 #
 # Cache compressed content
 #
 #
 # Cache compressed content
 #