3794 Commits

Author SHA1 Message Date
Ian
6a8f3a44c0 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-04-08 10:39:46 +02:00
Ian
847ef6c6a6 Smarty 3.1.18 2014-04-08 10:22:23 +02:00
Garvin Hicking
ce724611d5 Yeah, guess I cannot get used to "Themes". 2014-04-08 09:37:18 +02:00
Garvin Hicking
178371eed6 Prepare release 2014-04-08 09:22:30 +02:00
Garvin Hicking
3d92fb099f Prevent fatal error when directory does not exist 2014-04-08 09:13:47 +02:00
onli
68be4a5f65 get rename token from html
serendipity_editor.js in default is static, so it can't be given by smarty. I copied the approach into the 2k11-version as well, so it won't get as easily lost.
2014-04-04 13:34:38 +02:00
onli
931a0f0b3b nobr button was using the wrong id for tarea 2014-03-31 02:46:39 +02:00
onli
fd113ae212 Use id for textarea identification
this prodcues an easier compatiblity with the staticpage-plugin, and is
altogether more developer friendly than the documents.form-selector
2014-03-31 02:29:54 +02:00
onli
07ef076472 Document php-version req
#104
2014-03-28 11:15:40 +01:00
onli
a722390fbf Set needed php to >= 5.3
closes #104
2014-03-28 10:03:03 +01:00
Matthias Mees
6abc381aec A more robust solution for the off-canvas nav.
References #111
2014-03-24 20:46:02 +01:00
Ian
c69932eaae rename create() js errorHandler function to errorHandlerCreateDOM() 2014-03-24 15:19:16 +01:00
Ian
d2e34d3bcf upport missing errorToExceptionHandler() changes 2014-03-24 15:17:28 +01:00
onli
7bf373248b serendipity_editor.js.tpl without core
To have this in the plugin api didn't look right. the fallback to default works this time, so this should be alright.
2014-03-23 23:53:55 +01: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
Matthias Mees
31eba101f6 Rewrite toggle_extended function to work with wysiwyg editor.
References #102
2014-03-18 15:48:16 +01:00
Matthias Mees
5ef157063c A more subtle styling for links in field info text. 2014-03-18 15:23:08 +01:00
Matthias Mees
8ff7cdeddb Save a little space in no-js in media upload. 2014-03-18 15:15:18 +01:00
Matthias Mees
58e59a9193 Hide more things which don't make sense in no-js. 2014-03-18 15:14:23 +01:00
Matthias Mees
38c072c871 Don't show comment summary in no-js mode. 2014-03-18 15:04:51 +01:00
Ian
c024b0fa97 exclude textarea info button in case of wysiwyg
for html nugget plugin (there is no more)
2014-03-18 09:28:08 +01:00
Ian
1a72f3a8b8 set alpha4 version
References #72 upgrade part
2014-03-18 09:02:50 +01:00
Ian
76f87c5e08 cleanup note in cb0ba6c 2014-03-17 19:36:19 +01:00
Ian
cb0ba6cf7e fix non-read pre event hook for other templates
This fixes the problem of empty core backend js files
and not properly executed ckeditor inits with other templates.

References #72
closes #72
2014-03-17 14:55:37 +01:00
Ian
5fddf72bed include ckeditor.js in case of entryform, staticpages, html nuggets only
References #72
2014-03-16 16:26:21 +01:00
Ian
795410a6c9 chip another line 2014-03-16 09:44:47 +01:00
Ian
4f59ac109b fix note 2014-03-16 09:39:48 +01:00
Ian
408774cba3 move errorToException 'appendTop' javascript into 'js' hook
since this also fixes not having had this in backend_header before.
2014-03-16 09:33:20 +01:00
Ian
f509d042ab purge note, since not a tpl (2) 2014-03-15 19:46:00 +01:00
Ian
15977512dd purge note, since not a tpl 2014-03-15 19:25:34 +01:00
Ian
faae4b0533 fix core to read ckeditor and handle hook-ins
This supports custom ckeditor plugins and a custom ckeditor config
and reads $eventData for
- normal entry form (case1) textareas,
- staticpage (case2) textareas and
- other nugget plugins (case3) textareas.
They all are build differently, therfore we needed three cases.
Please test!

Based to following commits
 8e26bd9 prepare core ckeditor for custom config and plugins
 44ea050 fix virtual js
 40609d8 add backend_footer hook

References #72
2014-03-15 19:02:13 +01:00
Ian
8e26bd9711 prepare core ckeditor for custom config and plugins 2014-03-15 17:48:29 +01:00
Ian
4296b78333 fix some whitespaces 2014-03-15 17:38:31 +01:00
Ian
44ea050a13 fix virtual js 2014-03-15 17:35:37 +01:00
Ian
40609d803f add backend_footer hook 2014-03-14 20:06:11 +01:00
Ian
1471ac699c correct a typo I assume 2014-03-14 20:05:31 +01:00
Ian
9083aef7a0 minor - set hooks to use single quotes as everywhere 2014-03-14 10:20:53 +01:00
Ian
ab1230f5e1 minor - translate internal coding notes 2014-03-14 09:48:37 +01:00
Ian
0ec4723b46 fix Smarty 3.1.17 until next release 2014-03-14 08:22:23 +01:00
Ian
e7072aaf6e Smarty bugfix release 3.1.17 - read changelog 2014-03-13 17:42:20 +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
Ian
9b3443dcd6 fix 390ec689c2 2014-03-12 20:25:10 +01:00
Ian
8c2ec8a565 document new function in b3b76bfc3587ccc08226394997aeadf9ca137194 2014-03-12 19:24:01 +01:00
Ian
b3b76bfc35 prepare upgrade for htmlarea cleanup 2014-03-12 19:15:54 +01:00
Matthias Mees
ee98b0c128 Fix spelling error
References #103
2014-03-12 14:20:19 +01:00
Matthias Mees
7f58cc1f5f German translation for the new GROUP_NAME_DESC
References #106
2014-03-12 14:08:43 +01:00
Matthias Mees
b1b9886f65 New explanation for GROUP_DESC_NAME
References #106
2014-03-12 14:04:46 +01:00
Matthias Mees
5bd45c66a0 Attempt to translate this to German in an understandable way
References #106
2014-03-12 13:10:29 +01:00
Matthias Mees
470b1b376c Translated some German lang constants 2014-03-12 10:39:47 +01:00