aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Longair <mhl@pobox.com>2013-11-19 18:24:17 +0000
committerMark Longair <mhl@pobox.com>2013-11-26 10:16:44 +0000
commit1ab142a8c456af25959ec3479bec8d5d12fa0ceb (patch)
tree3d0bc4e0fcf8803896f75412f6d3998d7a949bb3
parent2934c425ab120b2205fe4de4f8e80505eba293a0 (diff)
Fix asset inclusion where THEME_URLS is empty
-rw-r--r--app/views/general/_stylesheet_includes.html.erb2
-rw-r--r--config/application.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb
index 8f375d777..390b5b10d 100644
--- a/app/views/general/_stylesheet_includes.html.erb
+++ b/app/views/general/_stylesheet_includes.html.erb
@@ -18,6 +18,6 @@
<%= stylesheet_link_tag 'ie7.css' %>
<![endif]-->
<% if AlaveteliConfiguration::force_registration_on_new_request %>
- <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %>
+ <%= stylesheet_link_tag 'jquery.fancybox-1.3.4.pack.js', :rel => "stylesheet" %>
<% end %>
<% end %>
diff --git a/config/application.rb b/config/application.rb
index 426db2318..10b1fc5c5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -93,6 +93,7 @@ module Alaveteli
'jquery.Jcrop.css',
'excanvas.min.js',
'fonts.css',
+ 'print.css',
'main.css',
'admin.css',
'ie6.css',