87 Commits

Author SHA1 Message Date
Ian
7fd42fde05 fix typo
there are more.... of this
2015-12-01 11:39:13 +01:00
Ian
d5eae21a9c suggested fix for the Serendipity fallback chaining
This fixes the plugin tpl fallback for all plugins, already using the parseTemplate() method. All others, which may still follow the themes fallback (like contactform etc), would need to always be part of the user template $serendipity['template'], or be fixed later on.

This also fixes the backend chaining, which now simply follows the force with a possible engine and then uses $serendipity['template_backend'] (2k11), $serendipity['defaultTemplate'] (2k11), 'default'.

As a third, this now uses the correct preview_iframe.tpl file on save and checks for a correct set jquery_backend.js in the user theme $serendipity['template'].

Please double check this approach for cases I did not find yet. Thanks! :)


References #343
2015-08-16 18:05:59 +02:00
Garvin Hicking
93e781048c * Make preview_iframe.tpl template files load the proper frontend
CSS file, including cache-busting version string when changing
     themes

References #302
2015-03-18 13:32:14 +01:00
Garvin Hicking
8f88998c90 only show relative dir 2015-03-13 15:03:00 +01:00
Garvin Hicking
12ddca1070 Upport.
Improved detection for possible javascript errors (i.e. PHP errors, plugins that use invalid PHP 5.4+ syntax, other causes - that people seem to hit a lot)
If the serendipity.spawn function could not be found, we emit a warning (through javascript...)

See thread on forums: http://board.s9y.org/viewtopic.php?f=11&t=20286

Conflicts:
	docs/NEWS
	lang/UTF-8/plugin_lang.php
	lang/UTF-8/serendipity_lang_bg.inc.php
	lang/UTF-8/serendipity_lang_cn.inc.php
	lang/UTF-8/serendipity_lang_cs.inc.php
	lang/UTF-8/serendipity_lang_cz.inc.php
	lang/UTF-8/serendipity_lang_da.inc.php
	lang/UTF-8/serendipity_lang_de.inc.php
	lang/UTF-8/serendipity_lang_en.inc.php
	lang/UTF-8/serendipity_lang_es.inc.php
	lang/UTF-8/serendipity_lang_fa.inc.php
	lang/UTF-8/serendipity_lang_fi.inc.php
	lang/UTF-8/serendipity_lang_fr.inc.php
	lang/UTF-8/serendipity_lang_hu.inc.php
	lang/UTF-8/serendipity_lang_is.inc.php
	lang/UTF-8/serendipity_lang_it.inc.php
	lang/UTF-8/serendipity_lang_ja.inc.php
	lang/UTF-8/serendipity_lang_ko.inc.php
	lang/UTF-8/serendipity_lang_nl.inc.php
	lang/UTF-8/serendipity_lang_no.inc.php
	lang/UTF-8/serendipity_lang_pl.inc.php
	lang/UTF-8/serendipity_lang_pt.inc.php
	lang/UTF-8/serendipity_lang_pt_PT.inc.php
	lang/UTF-8/serendipity_lang_ro.inc.php
	lang/UTF-8/serendipity_lang_ru.inc.php
	lang/UTF-8/serendipity_lang_sa.inc.php
	lang/UTF-8/serendipity_lang_se.inc.php
	lang/UTF-8/serendipity_lang_sk.inc.php
	lang/UTF-8/serendipity_lang_ta.inc.php
	lang/UTF-8/serendipity_lang_tn.inc.php
	lang/UTF-8/serendipity_lang_tr.inc.php
	lang/UTF-8/serendipity_lang_tw.inc.php
	lang/UTF-8/serendipity_lang_zh.inc.php
	lang/addlang.txt
	lang/plugin_lang.php
	lang/serendipity_lang_bg.inc.php
	lang/serendipity_lang_cn.inc.php
	lang/serendipity_lang_cs.inc.php
	lang/serendipity_lang_cz.inc.php
	lang/serendipity_lang_da.inc.php
	lang/serendipity_lang_de.inc.php
	lang/serendipity_lang_en.inc.php
	lang/serendipity_lang_es.inc.php
	lang/serendipity_lang_fa.inc.php
	lang/serendipity_lang_fi.inc.php
	lang/serendipity_lang_fr.inc.php
	lang/serendipity_lang_hu.inc.php
	lang/serendipity_lang_is.inc.php
	lang/serendipity_lang_it.inc.php
	lang/serendipity_lang_ja.inc.php
	lang/serendipity_lang_ko.inc.php
	lang/serendipity_lang_nl.inc.php
	lang/serendipity_lang_no.inc.php
	lang/serendipity_lang_pl.inc.php
	lang/serendipity_lang_pt.inc.php
	lang/serendipity_lang_pt_PT.inc.php
	lang/serendipity_lang_ro.inc.php
	lang/serendipity_lang_ru.inc.php
	lang/serendipity_lang_sa.inc.php
	lang/serendipity_lang_se.inc.php
	lang/serendipity_lang_sk.inc.php
	lang/serendipity_lang_ta.inc.php
	lang/serendipity_lang_tn.inc.php
	lang/serendipity_lang_tr.inc.php
	lang/serendipity_lang_tw.inc.php
	lang/serendipity_lang_zh.inc.php
2015-03-02 11:16:55 +01:00
Garvin Hicking
8323d9272d Expose serendipity_rewriteURL to smarty API 2015-02-11 10:34:58 +01:00
Garvin Hicking
5f7f2e5ce0 Issue #234: Granular forcing of backend popups for specific areas
References #234
2015-01-29 15:25:38 +01:00
onli
c004d90a6c Don't die in smarty_purge if file not writeable (#240) 2014-12-02 21:43:09 +01:00
onli
abba5bdb15 Make smarty_purge PHP 5.3 compatible (#240) 2014-12-01 19:04:41 +01:00
onli
a319d59eed fix serendipity_smarty_purge to delete all cache files (#240) 2014-11-30 21:36:04 +01:00
onli
92afc37753 Introduce serendipity_specialchars-wrapper for encoding bug (#236)
PHP 5.4 sets UTF-8 as the default for htmlspecialchars, htmlentities and html_entity_decode. The first two will echo an empty string when given a string with umlauts. This commits introduces serendipity_specialchar-wrapper that are meant to be a temporary solution for the s9y-core until PHP 5.6 fixed the bug, so the native charset option of s9y continues to work.
2014-11-23 23:41:08 +01:00
Ian
8f894f50f1 fix native charset böog missing smarty entry title
Basically not a Smarty error. Just a php htmlspecialchars($entry['title']) setting this var to be empty.

References #236
2014-11-21 18:03:26 +01:00
Ian
d15c4c81b8 force_frontend_fallback chaining
References #148
2014-11-19 15:23:10 +01:00
Ian
9b329c6c92 fix custom cke chainings 2014-11-19 12:57:55 +01:00
Ian
5e03dfb398 use $serendipity['template_backend']
References #148
2014-11-18 11:27:47 +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
Ian
e11cbbc88f remove in-memory caching, 60e15aa, since this needs to have enabled cache set
Since this is not possible with current template structure in Serendipity, this also removes the serendipity_smarty_class caching section and its notes to a text file.
2014-11-02 14:23:30 +01:00
Garvin Hicking
5c12922510 Personal preferene for autosave
References #213
2014-09-09 14:34:46 +02:00
Garvin Hicking
f5693b0b86 Added "clean" new option for using backend popups (disabled by default) as a per-user option
References #183
2014-06-17 09:50:26 +02:00
Ian
6f9484421e fix class exists for a6661af
Hopefully this will do - could not test this though!
2014-06-13 16:26:58 +02:00
Ian
a6661af96a there are two memcache libraries in php
For those confuse about the memcached extension and the memcache extension, the short story is that both of them are clients of memcached server, and the memcached extension offer more features than the memcache extension.
2014-06-13 16:21:54 +02:00
Ian
60e15aaaac added apc and memcache Smarty support 2014-06-13 16:07:32 +02:00
Thomas Hochstein
3acdd9403c Add URL encoding to CSS and .js links in <HEAD>.
Enocde & as &amp; to make validator happy.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2014-06-09 18:38:17 +02:00
Garvin Hicking
93d117b45d Move serendipity_html5time definition to usual function scope for better structure 2014-05-28 12:01:26 +02:00
garvinhicking
71e4a6c1a9 Issue #164 - addresses commit @917fb30 2014-05-28 11:38:59 +02:00
Ian
c46d07cde5 fixes entry preview exception - fixes #119 2014-05-24 19:41:40 +02:00
onli
694b446e1a Move serendipiy_editor.js.tpl convertion into core
http://board.s9y.org/viewtopic.php?f=11&t=19927
2014-05-16 16:13:16 +02:00
Garvin Hicking
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
onli
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
Ian
ab1230f5e1 minor - translate internal coding notes 2014-03-14 09:48:37 +01:00
Garvin Hicking
b512c16c7d Patch for APC compatibility, relative paths are bad for stat=0 config.
Thanks to absynth.
2013-12-16 23:24:56 +01:00
onli
a654b13a9a Complete include_once usage, romove constants 2013-06-22 12:32:54 +02:00
onli
cbe07715fd use include_once 2013-06-21 18:11:03 +02:00
onli
be3d4d1d74 Add plugin-hook "js"
Use $link_head_script in a smarty-template to emit the path to the generated virtual javascript file
2013-06-15 16:14:14 +02:00
onli
347311e78d rely on smarty-init-css also in the backend 2013-06-15 15:40:42 +02:00
onli
0044e210ae Remove layout.php remains 2013-06-15 15:29:54 +02:00
onli
5f565184c1 Dont call smarty->getconfigDir twice 2013-05-31 23:22:25 +02:00
onli
615a1300ec only include config if exists, fixes installer 2013-05-30 20:55:20 +02:00
onli
d566e54dfe smarty_show: use fetch, for better control 2013-05-28 17:34:24 +02:00
onli
c9e0f26fd0 cleanup of serendipity_smart_show 2013-05-28 11:53:35 +02:00
Garvin Hicking
5ec7481030 Port of patch #16 to 2.0 2013-05-06 09:47:19 +02:00
onli
e1526d87b8 added serendipity_smart_show-function to core, as it was used in multiple places like plugins and templates 2013-03-06 14:52:36 +01:00
Garvin Hicking
71ee300143 Purge browser cache using a timestamp variable when switching templates.
This should hopefully fix Ian and my problems.
2013-01-28 09:35:34 +01:00
Garvin Hicking
f1b3e3b241 backport 2012-06-13 15:22:57 +02:00
Grischa Brockhaus
e72c90a69d Merged branch 'master' into 2.0 (compatibility fixes) 2012-06-13 15:12:35 +02:00
Grischa Brockhaus
1f9630b394 Compatibility fixes. 2012-06-13 14:24:45 +02:00
Garvin Hicking
d7ef7a7a04 port everything so that 2.0 and 1.7 have the same features 2012-06-12 19:39:11 +02:00
Garvin Hicking
ba4b629816 ISO-8859-1 fallback patch so that my blog works ;) 2012-05-25 10:14:47 +02:00
Ian
4db3a08f19 corrected note typos and changed trigger_errors error LEVEL
back to Warning as before, which still is halted by the smarty error handler
2011-12-25 15:24:08 +01:00
Ian
fd0f634621 convert all $smarty->trigger_error() to native trigger_error()
with E_USER_ERROR set and
initialize the smarty object by instance
as always cleanup some tabs
2011-12-04 17:52:37 +01:00