Skip to content

Commit

Permalink
Fixed issue #10195: CKEditor should use Bootstrap style
Browse files Browse the repository at this point in the history
  • Loading branch information
c-schmitz committed Mar 16, 2016
1 parent f00c01e commit 792ad55
Show file tree
Hide file tree
Showing 17 changed files with 2,047 additions and 8 deletions.
5 changes: 3 additions & 2 deletions scripts/admin/ckeditor-config.js
Expand Up @@ -2,14 +2,15 @@ CKEDITOR.editorConfig = function( config )
{

config.filebrowserBrowseUrl = CKEDITOR.basePath+'../kcfinder/browse.php?type=files';
config.filebrowserImageBrowseUrl = CKEDITOR.basePath+'../kcfinder/browse.php?type=images';
config.filebrowserImageBrowseUrl = CKEDITOR.basePath+'../kcfinder/browse.php?type=images';
config.filebrowserFlashBrowseUrl = CKEDITOR.basePath+'../kcfinder/browse.php?type=flash';

config.filebrowserUploadUrl = CKEDITOR.basePath+'../kcfinder/upload.php?type=files';
config.filebrowserImageUploadUrl = CKEDITOR.basePath+'../kcfinder/upload.php?type=images';
config.filebrowserFlashUploadUrl = CKEDITOR.basePath+'../kcfinder/upload.php?type=flash';
config.removeDialogTabs = 'link:upload;image:Upload';
config.removeDialogTabs = 'link:upload;image:Upload';

config.skin = 'BootstrapCK-Skin';
config.toolbarCanCollapse = false;
config.resize_enabled = false;
config.autoParagraph = false;
Expand Down
21 changes: 21 additions & 0 deletions third_party/ckeditor/skins/BootstrapCK-Skin/LICENSE
@@ -0,0 +1,21 @@
The MIT License

Copyright (c) 2012 Kunstmaan (http://www.kunstmaan.be)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
28 changes: 28 additions & 0 deletions third_party/ckeditor/skins/BootstrapCK-Skin/README.md
@@ -0,0 +1,28 @@
# About [BootstrapCK-Skin][BootstrapCK-Skin]

!Update: This skin is for CKeditor3 use. Want the new CKeditor4 skin? https://github.com/Kunstmaan/BootstrapCK4-Skin

The [BootstrapCK-Skin][BootstrapCK-Skin] is a skin for [CKEditor][CKEditor] based on [Twitter Bootstrap][Twitter Bootstrap] styles.<br />
Some things couldn't be changed inside the skin, like the smileys and the position of the browse buttons when inserting an image or a flash.<br />
Here's how you fix that:

## Smileys

Go to <code>plugins > smiley > dialogs</code> , and replace <code>smiley.js</code> with [this one][this one].<br />
And grab your new images over [here][here].

## Browse buttons

Go to <code>plugins > image > dialogs > image.js</code> and to <code>plugins > flash > dialogs > flash.js</code><br />
In both, change the margin-top to 17px (instead of 10px).

# Demo
[http://kunstmaan.github.com/BootstrapCK-Skin/][http://kunstmaan.github.com/BootstrapCK-Skin/]

[BootstrapCK-Skin]: https://github.com/Kunstmaan/BootstrapCK-Skin "BootstrapCK-Skin"
[CKEditor]: http://ckeditor.com/ "CKEditor"
[Twitter Bootstrap]: http://twitter.github.com/bootstrap/ "Twitter Bootstrap"
[this one]: http://kunstmaan.github.com/BootstrapCK-Skin/smiley.js "smiley.js"
[here]: http://kunstmaan.github.com/BootstrapCK-Skin/smileys.zip "smileys.zip"
[http://kunstmaan.github.com/BootstrapCK-Skin/]: http://kunstmaan.github.com/BootstrapCK-Skin/ "Demo"
[kunstmaan]: http://www.kunstmaan.be "Kunstmaan"

0 comments on commit 792ad55

Please sign in to comment.