64 Commits

Author SHA1 Message Date
Markus Birth
82bb67654c Use composer-foxy (FKA composer-asset-plugin) to manage JS/CSS. Removed
bundled ckeditor in favour of using foxy to install it.
2022-02-09 16:01:34 +01:00
onli
5f488e97cf
Wysiwyg cleanup (#761)
* Cleanup ckeditor config
Remove force-settings, remove verbose commentary from config, limit toolbar selection

* document toolbar removal
2021-05-24 17:39:08 +02:00
onli
bf8f1aafa5 Disable ckeditor ACF to fix #705
And to prevent similar issues in the future
2020-05-27 14:41:15 +02:00
onli
e1291fb54a Update ckeditor to 4.14.0, replace code wrap button with snippet
See https://board.s9y.org/viewtopic.php?f=10&t=24808 for context
2020-04-29 17:08:01 +02:00
Thomas Hochstein
9cff057209 CK-Editor: allow details and summary.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-04-23 17:56:54 +02:00
onli
b614ed5d07 Fix: Stop ckeditor from removing figures and figcaptions 2019-10-09 18:10:21 +02:00
Jari Turkia
6191c740fe Suggested changes made to place the <code> tag button in editor. Removed <tt> completely. 2019-03-20 17:37:29 +01:00
Jari Turkia
9a8fb7a696 Added codeTag plugin into CKeditor 2019-03-20 17:37:29 +01:00
klemens
5a95db314a spelling fixes 2017-04-06 22:26:07 +02:00
Ian
56b26f7120 disable Smarty like CKEDITOR (procurator) protection 2015-08-14 18:11:39 +02:00
Ian
32769998df bugfix ckeditor releases
Added widget, lineutils, fakeobjects and S9y plugins cheatsheet and procurator Plugins.
Removed "samples" dir and plugin "dev" dirs in lineutils and widget
2015-07-13 16:08:13 +02:00
Ian
613119e964 typo 2015-07-13 15:31:22 +02:00
Ian
5de0eb4c80 change autoParagraph 2015-07-13 15:00:26 +02:00
Ian
f38d72dec5 document includeentry widget source protection 2015-06-01 12:41:08 +02:00
Ian
e4eb9a0d1f allow ckeditor use span element markup 2015-05-06 18:55:20 +02:00
Ian
325ea6de7b Revert "fix strange PHP parse error on subdomain usage"
This reverts commit ffe581225caac600d6589ea2181ec1697e7a7db1.
2015-03-15 13:00:18 +01:00
Ian
ffe581225c fix strange PHP parse error on subdomain usage
preventing ckeditor to load the resource and itself.

console errors like:
ckeditor.js:77 GET http://sub.domain.org/htmlarea/ckeditor/ckeditor/plugins/procurator/plugin.js?t=F0RD
ckeditor.js:226 Uncaught [CKEDITOR.resourceManager.load] Resource name "procurator" was not found at "http://sub.domain.org/htmlarea/ckeditor/ckeditor/plugins/procurator/plugin.js?t=F0RD".

server error.log like:
[Sun Mar 15 10:34:32 2015] [error] [client 1.2.3.4] PHP Parse error:  syntax error, unexpected '{' in /var/www/domain.org/html/sub/htmlarea/ckeditor/ckeditor/plugins/procurator/plugin.js on line 129, referer: http://sub.domain.org/serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new

Why does PHP read/parse js files?
Why does it not respect // notes, nor /* notes */ in this case?

Might that be because Chrome says to all available loading js resources in Serendipity "Resource interpreted as Script but transferred with MIME type text/html" ???
2015-03-15 11:23:23 +01:00
Ian
df20e85811 license s9y 2015-01-28 17:11:18 +01:00
Ian
91412bf73b set version for 0dc2651 2014-12-19 16:06:01 +01:00
Ian
0dc26512a3 stop default encoding in cke savings
else searching terms will/may not match

References #249 and #236
2014-12-19 15:51:06 +01:00
Ian
0204a597c7 cleanup 2014-12-07 17:21:32 +01:00
Ian
2f3170ef18 modify alternate 2014-12-02 11:33:20 +01:00
Ian
ecd211479f CKEditor 4.4.6 - checke 2014-11-26 13:05:27 +01:00
Ian
1fb5bcf38e cleanup cke s9y configuration file
breaks apart long paragraph group in full,
adds mediaembed to default and maximize to standard toolbar

References #148
2014-11-26 13:00:13 +01:00
Ian
b51b3dfb59 simplify tb tweak in 77033ef
References #148
2014-11-26 10:52:32 +01:00
Ian
77033efcf4 move cke toolbar css tweaks to a better place
which also makes it independent from cke plugin file usage.

References #148
2014-11-26 10:14:23 +01:00
Ian
8eaffe46fe better fb9414b 2014-11-25 16:40:18 +01:00
Ian
fb9414b9ae ckeditor extend more for serendipity
This hides the ckeditor image widget button by CSS in all supported Serendipity toolbars, but keeps it internal functionality enabled which is needed for MediaLibrary inserts.
This forces the user to use the specialized ML button for image inserts only, but will still be supported by CKE toolbar.
An Image double click will still use the image widget like before.
Best checked place was to put this in admin/style.css.

References 148
2014-11-25 14:27:16 +01:00
Ian
cf500aba28 doc notes changes for umcoming serendipity_getTemplateFile chaining patch 2014-11-19 15:14:08 +01:00
Ian
629eb18529 typos 2014-11-19 13:16:01 +01:00
Ian
59cd4916ee better docs, cleanup and moves 2014-11-19 12:59:09 +01:00
Ian
673fa12d4a remove old version 2014-11-19 12:58:18 +01:00
Ian
822cdb4f85 Better notes for custom copies 2014-11-18 12:06:37 +01:00
Ian
14c5a5b9df add missing cke plugin
References #148
2014-11-18 11:12:10 +01:00
Ian
057c6c20e8 fix note typos 2014-11-17 19:21:46 +01:00
Ian
885f064b61 package CKEDITOR UI configurable Toolbar
References #148

The js and css config files are directly placed in /htmlarea directory. The old ones downunder are not reset with this commit, until we give OK to go.
The lang constant will be placed to addlang.txt in a 2cd commit, since this may change and there is already a pending constant.
I have not added another option by now to explicitly choose the s9y configs in htmlarea, if someone has custom ones in 2k11/admin and wants to switch back to the origins. Is this really a real and valid user case?
2014-11-17 18:07:54 +01:00
onli
1c025c15da ckeditor update, removes samples (#148) 2014-11-13 19:00:15 +01:00
onli
f7da64165d Make ckeditor configurable via config (#148)
Before this, ckeditor was configurable by editing the wysiwyg_init.tpl in 2k11/admin. Now, the flow is like this:
 1. wysiwyg_init.tpl is responsible for initializing the editor and the plugins
 2. we provide a htmlare/ckeditor/serendipity_config.js where we specify a sane default configuration, including a small toolbar without harmful elements
 3. if the user wants to overwrite our configuration upgrade-safely, he can do this in htmlare/ckeditor/userconf.js
2014-09-19 21:15:50 +02:00
Ian
39b29ad284 fix image comment in wysiwyg mode 2014-07-03 11:02:16 +02:00
onli
05817056e5 Copy ckeditor-files into repo (#148)
This time, I deleted ckeditor/ckeditor/.git and removed everytjing before. I hope that the line in .gitignore will prevent the linking the next time if someone forgets to delete the file
2014-05-16 15:03:25 +02:00
onli
dad4e4cfc9 Set ckeditor to latest stable, not to the head of git 2014-05-15 16:38:57 +02:00
onli
d85334ced7 Remove doubled ckeditor instance (#148) 2014-05-15 16:26:56 +02:00
onli
f1348373cb Include the full ckeditor, using composer (#148)
This shall make it easier for users to customize the editor
2014-05-12 21:40:05 +02:00
Ian
17ebe08e52 update CKEditor lib to 4.4
remove unused S9y plugins and custom_plugin.js, since not wanted to be used.
I will not care about any further.
2014-04-26 16:36:39 +02:00
Ian
efbfb2b320 Proof of concept for CKEDITOR WYSIWYG-Mode respecting "S9y image floats"
The stylesheet would need some love though! (YL?) :)
References #129
2014-04-24 16:06:25 +02:00
onli
0d54063c5e Use old method to init ckeditor
Instead of using global JS-variables and ignoring serendipity[textarea]={$view}, this
approach actually uses the variable and therefore reinstates wysiwyg_init.tpl.

ckeditor_custom_config.js (Thx Ian!) is still respected, but the toolbar got restored to the old version. We need an easy way to remove _underline_, for example. It could be extended though.

This fixes #{107} somewhat, as serendipity_image_selector.php is useable now, but still with display errors (and without an upload widget). Probably still a good idea to copy the ML-eapproach of the normal textareas

This also works with htmlnuggets, without using spawnnugget from the core, instead wysiwyg_init.tpl gets reused in the plugin-config.

ckeditor_custom_plugin.js got emptied, the relevant code (which should only be the part that adds the plugins into the toolbar) should be integrated into wysiwyg_init.tpl).
2014-03-23 23:03:09 +01:00
Ian
8e26bd9711 prepare core ckeditor for custom config and plugins 2014-03-15 17:48:29 +01:00
Ian
95cddcd6a2 prepare htmlarea with upgraded ckeditor for installer
References #72
2014-03-13 08:09:46 +01:00
Ian
6928a91060 upgrade core ckeditor
to standard CKEditor 4.3.3 (revision 7841b02)
2014-03-12 20:26:25 +01:00
Garvin Hicking
df906a343f upport 2013-08-22 12:32:04 +02:00