- added support for CKeditor

[zdravko]

Hi, this is my first pull request. As being discussed on maillist this project is about Bricolage - wysiwyg editor interface. The first step is adding CKeditor to Bricolage and that is what this pull request is about. And of course being a git newbie, I need to learn how to do things. Please, be patient with me. :)

Regards, Zdravko

This patch is wywsiwyg editor layer to Bricolage. The CKeditor 3.4.2 is found to be working. Just install the editor in comp/media/widgets directory in to default subdirectory ckeditor. Change the configuration bricolage.conf WYSIWYG_EDITOR to ckeditor and you should be ok.

There are two new files: comp/widgets/wysiwyg/ckeditor.html like xinha.html comp/widgets/wysiwyg/ckconfig.js configuration file for the CKeditor

Two files were modified: comp/widgets/container_prof/container.html restarting CKeditor on page reload lib/Bric/Admin.pod short description on this new Bricolage feature

[theory]

Looks simple enough. No linking to other documents via the WYSIWYG interface yet, right? I know you've been working on that; planning it for future pull request?

David

[zdravko]

Yes, finally I decided to split it in two updates. If this is ok, I'd push the part 2. I wrote a bit of report about what is what, but don't know where to attach it. Here in the pull request?

Zdravko

[theory]

I suggest the developers mail list.

[zdravko]

Yes!

ps. who closes these "pull requests"?

[zdravko]

Here is the next part of wysiwyg interface.

[theory]

I do.

[theory]

Okay, I've cherr-picked in d64519 as 2fe346a and a few tweaks after that:

• Added notes to conf/bricolage.conf.
• Removed notes from Bric::Admin about support for related stories, since that's actually in a separate commit.
• Updated Bric::Changes

A couple of things for you to consider in a future patch, though:

• Add spell check support in lib/Bric/App/ApacheConfig.pm? See how it's done for FCKeditor; maybe it's the same?
• Could the configuration be done in conf/bricolage.conf as it is for FCKeditor?

So if you would rebase your build off master and submit the related document stuff in a new pull request, I can consider that separately.

Thanks!

David

[zdravko]

I have commited the rest of the stuff already. Too soon I guess. However git rebase master says: Current branch master is up to date.

I'd like to merge your changes, but don't know how. Zdravko

[theory]

This is why it's important to work in a branch. What you need to do is stash 7f968e1, rebase to upstream, then create a branch and apply from the stash. So something like this:

git reset --soft 7f968e1^
git stash
git reset --hard HEAD^
git pull upstream master
git checkout -b ckeditor-relateds
git stash pop
git commit -a

So what that will do is revert to just before 7f968e1, but leave your 7f968e1 changes in place. Then you stash them, which removes them but stashes them away for you to grab later. Then you delete the original ckeditor commit and pull from upstream master. That should get you in sync with master, including the ckeditor support. Then you create a working branch for your project, and pop 7f968e1 back of the stash. Then all your changes should be there. Just make any necessary edits and commit again. Then you can push the new branch up to GitHub. The details on managing a project branch are here.

HTH,

David

[theory]

Another suggestion here. The idea is to create a branch with what you have, then fix master to be in line with upstream. Fewer steps.