From 4f38074932e706b82c7bc4f3424bcbcf5804ad11 Mon Sep 17 00:00:00 2001 From: chris2tof Date: Tue, 23 Aug 2011 10:05:16 +0800 Subject: [PATCH] content.css -> content.css.erb --- app/assets/stylesheets/{content.css => content.css.erb} | 4 ++-- app/views/layouts/content.html.erb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) rename app/assets/stylesheets/{content.css => content.css.erb} (90%) diff --git a/app/assets/stylesheets/content.css b/app/assets/stylesheets/content.css.erb similarity index 90% rename from app/assets/stylesheets/content.css rename to app/assets/stylesheets/content.css.erb index 350ab2f8..092b7537 100644 --- a/app/assets/stylesheets/content.css +++ b/app/assets/stylesheets/content.css.erb @@ -23,7 +23,7 @@ body{ width:100%; } #panel_header{ - background:url(../images/bar_bg.png) repeat-x 0 0; + background:url(<%= asset_path 'bar_bg.png' %>) repeat-x 0 0; font-size:12px; height:41px; } @@ -73,7 +73,7 @@ body{ color:#ececec; } #panel_sidebar ul{ - background: url("../images/tree_list.png") repeat scroll 0 0 transparent; + background: url(<%= asset_path 'tree_list.png' %>) repeat scroll 0 0 transparent; } #panel_sidebar li{ font-size: 12px; diff --git a/app/views/layouts/content.html.erb b/app/views/layouts/content.html.erb index bac1b87f..cf6cc6b9 100644 --- a/app/views/layouts/content.html.erb +++ b/app/views/layouts/content.html.erb @@ -8,6 +8,9 @@ <%= stylesheet_link_tag "content", :media => "screen, projection" %> <%#= javascript_include_tag :ckeditor %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> + <%#= javascript_include_tag "jquery", "jquery-ui", "rails", "easy", "application", :cache => 'all' %> <%= yield :page_specific_javascript %>