1
0
Commit Graph

994 Commits

Author SHA1 Message Date
d4fb7207aa Port fix from wordpress to this 2014-05-14 13:02:29 +02:00
dd83225447 This is my proposal on implementing the ability to switch frontend and backend templates independently.
- This introduces a new option "template_backend" that will be set to indicate the backend template, defaults to 2k11.
- The "Engine: xxx" line in info.txt still works, but only for the frontend
- The frontend fallback chain defaults to the old "default" template to ensure that themes will work that have "old-style" HTML output
- The backend fallback chain only falls back to 2k11 and then "default"
- In the future, we will remove templates/default/admin once the mechanism is proven stable

To test this in all cases you can:

- Copy 2k11/ to 2k11-custom, edit info.txt, give it a distinct name. Edit the admin/index.tpl file to add some code to ensure that you will see that template in the backend if you pick it, or adjust the style.css or whatever.
- Copy idea/ to idea-custom, edit info.txt, add a "Engine: 2k11" line. Now you can test how a template would look like that fallsback on 2k11 instead of "default"

Those permutations can be checked and come to my mind:

- Backend: 2k11, Frontend: 2k11
- Backend: 2k11-custom, Frontend: 2k11
- Backend: 2k11, Frontend: 2k11-custom

- Backend: 2k11, Frontend: idea
- Backend: 2k11, Frontend: idea-custom

- Backend: 2k11-custom, Frontend: idea
- Backend: 2k11-custom, Frontend: idea-custom

They seem to work.

Currently the display of backend and frontend theme in templates.inc.tpl takes up some larger space. Maybe it could be prettified somehow, maybe put frontend and backend template next to each other, not beneath each other? Maybe @yellowled has some suggestions.

@onli and @ophian - please have a look at this, since you both also worked on the fallback chains. Please tell me if you have issues with this. We can easily revert, if you see this approach as not workable. This is more a "proof of concept" draft.
2014-05-14 12:58:06 +02:00
1b80ba69a1 Restore wysiwyg plugin api (#147)
Partly. Plugins still need to use a different JS, fitting for the ckeditor. And plugins are bundled in the other-part of the toolbar instead of trying to follow the (xinha-)toolbar parameter
2014-05-12 21:09:58 +02:00
3b3018b173 Fix: categories were uneditable (#135) 2014-05-12 20:31:31 +02:00
09400814d2 Include klogger, enable for trackbacks and index 2014-05-12 20:03:34 +02:00
7d8a9de746 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-05-11 23:58:34 +02:00
a815b217b8 Introduce js_backend hook
Will help when JS shall only be emitted in the frontend/backend, as with the CSS
2014-05-11 23:57:19 +02:00
542917efea Adapt collapsible plugin description to list of installed plugins.
References #125
2014-05-11 21:55:06 +02:00
ccbfcf2e66 Finish uplaod resize function (#137)
configurable, some fixes, polyfill for chrome
2014-05-08 22:37:44 +02:00
38f01b02a6 A better message for adding an image. 2014-04-30 11:26:33 +02:00
e4a0830ad1 this should maybe fix the error message in importer 2014-04-28 11:14:19 +02:00
06880647b7 fix jquerey check
template_engine in 2k11 is set to null, which is still set
2014-04-28 10:25:05 +02:00
99c1f4c87c Fix fallback chain
Engine: default in info.txt will now lead to the template to use template/default as fallback before the default-template (2k11 currently). An approach to fix #130

Also, template_engine is not automatically set to default, as this was implicitly always the case
2014-04-27 20:23:56 +02:00
Ian
cfaad3b04c enhance debug note 2014-04-25 14:01:53 +02:00
03689cdd77 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-04-25 10:56:14 +02:00
ea5295cdb3 Remove debug output 2014-04-25 10:40:36 +02:00
dfd0261cda Exclude git directories from path traversal 2014-04-25 10:39:47 +02:00
c73f21ce0d pubdate/pubDate 2014-04-25 10:39:14 +02:00
5e0c4c074e include upgrader timestamp
document recent changes
i18n for upgrader
2014-04-25 09:55:41 +02:00
Ian
10d26f6fbf fix RecursiveDirectoryIterator() UnexpectedValueException thrown for PHP >= 5.3
@mattsches please test
References #116 and http://board.s9y.org/viewtopic.php?f=1&t=19860
2014-04-24 18:56:38 +02:00
631bc150ac improve update notice: timeout, config
The updater in the dashboard needed a timeout to not kill the backend if github is not reachable
Also, this makes the check configurable
2014-04-24 18:25:56 +02:00
f704df9365 support html5 multiple upload
closes #126
2014-04-23 02:27:14 +02:00
7c8ac6822e Catch exceptions in upgrader if files or directories do not exist cp. http://board.s9y.org/viewtopic.php?f=1&t=19860 2014-04-16 23:45:16 +02:00
2fc551ac99 Fix serious issue with plugin migration. Config values where not renamed. :( 2014-04-08 11:29:25 +02:00
3d92fb099f Prevent fatal error when directory does not exist 2014-04-08 09:13:47 +02:00
a722390fbf Set needed php to >= 5.3
closes #104
2014-03-28 10:03:03 +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
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
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
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
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
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
4296b78333 fix some whitespaces 2014-03-15 17:38: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
8c2ec8a565 document new function in b3b76bfc35 2014-03-12 19:24:01 +01:00
Ian
b3b76bfc35 prepare upgrade for htmlarea cleanup 2014-03-12 19:15:54 +01:00
1927da75c1 Move plugin name in plugin description, add styling 2014-03-11 11:49:31 +01:00
b02cb1a6bc Remove redundant version number markup. 2014-03-11 10:23:20 +01:00
Ian
98cc1649f1 add plugin class name
According top request http://board.s9y.org/viewtopic.php?f=11&t=19786
2014-03-11 09:08:17 +01:00
Ian
11c3758976 cleanup 750660c 2014-03-10 17:55:02 +01:00
Ian
750660c333 fix wrong zebra in design & options
Please tell, if this can be purged here, since it is not used in general config settings.
But I am not sure if this array is also used in configure all installation tasks.
Garvin?
2014-03-10 16:30:17 +01:00
7f4dbb3e2e Include JS in installer and upgrader
This should fix issue #80 by giving serendipity_editor.js of default to the
installer and  the normal template JS to the upgrader
2014-03-09 16:00:38 +01:00
e01a754315 Installer markup cleanup
The template assumed the messages to be arrays, though only one of them was one,
and that actually seems to be a mixup from the smartification
2014-03-09 14:58:06 +01:00
Ian
9b56a35f26 exclude installerHTTPPath from serendipity_getFile
References #80
2014-03-09 13:19:38 +01:00
Ian
0a2e6964ca rename 8a21ac8 to installerHTTPPath
References #80
2014-03-09 12:59:22 +01:00
Ian
8a21ac8737 fix dffe13e for step 3
References #80
2014-03-09 12:19:47 +01:00