1
0
Commit Graph

1157 Commits

Author SHA1 Message Date
531ccfc0a0 Remove bad ":" which messes up concatenation of constants that already have punctuation 2015-06-30 11:05:26 +02:00
28d00949f4 Suppress install backend button if frontend theme == backend theme
References #347
2015-06-13 09:15:51 +02:00
1c33d93a18 Add 'install backend' button to selected frontend theme
References #347
2015-06-13 09:11:17 +02:00
Ian
1b1a130e38 document better multiple nugget example gratia plugin
contactform will probably change, when this fixes are out.
2015-06-01 16:51:28 +02:00
Ian
eaee2d1f3a remove unused select debug code
fit linebreaked and param whitespaces
2015-06-01 15:10:47 +02:00
Ian
1e6fda11e7 emit multiple nuggets for core JS-Editor
and only use Spawnnuggets if exist.

This is for multi-nugget-textareas, not using the wysiwyg* event hooks, eg contactform plugin < v.1.17
2015-06-01 14:34:18 +02:00
780b7166b8 Remove default style on footer i element in 2k11
To make the theme name stand out less, but still have the semantic
value of the i element.
2015-05-19 19:20:40 +02:00
9715fe4b94 Remove repository link from 2k11's footer
The 2k11 repository has been discontinued since the theme was
moved to the s9y core. It should no longer endorse the old and
outdated repository by linking to it.
2015-05-19 19:13:25 +02:00
Ian
ffa6493677 textarea.cke_source patch needs to support webkit for html nugget plugins too 2015-05-05 17:02:06 +02:00
Ian
c786d457a7 single plugin textarea moz source styles 2015-03-31 16:58:37 +02:00
Ian
590d2d88ae better cke source moz style 2015-03-31 12:19:45 +02:00
9032f24f4b Show rescale in ML-popup when toolbar is active (#281) 2015-03-26 23:55:22 +01:00
e7d822be11 Things I noticed for s9y.github.io 2015-03-19 16:17:30 +01:00
Ian
222cfe5c16 better moz cke source styles 2015-03-18 19:00:14 +01:00
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
6175559fda Change theme demo link to theme demo button
References #314
2015-03-16 17:03:11 +01:00
0cce92d4d7 Add ability to preview demo themes in spartacus. 2015-03-16 14:31:34 +01:00
Ian
72f316712b fix cke_source code linebreak view for Mozillas 2015-03-16 11:08:42 +01:00
27cf643135 Show ML toolbar when inserting image (#281)
This commit has two parts: First, media_items was changed to show (parts) of the image toolbar also when being in the editor popup, if the option is enabled. Second, it modifies the rename and the delete button of that toolbar to use ajax, because they otherwise would return to the normal ML. TODO1: Ajaxify the rescale function as well, or make it redirect properly, so the button can be enabled. TODO2: See if the code in media_items can be simplified, it is a dumb translation of the existing approach
2015-03-14 22:02:49 +01:00
73dc7a9225 ML: Show add-button in popup also when empty 2015-03-14 19:42:42 +01:00
9ad1dd9312 Add SEO meta elements to core templates
References #310
2015-03-14 12:41:56 +01:00
cabad4a933 Escape entry title in dashboard
References #322
2015-03-12 19:03:42 +01:00
94eb2b32de We also need to escape the JS at this point 2015-03-12 12:23:52 +01:00
bdd6c4fb17 Fix missing escaping (possible XSS) of category names in the Backend
Entry Admin, which would allow editors that create a forged
category name to attack other editors in the backend (privileged
access to the backend required).
Thanks a lot to Edric Teo for reporting this issue.
2015-03-12 10:16:59 +01:00
d84cd93c57 Remove legacy CSS for template_preview 2015-03-11 17:50:43 +01:00
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
b5b28450f3 Remove legacy div + styles from 2k11's preview
References #307
2015-02-22 21:13:09 +01:00
e932ad78b0 Add extra test for localStorage
localStorage may be deactivated by setting a config option or using
security-related extensions at least in some browsers, which might
(at least in FF) break backend JS functionality.

So we need an extra check if localStorage is null.

References #306
2015-02-17 18:22:58 +01:00
e7502ef9bc manually restore from before merge
The merge in 7740886ff9 accidentally overwrote changes that were important. This commit tries to restore them while also keeping the additions from feature_updateAll.
2015-02-15 20:04:33 +01:00
7740886ff9 Merge branch 'feature_updateAll'
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
	templates/2k11/admin/style.css
2015-02-15 19:22:15 +01:00
a7c2d5b868 Fix CSS regression due to markup changes in ddac2c
References #301
2015-02-13 20:05:12 +01:00
ddac2c8048 Fix media chooser preview in theme options config group
Firefox-only bug if responsive img is a descendant of a fieldset.
Related to 67864f195f.

References #301
2015-02-13 19:42:09 +01:00
0e66dbd79a Remove user.css reference and theme options
Affected themes: bulletproof, 2k11, next

These themes will use the core method of including the user.css in
serendipity.css starting with 2.0.1. A note has been added to all
three themes' theme options to document that the possibility of a
user.css exists.

References #280
2015-02-11 16:10:58 +01:00
3605937049 Fix Issue #299 2015-02-11 14:28:14 +01:00
b5af1289f2 Add spacing for custom items in configuration groups
Most notably, this will affect custom theme config options.
2015-02-10 12:45:54 +01:00
430d364a88 Only expand non-overlayed cats/tags if necessary
References #290
2015-02-08 17:37:10 +01:00
d6ad3ad3c4 Hide cat view toggle button in non-overlayed cat view
References #290
2015-02-08 16:58:53 +01:00
6249a6af5e Add generic odd/even for dashboard widgets
- Use CSS for odd/even spacing + clearing in browsers that support
  it using :nth-child and the new class .dashboard_widget (to
  seperate positioning styles from visual styles)
- 'Polyfill' said behaviour for IE 8 using JS
- Adapt hardcoded dashboard sections accordingly
- Add fix for IE 8 where mq_small is not set properly
- New build of oldie.css

References #297
2015-02-08 16:15:06 +01:00
6f6410adb4 Make sure form element do not overflow their containers
References #296
2015-02-06 20:38:46 +01:00
Ian
a1e0f7c8e9 Merge branch 'master' of github.com:s9y/Serendipity 2015-02-04 18:03:17 +01:00
Ian
d584a7febb move backend_dashboard hook
may certainly as well be, to move the s9y_links block on top of all since not getting boxed, see http://board.s9y.org/viewtopic.php?f=4&t=20247
May need follow-up, if we we have a more general dashboard even/odd cycler function to avoid making each hooked-in plugin to reinvent the wheel...!
2015-02-04 18:02:35 +01:00
b204d8b179 Adapt layout in theme options media preview
References #288
2015-02-04 17:44:47 +01:00
Ian
3077b4747d Use strict frontend template fallback
in case it is used as a copy template, see http://board.s9y.org/viewtopic.php?f=11&p=10441860#p10441860

Extra Note by Garvin :)
If you create a custom theme to be used with Serendipity 2.0+, use serendipity_getTemplateFile(..., 'serendipityHTTPPath', true) whenever you reference files that are relevant to the frontend output inside your config.inc.php file. The distinction of Backend and Frontend themes in Serendipity 2.0 will otherwise try to search for a file in the backend-directory of a theme, because the theme configuration screen is displayed within the backend, not the frontend
2015-02-04 15:28:30 +01:00
Ian
a576ee8ec9 Revert "Use strict frontend template fallback"
This reverts commit 8788403baa.
2015-02-04 15:26:41 +01:00
Ian
8788403baa Use strict frontend template fallback
in case it is used as a copy template, see http://board.s9y.org/viewtopic.php?f=11&p=10441860#p10441860

Extra Note by Garvin :)
If you create a custom theme to be used with Serendipity 2.0+, use serendipity_getTemplateFile(..., 'serendipityHTTPPath', true) whenever you reference files that are relevant to the frontend output inside your config.inc.php file. The distinction of Backend and Frontend themes in Serendipity 2.0 will otherwise try to search for a file in the backend-directory of a theme, because the theme configuration screen is displayed within the backend, not the frontend
2015-02-04 15:23:21 +01:00
Ian
12eb66a669 Revert "Use strict frontend template fallback"
This reverts commit 4d0daa24d0.
2015-02-04 15:14:28 +01:00
Ian
4d0daa24d0 Use strict frontend template fallback
in case it is used as a copy template, see
http://board.s9y.org/viewtopic.php?f=11&p=10441860#p10441860
2015-02-04 14:40:05 +01:00
4665bb6598 Rework messages emitted by upload/delete in media db
Due to a regression in how these messages are emitted, these now
need to emit their msg markup in include/admin/images.inc.php or
include/functions_images.inc.php to avoid nested msg containers.

References #287
2015-02-03 18:46:47 +01:00
02cf5a3f29 Do not hide <br> elements in .msg_*
As much as I hate these, but this was not a good idea in hindsight.

References #287
2015-02-03 17:09:46 +01:00
3b36be9beb Better fix for obsolete msg wrapper for deleting media db dirs
Courtesy of @ophian

References #287
2015-02-03 14:08:57 +01:00