27 files changed, 30 insertions, 10 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 000000000..f92f0562a
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1,6 @@
+// ...
+//= require jquery
+//= require jquery-ui.min
+//= require jquery.cookie
+//= require general
+//= require ba-throttle-debounce
diff --git a/public/javascripts/ba-throttle-debounce.js b/app/assets/javascripts/ba-throttle-debounce.js
index 07205508e..07205508e 100644
--- a/public/javascripts/ba-throttle-debounce.js
+++ b/app/assets/javascripts/ba-throttle-debounce.js
diff --git a/public/javascripts/bootstrap-collapse.js b/app/assets/javascripts/bootstrap-collapse.js
index 9a364468b..9a364468b 100644
--- a/public/javascripts/bootstrap-collapse.js
+++ b/app/assets/javascripts/bootstrap-collapse.js
diff --git a/public/javascripts/bootstrap-tab.js b/app/assets/javascripts/bootstrap-tab.js
index 26c9ece75..26c9ece75 100644
--- a/public/javascripts/bootstrap-tab.js
+++ b/app/assets/javascripts/bootstrap-tab.js
diff --git a/public/javascripts/excanvas.min.js b/app/assets/javascripts/excanvas.min.js
index fcf876c74..fcf876c74 100644
--- a/public/javascripts/excanvas.min.js
+++ b/app/assets/javascripts/excanvas.min.js
diff --git a/public/javascripts/general.js b/app/assets/javascripts/general.js
index b52131b83..b52131b83 100644
--- a/public/javascripts/general.js
+++ b/app/assets/javascripts/general.js
diff --git a/public/javascripts/jquery-ui.min.js b/app/assets/javascripts/jquery-ui.min.js
index fb641f675..fb641f675 100644
--- a/public/javascripts/jquery-ui.min.js
+++ b/app/assets/javascripts/jquery-ui.min.js
diff --git a/public/javascripts/jquery.Jcrop.js b/app/assets/javascripts/jquery.Jcrop.js
index 9002b9787..9002b9787 100644
--- a/public/javascripts/jquery.Jcrop.js
+++ b/app/assets/javascripts/jquery.Jcrop.js
diff --git a/public/javascripts/jquery.cookie.js b/app/assets/javascripts/jquery.cookie.js
index 6a3e394b4..6a3e394b4 100644
--- a/public/javascripts/jquery.cookie.js
+++ b/app/assets/javascripts/jquery.cookie.js
diff --git a/public/javascripts/jquery.fancybox-1.3.4.pack.js b/app/assets/javascripts/jquery.fancybox-1.3.4.pack.js
index 1373ed083..1373ed083 100755
--- a/public/javascripts/jquery.fancybox-1.3.4.pack.js
+++ b/app/assets/javascripts/jquery.fancybox-1.3.4.pack.js
diff --git a/public/javascripts/jquery.flot.axislabels.js b/app/assets/javascripts/jquery.flot.axislabels.js
index c6f77aad4..c6f77aad4 100644
--- a/public/javascripts/jquery.flot.axislabels.js
+++ b/app/assets/javascripts/jquery.flot.axislabels.js
diff --git a/public/javascripts/jquery.flot.errorbars.min.js b/app/assets/javascripts/jquery.flot.errorbars.min.js
index 84a514b07..84a514b07 100644
--- a/public/javascripts/jquery.flot.errorbars.min.js
+++ b/app/assets/javascripts/jquery.flot.errorbars.min.js
diff --git a/public/javascripts/jquery.flot.min.js b/app/assets/javascripts/jquery.flot.min.js
index b82faa18f..b82faa18f 100644
--- a/public/javascripts/jquery.flot.min.js
+++ b/app/assets/javascripts/jquery.flot.min.js
diff --git a/public/javascripts/jquery.form.js b/app/assets/javascripts/jquery.form.js
index bc0061418..bc0061418 100644
--- a/public/javascripts/jquery.form.js
+++ b/app/assets/javascripts/jquery.form.js
diff --git a/public/javascripts/jquery.js b/app/assets/javascripts/jquery.js
index 16ad06c5a..16ad06c5a 100644
--- a/public/javascripts/jquery.js
+++ b/app/assets/javascripts/jquery.js
diff --git a/public/javascripts/jquery_ujs.js b/app/assets/javascripts/jquery_ujs.js
index 50121d6ed..50121d6ed 100644
--- a/public/javascripts/jquery_ujs.js
+++ b/app/assets/javascripts/jquery_ujs.js
diff --git a/app/assets/javascripts/profile-photos.js b/app/assets/javascripts/profile-photos.js
new file mode 100644
index 000000000..c7ebe894d
--- /dev/null
+++ b/app/assets/javascripts/profile-photos.js
@@ -0,0 +1,3 @@
+// ...
+//= require jquery.Jcrop
+//= require profile_photo
diff --git a/public/javascripts/profile_photo.js b/app/assets/javascripts/profile_photo.js
index 6d637b439..6d637b439 100644
--- a/public/javascripts/profile_photo.js
+++ b/app/assets/javascripts/profile_photo.js
diff --git a/public/javascripts/stats-graphs.js b/app/assets/javascripts/stats-graphs.js
index ff3d3a11a..ff3d3a11a 100644
--- a/public/javascripts/stats-graphs.js
+++ b/app/assets/javascripts/stats-graphs.js
diff --git a/app/assets/javascripts/stats.js b/app/assets/javascripts/stats.js
new file mode 100644
index 000000000..8c743ad87
--- /dev/null
+++ b/app/assets/javascripts/stats.js
@@ -0,0 +1,6 @@
+// ...
+//= require jquery.flot.min
+//= require jquery.flot.errorbars.min
+//= require jquery.flot.tickrotor.min
+//= require jquery.flot.axislabels
+//= require stats-graphs
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 5895becf7..750856c3f 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -17,10 +17,9 @@
           <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %>
         <% end %>
 
-        <%= javascript_include_tag 'jquery.js', 'jquery-ui.min','jquery.cookie.js', 'general.js' %>
+        <%= javascript_include_tag "application" %>
         <% if @profile_photo_javascript %>
-            <script type="text/javascript" src="/javascripts/jquery.Jcrop.js"></script>
-            <script type="text/javascript" src="/javascripts/profile_photo.js"></script>
+            <%= javascript_include_tag "profile-photos" %>
             <link rel="stylesheet" href="/stylesheets/jquery.Jcrop.css" type="text/css" >
         <% end %>
 
diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb
index d7918cffc..090ee409b 100644
--- a/app/views/layouts/no_chrome.html.erb
+++ b/app/views/layouts/no_chrome.html.erb
@@ -10,7 +10,7 @@
         <% end %>
         </title>
 
-        <script type="text/javascript" src="/javascripts/jquery.js"></script>
+        <%= javascript_include_tag "application" %>
 
         <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %>
         <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %>
diff --git a/app/views/public_body/statistics.html.erb b/app/views/public_body/statistics.html.erb
index 6ea253260..223511065 100644
--- a/app/views/public_body/statistics.html.erb
+++ b/app/views/public_body/statistics.html.erb
@@ -69,7 +69,7 @@ are due to him.") %></p>
 <script type="text/javascript">
   var graphs_data = <%= @graph_list.to_json.html_safe %>;
 </script>
-<!--[if lte IE 8]><%= javascript_include_tag 'excanvas.min.js' %><![endif]-->
-<%= javascript_include_tag 'jquery.flot.min.js', 'jquery.flot.errorbars.min.js', 'jquery.flot.tickrotor.min.js', 'jquery.flot.axislabels.min.js', 'stats-graphs.js' %>
+<!--[if lte IE 8]><%= javascript_include_tag "excanvas.min" %><![endif]-->
+<%= javascript_include_tag "stats" %>
 
 </div>
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index f8b97ffe3..849a94216 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -1,4 +1,3 @@
-<script type="text/javascript" src="/javascripts/ba-throttle-debounce.js"></script>
 <script type="text/javascript">
     $(document).ready(function(){
         // Avoid triggering too often (on each keystroke) by using the debounce jQuery plugin:
diff --git a/app/views/request/select_authority.html.erb b/app/views/request/select_authority.html.erb
index 75c51fc57..4f117ee75 100644
--- a/app/views/request/select_authority.html.erb
+++ b/app/views/request/select_authority.html.erb
@@ -1,4 +1,3 @@
-<script type="text/javascript" src="/javascripts/ba-throttle-debounce.js"></script>
 <script type="text/javascript">
     $(document).ready(function(){
         $("#authority_preview").hide();
diff --git a/config/application.rb b/config/application.rb
index 422976215..a83759630 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -81,5 +81,15 @@ module Alaveteli
     # Change the path that assets are served from
     # config.assets.prefix = "/assets"
 
+    # These additional precompiled Javascript files are actually
+    # manifests that require the real javascript files:
+    config.assets.precompile += ['admin.js',
+                                 'profile-photos.js',
+                                 'stats.js']
+    # ... while these are individual files that can't easily be
+    # grouped:
+    config.assets.precompile += ['jquery.fancybox-1.3.4.pack.js',
+                                 'excanvas.min.js']
+
   end
 end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
deleted file mode 100644
index fe4577696..000000000
--- a/public/javascripts/application.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place your application-specific JavaScript functions and classes here
-// This file is automatically included by javascript_include_tag :defaults