@@ -8,3 +8,5 @@ db/schema.rb public/system public/coverage public/features_rcov +public/javascripts/js_all.js +public/stylesheets/styles_all.css \ No newline at end of file .gitignore @@ -2,7 +2,7 @@ class PitchesController < ApplicationController before_filter :store_location, :only => :show before_filter :login_required, :only => [:apply_to_contribute] before_filter :organization_required, :only => [:half_fund, :fully_fund, :show_support] - before_filter :set_meta_tags + before_filter :set_meta_tags, :only => [:show] resources_controller_for :pitch @@ -115,7 +115,7 @@ class PitchesController < ApplicationController def set_meta_tags pitch = find_resource - html_meta_tags(pitch.short_description,pitch.keywords) + html_meta_tags(pitch.short_description,pitch.keywords) if pitch end end app/controllers/pitches_controller.rb @@ -2,7 +2,7 @@ class StoriesController < ApplicationController before_filter :can_view?, :only => [:show] before_filter :can_edit?, :only => :edit before_filter :select_tab - before_filter :set_meta_tags + before_filter :set_meta_tags, :only => [:show] resources_controller_for :stories def accept @@ -68,6 +68,6 @@ class StoriesController < ApplicationController def set_meta_tags story = find_resource - html_meta_tags(story.short_description,story.keywords) + html_meta_tags(story.short_description,story.keywords) if story end end app/controllers/stories_controller.rb @@ -4,7 +4,7 @@ class TipsController < ApplicationController before_filter :block_if_donated_to, :only => :edit bounce_bots(:send_bots, :tip, :blog_url) before_filter :select_tab, :only => [:new] - before_filter :set_meta_tags + before_filter :set_meta_tags, :only => [:show] def block_if_donated_to t = find_resource(params[:id]) @@ -47,7 +47,7 @@ class TipsController < ApplicationController def set_meta_tags tip = find_resource - html_meta_tags(tip.short_description,tip.keywords) + html_meta_tags(tip.short_description,tip.keywords) if tip end end app/controllers/tips_controller.rb @@ -9,32 +9,33 @@ /[if IE 6] = stylesheet_link_tag 'ie_spotus.css' - = stylesheet_link_tag 'screen', :media => "screen" - = stylesheet_link_tag 'screen_spotus', :media => "screen" + = stylesheet_link_tag 'screen','screen_spotus','ie.css','facebox', :media => "screen", :cache => "styles_all" + =# stylesheet_link_tag 'screen_spotus', :media => "screen" = stylesheet_link_tag 'print', :media => "print" - = stylesheet_link_tag 'ie.css' + =# stylesheet_link_tag 'ie.css' - = javascript_include_tag 'fckeditor/fckeditor.js' - = javascript_include_tag 'jquery-1.3.1.min.js' + + = javascript_include_tag 'jquery-1.3.1.min' %script{:type => 'text/javascript'} jQuery.noConflict(); - = javascript_include_tag 'jquery-ui.js' - = javascript_include_tag 'jrails.js' - = javascript_include_tag 'jquery.pngFix.js' - = javascript_include_tag 'jquery.equalHeights.js' - = javascript_include_tag 'prototype' - / = javascript_include_tag 'scriptaculous' - = javascript_include_tag 'effects' - = javascript_include_tag 'jsProgressBarHandler.js' - = javascript_include_tag 'jquery.livequery.js' - = javascript_include_tag 'jquery.cookie.js' - = javascript_include_tag 'jcarousellite_1.0.1' - = javascript_include_tag 'jquery.form' - = javascript_include_tag 'application' - = javascript_include_tag 'auth' + = javascript_include_tag 'fckeditor/fckeditor','jquery-ui','jrails','jquery.pngFix','jquery.equalHeights','prototype','effects','jsProgressBarHandler','jquery.livequery','jquery.cookie','jcarousellite_1.0.1','jquery.form','application','auth','facebox', :cache => "js_all" + =# javascript_include_tag 'jquery-ui' + =# javascript_include_tag 'jrails' + =# javascript_include_tag 'jquery.pngFix' + =# javascript_include_tag 'jquery.equalHeights' + =# javascript_include_tag 'prototype' + =# javascript_include_tag 'scriptaculous' + =# javascript_include_tag 'effects' + =# javascript_include_tag 'jsProgressBarHandler' + =# javascript_include_tag 'jquery.livequery' + =# javascript_include_tag 'jquery.cookie' + =# javascript_include_tag 'jcarousellite_1.0.1' + =# javascript_include_tag 'jquery.form' + =# javascript_include_tag 'application' + =# javascript_include_tag 'auth' - = stylesheet_link_tag 'facebox' - = javascript_include_tag 'facebox' + =# stylesheet_link_tag 'facebox' + =# javascript_include_tag 'facebox' = iboxify_page = yield :head app/views/layouts/_head.html.haml 842e539c6db412fa39708112965eb77dc0dd5083 Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/f434ea565c456abe6a90b8e69dce258eb033baf4 f434ea565c456abe6a90b8e69dce258eb033baf4 2009-09-30T14:33:14-07:00 2009-09-30T14:33:14-07:00 JS and CSS assets packaged for improved performance 615e0f817c694232fb366c40c984c791b7a11899 Dan Newman dpnewman@gmail.com