Merge branch 'tweaking_ckeditor' of https://github.com/akitaonrails/r…

…ails_admin into akitaonrails-tweaking_ckeditor
railsadminteam · Jan 3, 2011 · 8682794 · 8682794
2 parents 27e91f2 + d69a76b
commit 8682794
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/app/views/layouts/rails_admin/form.html.erb b/app/views/layouts/rails_admin/form.html.erb
@@ -11,7 +11,7 @@
   <%= javascript_include_tag('rails_admin/prototype-date-extensions.js') %>
   <%= javascript_include_tag('rails_admin/datepicker.js') %>
   <%= javascript_include_tag('rails_admin/associations.js') %>
-  <%= javascript_include_tag('ckeditor/ckeditor.js') %>
+  <%= javascript_include_tag('ckeditor/ckeditor.js') if File.exists?(File.join(Rails.root, 'public/javascripts/ckeditor/ckeditor.js')) %>
   <%= javascript_include_tag('rails_admin/dashboard.js') %>
   <%= stylesheet_link_tag('rails_admin/datepicker.css') %>
 

diff --git a/app/views/rails_admin/main/_text.html.erb b/app/views/rails_admin/main/_text.html.erb
@@ -1,5 +1,4 @@
               <%= label_tag "#{field.abstract_model.to_param}_#{field.name}", field.label %>
-              <br /><br />
               <%= text_area field.abstract_model.to_param, field.name, :cols => 80, :class => "#{field.css_class}
                #{field.has_errors? ? "errorField" : nil}", :value => field.value %>
               <% if field.ckeditor %>

diff --git a/public/javascripts/ckeditor/ckeditor.js b/public/javascripts/ckeditor/ckeditor.js
diff --git a/public/javascripts/ckeditor/config.js b/public/javascripts/ckeditor/config.js
@@ -0,0 +1,31 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+Custom configuration for Rails Admin, by Fabio Akita
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+    // Define changes to default configuration here. For example:
+    // config.language = 'fr';
+    // config.uiColor = '#AADC6E';
+    config.toolbar =
+    [
+        ['Source','-'],
+        ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
+        ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+        ['BidiLtr', 'BidiRtl'],
+        '/',
+        ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
+        ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+        ['Link','Unlink','Anchor'],
+        ['Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
+        '/',
+        ['Styles','Format','Font','FontSize'],
+        ['TextColor','BGColor'],
+        ['Maximize', 'ShowBlocks','-','About']
+    ];
+};
+
diff --git a/public/stylesheets/rails_admin/create.css b/public/stylesheets/rails_admin/create.css
@@ -360,3 +360,8 @@ input.default:active{
   top:4px;
   right:2px;
 }
+
+.cke_skin_kama {
+  margin-left: 100px;
+}
+