Merge pull request browsermedia#704 from jamesprior/master

Only make the CMS form builder the default for CMS controllers. Adjust JQuery precompile.

Author: peakpg

app/controllers/cms/application_controller.rb

@@ -1,5 +1,6 @@
 module Cms
  class ApplicationController < ::ApplicationController
+ default_form_builder = Cms::FormBuilder::ContentBlockFormBuilder
  include Cms::AdminController
 
  end

lib/cms/engine.rb

@@ -116,7 +116,6 @@ class Engine < Rails::Engine
  ActiveSupport::Dependencies.autoload_paths += %W( #{Rails.root}/app/portlets/helpers )
  ActionController::Base.append_view_path DynamicView.base_path
  ActionController::Base.append_view_path %W( #{self.root}/app/views)
- ActionView::Base.default_form_builder = Cms::FormBuilder::ContentBlockFormBuilder
  require 'jdbc_adapter' if defined?(JRUBY_VERSION)
  end
 
@@ -130,7 +129,7 @@ class Engine < Rails::Engine
  app.config.assets.precompile += ['bcms/ckeditor_inline.js', 'bcms/ckeditor.js', 'bcms/ckeditor_standard_config.js']
 
  # Unsure why jquery isn't getting precompiled.
- app.config.assets.precompile += ['jquery.js']
+ app.config.assets.precompile += ['jquery']
  end
  end
 end