Here's the patch that does the PHP side of things. Things look broken now when the filter guidelines are absent; the CSS must be improved to handle that; Bojhan said he'd like to work on that, so assigning to him :)

I noticed the margins are changed. In the screenshots of #6 show that the "Text format" label aligns with the WYSIWYG buttons and the same spacing is applied to the help icon + label. That seems to be lost now.

The rest looks great :) The thing I am wondering, if there should be a little ease when you flip between having no WYSIWYG and having a WYSIWYG its now all very sudden.

#13: Heh — that was intentional: the margins are not changed in my patch, they were changed in your patch. I don't think it's a great idea to make the text format <select> align with CKEditor's buttons — what if you use a different style on CKEditor? What if you use another text editor than CKEditor? In any case, changing alignment is completely unrelated to the goal of this issue, so if you want to change that, please do it in a different issue. Let's get this in now :)

The margins look bad now, I'd like to fix it. I think the change that I made looks fine with and/or without CKEditor. Unless you feel really passionate about the few px margin change, can we please just fix it here. I'd like to introduce a design change that doesn't require followups.