diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:23:50 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:23:50 +0000 |
| commit | 4e1ab212c1286730963c72cd11cf87dddd3b3cab (patch) | |
| tree | b8effcec64bda8caa329c1408677d8aa947eba4e /lib | |
| parent | 7980e02c11bbb049d213c9ff9caa36f4edb82d54 (diff) | |
| parent | 0d2a72017779ba0cd7c7d40e0fa32713129333c5 (diff) | |
Merge branch 'switch-to-asset-pipeline' into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/alavetelitheme.rb | 9 | ||||
| -rw-r--r-- | lib/views/general/_before_head_end.html.erb | 2 | ||||
| -rw-r--r-- | lib/views/general/_orglink.html.erb | 2 |
3 files changed, 11 insertions, 2 deletions
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' %> |