Merge branch 'switch-to-asset-pipeline' into develop

7 files changed, 23 insertions, 14 deletions

diff --git a/public/images/logo.png b/assets/images/alaveteli-logo.png
index 8b88458..8b88458 100644
--- a/public/images/logo.png
+++ b/assets/images/alaveteli-logo.png
diff --git a/public/images/home-grad.png b/assets/images/home-grad.png
index ff9887a..ff9887a 100644
--- a/public/images/home-grad.png
+++ b/assets/images/home-grad.png
diff --git a/public/images/quote-marks.png b/assets/images/quote-marks.png
index 752b7d4..752b7d4 100644
--- a/public/images/quote-marks.png
+++ b/assets/images/quote-marks.png
diff --git a/public/stylesheets/custom.css b/assets/stylesheets/custom.scss
index ec8bdda..6ca983e 100644
--- a/public/stylesheets/custom.css
+++ b/assets/stylesheets/custom.scss
@@ -7,7 +7,7 @@ font-family:Arial, sans-serif;
 background-repeat:no-repeat;
 background-position:center top;
 background-color:#F0F0F0;
-background:url(/images/stripes.png);
+background:image-url('stripes.png');
 }
 
 #topnav {
@@ -82,7 +82,7 @@ font-weight:400;
 }
 
 .request_listing span.desc {
-background:url(/images/quote-marks.png) no-repeat;
+background:image-url('quote-marks.png') no-repeat;
 color:#444;
 }
 
@@ -104,14 +104,14 @@ color:#93278F;
 
 #stepwise_make_request {
 background-color:#d0d0d0;
-background:url(/images/stripes.png);
+background:image-url('stripes.png');
 border:1px solid #DEBEDD;
 font-family:'DeliciousRoman', Arial, sans-serif;
 color:#6B3C6A;
 }
 
 div.comment_in_request {
-background:url(/images/stripes-70-light2.png);
+background:image-url('stripes-70-light2.png');
 border-color:#5F5F5F;
 border-style:dotted;
 border-width:1px;
@@ -131,7 +131,7 @@ font-family:'DeliciousRoman', Arial, sans-serif;
 }
 
 div.frontpage-box {
-background:url(/images/stripes.png);
+background:image-url('stripes.png');
 border:1px solid #DEBEDD;
 font-family:'DeliciousRoman', Arial, sans-serif;
 color:#6B3C6A;
@@ -139,15 +139,15 @@ color:#6B3C6A;
 
 
 div.correspondence,div.comment_in_request {
-background:url(/images/stripes-70.png);
+background:image-url('stripes-70.png');
 }
 
 div.outgoing.correspondence {
-background:url(/images/stripes-70-light.png);
+background:image-url('stripes-70-light.png');
 }
 
 #frontpage_splash {
-background:url(/images/flying-computer.png) no-repeat 175px bottom;
+background:image-url('flying-computer.png') no-repeat 175px bottom;
 }
 
 #frontpage_splash h1 {
@@ -262,13 +262,13 @@ color:#93278F;
 
 
 body.front {
-background:url(../images/home-grad.png) repeat-x 0 160px;
+background:image-url('home-grad.png') repeat-x 0 160px;
 }
 
 .request_listing span.desc {
-background:url(../images/quote-marks.png) no-repeat;
+background:image-url('quote-marks.png') no-repeat;
 }
 
 #frontpage_examples .excerpt {
-background:url(../images/quote-marks.png) no-repeat;
-}
\ No newline at end of file
+background:image-url('quote-marks.png') no-repeat;
+}
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb
index 2930ba6..8476e90 100644
--- a/lib/alavetelitheme.rb
+++ b/lib/alavetelitheme.rb
@@ -32,6 +32,15 @@ end
 # something unique (e.g. yourtheme-custom-routes.rb":
 $alaveteli_route_extensions << 'custom-routes.rb'
 
+# Prepend the asset directories in this theme to the asset path:
+['stylesheets', 'images', 'javascripts'].each do |asset_type|
+    theme_asset_path = File.join(File.dirname(__FILE__),
+                                 '..',
+                                 'assets',
+                                 asset_type)
+    Rails.application.config.assets.paths.unshift theme_asset_path
+end
+
 # Tell FastGettext about the theme's translations: look in the theme's
 # locale-theme directory for a translation in the first place, and if
 # it isn't found, look in the Alaveteli locale directory next:
diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
index 1644299..9f8f339 100644
--- a/lib/views/general/_before_head_end.html.erb
+++ b/lib/views/general/_before_head_end.html.erb
@@ -1 +1 @@
-<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %>
+<%= stylesheet_link_tag "application" %>
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
index 9535a79..6a83ffb 100644
--- a/lib/views/general/_orglink.html.erb
+++ b/lib/views/general/_orglink.html.erb
@@ -1 +1 @@
-<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %>
+<%= link_to image_tag('alaveteli-logo.png'), frontpage_url, :id=>'logo' %>