about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/admin/init_ckeditor.coffee (renamed from app/assets/javascripts/init_ckeditor.coffee)0
-rw-r--r--app/assets/javascripts/admin/records.coffee (renamed from app/assets/javascripts/records.coffee)0
-rw-r--r--app/assets/javascripts/application.js2
-rw-r--r--app/assets/javascripts/ckeditor/config.js2
-rw-r--r--config/initializers/ckeditor.rb2
5 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/init_ckeditor.coffee b/app/assets/javascripts/admin/init_ckeditor.coffee index 5f653af..5f653af 100644 --- a/app/assets/javascripts/init_ckeditor.coffee +++ b/app/assets/javascripts/admin/init_ckeditor.coffee
diff --git a/app/assets/javascripts/records.coffee b/app/assets/javascripts/admin/records.coffee index 69cd471..69cd471 100644 --- a/app/assets/javascripts/records.coffee +++ b/app/assets/javascripts/admin/records.coffee
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 499c820..f902906 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js
@@ -14,4 +14,4 @@
14//= require jquery_ujs 14//= require jquery_ujs
15//= require turbolinks 15//= require turbolinks
16//= require ckeditor/init 16//= require ckeditor/init
17//= require_tree . 17//= require_tree ./admin
diff --git a/app/assets/javascripts/ckeditor/config.js b/app/assets/javascripts/ckeditor/config.js index 44b3c23..7ff7731 100644 --- a/app/assets/javascripts/ckeditor/config.js +++ b/app/assets/javascripts/ckeditor/config.js
@@ -6,7 +6,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
6CKEDITOR.editorConfig = function( config ) 6CKEDITOR.editorConfig = function( config )
7{ 7{
8 // Define changes to default configuration here. For example: 8 // Define changes to default configuration here. For example:
9 // config.language = 'fr'; 9 config.language = 'en';
10 // config.uiColor = '#AADC6E'; 10 // config.uiColor = '#AADC6E';
11 config.height = "512px"; 11 config.height = "512px";
12 12
diff --git a/config/initializers/ckeditor.rb b/config/initializers/ckeditor.rb index 8f80a43..b03e4f4 100644 --- a/config/initializers/ckeditor.rb +++ b/config/initializers/ckeditor.rb
@@ -43,7 +43,7 @@ Ckeditor.setup do |config|
43 43
44 # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need: 44 # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
45 # By default: nil (no limit) 45 # By default: nil (no limit)
46 # config.assets_languages = ['en', 'uk'] 46 config.assets_languages = ['en']
47 # config.assets_plugins = ['image', 'smiley'] 47 # config.assets_plugins = ['image', 'smiley']
48 48
49 # CKEditor CDN 49 # CKEditor CDN