Merge branch 'master' into norway

Conflicts:
	assets/stylesheets/custom.css.scss
	lib/views/general/_orglink.html.erb

9 files changed, 17 insertions, 32 deletions

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/logo.png b/assets/images/logo.png
index 8b88458..8b88458 100644
--- a/public/images/logo.png
+++ b/assets/images/logo.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.css.scss
index cdb65ff..b56ace6 100644
--- a/public/stylesheets/custom.css
+++ b/assets/stylesheets/custom.css.scss
@@ -87,7 +87,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;
 }
 
@@ -116,7 +116,7 @@ color:#781800;
 }
 
 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;
@@ -141,7 +141,7 @@ background-image: linear-gradient(top, #F07830, #781800);
 }
 
 div.frontpage-box {
-background:url(/images/stripes.png);
+background:image-url('stripes.png');
 border:1px solid #DEBEDD;
 font-family:'DeliciousRoman', Arial, sans-serif;
 color:#487890;
@@ -154,11 +154,11 @@ background-color: #A8D8F0;
 }
 
 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 {
@@ -274,11 +274,10 @@ color:#FDFDFD;
 color: #000;
 }
 body.front {
-
 }
 
 .request_listing span.desc {
-background:url(../images/quote-marks.png) no-repeat;
+background:image-url('quote-marks.png') no-repeat;
 }
 
 #frontpage_examples .excerpt {
@@ -320,4 +319,4 @@ text-align:left;
 }
 #authority_preview {
   background-color: #eee;
-}
\ No newline at end of file
+}
diff --git a/install.rb b/install.rb
index 4aee9f7..f7732d3 100644
--- a/install.rb
+++ b/install.rb
@@ -1,17 +1 @@
 # Install hook code here
-
-plugin_path = File.expand_path(File.join(File.dirname(__FILE__), "public"))
-main_app_path = Rails.root.join('public', 'alavetelitheme')
-
-# If the symlink to be created exists, warn the user and do nothing
-if File.exists?(main_app_path)
-	puts "WARNING: #{main_app_path} already exists, the symbolic link won't be created"
-else # Create symlink
-	begin
-		print "Creating symbolic link from #{main_app_path} to #{plugin_path}... "
-		File.symlink(plugin_path, main_app_path)
-		puts "done"
-	rescue NotImplementedError
-		puts "failed: symbolic links not supported"	
-	end
-end
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/logo.png b/logo.png
new file mode 100644
index 0000000..8b88458
--- /dev/null
+++ b/logo.png
diff --git a/uninstall.rb b/uninstall.rb
index 871647c..9738333 100644
--- a/uninstall.rb
+++ b/uninstall.rb
@@ -1,8 +1 @@
 # Uninstall hook code here
-
-main_app_path = Rails.root.join('public', 'alavetelitheme')
-if File.exists?(main_app_path) && File.symlink?(main_app_path)
-	print "Deleting symbolic link at #{main_app_path}... "
-	File.delete(main_app_path)
-	puts "done"
-end
\ No newline at end of file