Removed hardcoded references to formatting and theme and home CSS fil…

…es and moved formatting and theme to asset pipeline and home to home.html.erb using content_for. Fixes #1456
refinery · Mar 18, 2012 · 6017ce4 · simi · Mar 26, 2012 · parndt
1 parent 152f94c
commit 6017ce4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core/app/views/refinery/_head.html.erb b/core/app/views/refinery/_head.html.erb
@@ -8,8 +8,7 @@
   <%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%>
   <%= yield :meta %>
 
-  <%= stylesheet_link_tag "application", "formatting", "theme" %>
-  <%= stylesheet_link_tag "home" if home_page? %>
+  <%= stylesheet_link_tag "application" %>
   <%= yield :stylesheets %>
 
   <%= render '/refinery/google_analytics' %>

diff --git a/core/lib/generators/refinery/cms/cms_generator.rb b/core/lib/generators/refinery/cms/cms_generator.rb
@@ -28,6 +28,8 @@ def generate
 
       append_gitignore!
 
+      append_asset_pipeline!
+
       forced_overwriting?
 
       copy_files!
@@ -47,6 +49,15 @@ def generate
 
   protected
 
+    def append_asset_pipeline!
+      application_css = 'app/assets/stylesheets/application.css'
+      if destination_path.join(application_css).file?
+        insert_into_file application_css, %q{*= require formatting
+ *= require theme
+ },      :before => "*= require_self"
+      end
+    end
+
     def append_gemfile!
       gsub_file 'Gemfile', %q{gem 'sqlite3'}, %q{group :development, :test do
   gem 'sqlite3'

diff --git a/pages/app/views/refinery/pages/home.html.erb b/pages/app/views/refinery/pages/home.html.erb
@@ -1 +1,2 @@
+<% content_for :stylesheets, stylesheet_link_tag('home') %>
 <%= render '/refinery/content_page' %>