aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/alavetelitheme.rb14
-rw-r--r--lib/config/custom-routes.rb4
-rw-r--r--lib/views/general/_orglink.html.erb1
3 files changed, 16 insertions, 3 deletions
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb
index 0658142..c472d34 100644
--- a/lib/alavetelitheme.rb
+++ b/lib/alavetelitheme.rb
@@ -45,6 +45,20 @@ $alaveteli_route_extensions << 'custom-routes.rb'
Rails.application.config.assets.paths.unshift theme_asset_path
end
+# Append individual theme assets to the asset path
+theme_asset_path = File.join(File.dirname(__FILE__),
+ '..',
+ 'app',
+ 'assets')
+theme_asset_path = Pathname.new(theme_asset_path).cleanpath.to_s
+
+LOOSE_THEME_ASSETS = lambda do |logical_path, filename|
+ filename.start_with?(theme_asset_path) &&
+ !['.js', '.css', ''].include?(File.extname(logical_path))
+end
+
+Rails.application.config.assets.precompile.unshift(LOOSE_THEME_ASSETS)
+
# 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/config/custom-routes.rb b/lib/config/custom-routes.rb
index 98fccf7..efbf95e 100644
--- a/lib/config/custom-routes.rb
+++ b/lib/config/custom-routes.rb
@@ -3,7 +3,7 @@
Rails.application.routes.draw do
# brand new controller example
- # match '/mycontroller' => 'general#mycontroller'
+ # get '/mycontroller' => 'general#mycontroller'
# Additional help page example
- # match '/help/help_out' => 'help#help_out'
+ # get '/help/help_out' => 'help#help_out'
end
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
deleted file mode 100644
index b22d123..0000000
--- a/lib/views/general/_orglink.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %>