diff --git a/Gemfile b/Gemfile index 003d7da9..3ca0d51a 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,6 @@ gem 'rails', '>=3.1.0', '<3.2.0' gem 'bson_ext' gem 'carrierwave' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' -gem 'ckeditor' gem 'devise' gem 'exception_notification' # Send error trace gem 'execjs' diff --git a/Gemfile.lock b/Gemfile.lock index d67f72e5..3fc663b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,9 +43,6 @@ GEM carrierwave (>= 0.5.6) mongoid (~> 2.1) chronic (0.6.6) - ckeditor (3.6.3) - mime-types (~> 1.16) - orm_adapter (~> 0.0.5) coffee-rails (3.1.1) coffee-script (>= 2.2.0) railties (~> 3.1.0) @@ -209,7 +206,6 @@ DEPENDENCIES bson_ext carrierwave carrierwave-mongoid - ckeditor coffee-rails database_cleaner delorean diff --git a/config/application.rb b/config/application.rb index 36e1006e..d2d02089 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,7 +28,6 @@ module PrototypeR4 # config.autoload_paths += %W(#{config.root}/extras) config.autoload_paths += %W(#{config.root}/lib) config.autoload_paths += %W(#{config.root}/lib/parsers) - config.autoload_paths += %W(#{config.root}/app/models/ckeditor ) config.autoload_paths += %W(#{config.root}/app/models/design) config.autoload_paths += %W(#{config.root}/app/models/purchase) config.autoload_paths += %W(#{config.root}/app/models/user) diff --git a/config/initializers/ckeditor.rb b/config/initializers/ckeditor.rb deleted file mode 100644 index 01ddab06..00000000 --- a/config/initializers/ckeditor.rb +++ /dev/null @@ -1,54 +0,0 @@ -# Use this hook to configure ckeditor -if Object.const_defined?("Ckeditor") - Ckeditor.setup do |config| - # The file_post_name allows you to set the value name used to post the file. - # This is not related to the file name. The default value is 'data'. - # For maximum compatibility it is recommended that the default value is used. - #config.swf_file_post_name = "data" - - # A text description that is displayed to the user in the File Browser dialog. - #config.swf_file_types_description = "Files" - - # The file_types setting accepts a semi-colon separated list of file extensions - # that are allowed to be selected by the user. Use '*.*' to allow all file types. - #config.swf_file_types = "*.doc;*.wpd;*.pdf;*.swf;*.xls" - - # The file_size_limit setting defines the maximum allowed size of a file to be uploaded. - # This setting accepts a value and unit. Valid units are B, KB, MB and GB. - # If the unit is omitted default is KB. A value of 0 (zero) is interpreted as unlimited. - # Note: This setting only applies to the user's browser. It does not affect any settings or limits on the web server. - #config.swf_file_size_limit = "10 MB" - - # Defines the number of files allowed to be uploaded by SWFUpload. - # This setting also sets the upper bound of the file_queue_limit setting. - # Once the user has uploaded or queued the maximum number of files she will - # no longer be able to queue additional files. The value of 0 (zero) is interpreted as unlimited. - # Only successful uploads (uploads the trigger the uploadSuccess event) are counted toward the upload limit. - # The setStats function can be used to modify the number of successful uploads. - # Note: This value is not tracked across pages and is reset when a page is refreshed. - # File quotas should be managed by the web server. - #config.swf_file_upload_limit = 5 - - # The same as for downloads files, only to upload images - #config.swf_image_file_types_description = "Images" - #config.swf_image_file_types = "*.jpg;*.jpeg;*.png;*.gif" - #config.swf_image_file_size_limit = "5 MB" - #config.swf_image_file_upload_limit = 10 - - # Path for view all uploaded files - #config.file_manager_uri = "/ckeditor/attachments" - - # Path for upload files process - #config.file_manager_upload_uri = "/ckeditor/attachments" - - # Path for view all uploaded images - #config.file_manager_image_uri = "/ckeditor/pictures" - - # Path for upload images process - #config.file_manager_image_upload_uri = "/ckeditor/pictures" - - # Model's names witch processing in ckeditor_controller - #config.file_manager_image_model = "Ckeditor::Picture" - #config.file_manager_file_model = "Ckeditor::AttachmentFile" - end -end