3099 Commits

Author SHA1 Message Date
Matthias Mees
c0e8922500 Dropped redundant onclick handler.
This really isn't necessary – there is a warning plus a confirm or
abort dialogue on the following page. I don't see extra value for
users in the JS-based confirm/abort dialogue.
2013-05-31 17:40:34 +02:00
Matthias Mees
66deb345a2 Document what this does. 2013-05-31 17:11:57 +02:00
Matthias Mees
1ab2389cdb Getting rid of inline body onload. 2013-05-31 17:01:06 +02:00
Matthias Mees
a009893522 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-31 16:36:10 +02:00
Matthias Mees
6507fa5b1d Simplified current template box. 2013-05-31 16:35:53 +02:00
onli
121c796d48 revert 61ae46383effc52b0f4f7470caa3bda29cf9b1fa 2013-05-31 16:10:17 +02:00
Matthias Mees
88e5c9a1ba Extract currently selected template from template list.
Also skip currently selected template in template list. Note to
self: this needs more styling to set it off better. (If my code
can be improved, please do so. Best I could come up with.)
2013-05-31 14:47:38 +02:00
Ian
af3c686111 Update serendipity_editor.js.tpl
uarrgh
2013-05-31 12:58:18 +03:00
Ian
c980451725 Update serendipity_editor.js.tpl
Hey, never assume something is “obvious”
2013-05-31 11:57:01 +02:00
Matthias Mees
ed704a4dd7 Some minor CSS fixes. 2013-05-31 10:58:17 +02:00
Matthias Mees
0c22d50477 Removed some redundant comments. 2013-05-31 10:29:44 +02:00
Matthias Mees
3cff5465d6 Drop legacy IE support. 2013-05-31 10:23:51 +02:00
Matthias Mees
6d0106df22 Updated normalize.css to v2.1.2. 2013-05-31 10:07:47 +02:00
Ian
7316e74b65 upport master → 2.0 in 2k11/serendipity_editor.js.tpl (fixed typos)
Do not forget to remove engl short (not) notations in js file doc notes, to help github prettifier
2013-05-31 10:04:08 +03:00
Ian
61ae46383e upport master → 2.0 in 2k11/serendipity_editor.js.tpl
added CKEDITOR, some better mode switches and re-added noWysiwygAdd() since this was changed and fixed, after the jquery refactoring was done in 2.0.

Note docs should not get removed, sonce this is done automatically in any modifier.
2013-05-31 08:58:48 +02:00
Matthias Mees
f646621cc8 Styling template options button. 2013-05-30 23:15:25 +02:00
onli
2911e71bc6 Moved theme-settings to own page 2013-05-30 22:56:40 +02:00
onli
5b4146c967 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 22:20:32 +02:00
onli
ae74401668 2k11 is default template, included admin-tpls, and made it installable 2013-05-30 22:19:07 +02:00
Matthias Mees
72a6e9473a Documented a JS error I can't fix right now. 2013-05-30 22:06:42 +02:00
Matthias Mees
7f72419e3c I think that makes the backend noConflict-free. 2013-05-30 21:43:51 +02:00
onli
ff9c31b88e remove remaining tplold-links 2013-05-30 21:00:20 +02:00
onli
615a1300ec only include config if exists, fixes installer 2013-05-30 20:55:20 +02:00
Matthias Mees
6503b98e28 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 20:28:12 +02:00
Matthias Mees
ccd4fca695 No more noConflict, yay. 2013-05-30 20:27:32 +02:00
Ian
75cba2cccd upport master->2.0 default/serendipity_editor.js noWysiwygAdd()
temporary disbled jquerified function, since this did not support nugget textareas.
2013-05-30 21:16:13 +03:00
Ian
ab3f3efceb upport master->2.0 default/serendipity_editor.js CKEDITOR and mode switches
in func serendipity_imageSelector_addToBody

still did not touch my changes within noWysiwygAdd()
2013-05-30 21:08:14 +03:00
Matthias Mees
992df72fac Some changes to make the console.log thingy work in .tpl file. 2013-05-30 19:19:35 +02:00
Matthias Mees
ddadd81f4a Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 19:07:02 +02:00
Matthias Mees
b2ca3ef066 Include admin_scripts.js in serendipity_editor.js.tpl.
Also update redundant references in .tpl files.
2013-05-30 19:06:10 +02:00
Ian
5ae5329de8 Update serendipity_editor.js.tpl
remove note "..'t" notation, to have github prettify code view back
2013-05-30 19:54:54 +03:00
Matthias Mees
251f61a039 Disable jQuery noConflict mode in the backend.
NOTE: If someone can improve this, by all means: do so. And excuse
      my toddler's PHP here.
2013-05-30 18:44:42 +02:00
Matthias Mees
486985f330 Forgot to dump redundant pluginmanager.css. 2013-05-30 18:25:42 +02:00
Matthias Mees
d0d2b246e4 Include pluginmanager.css in style.css. Another HTTP request saved. 2013-05-30 18:23:54 +02:00
Matthias Mees
c2c27470ff Include header_spawn.js in serendipity_editor.js.tpl. 2013-05-30 18:13:33 +02:00
Matthias Mees
69e8f8e050 Remove redundant serendipity_editor.js references.
Since we're now including serendipity_editor.js in the index.tpl,
there's no need to load it in the body in various .tpl files any
longer.
2013-05-30 18:01:44 +02:00
Matthias Mees
9255d01d6d Must include serendipity_editor.js after jQuery. Duh. 2013-05-30 17:55:18 +02:00
Matthias Mees
f2257718c6 Move serendipity_editor.js to head.
NOTE: This is probably only temporary so that unported JS functions
      will still work. In the end, we'll want to references this
      file right before the closing </body> tag since it's going
      to get pretty big.
2013-05-30 17:48:24 +02:00
Matthias Mees
5edc98545d include 2k11.admin.js in serendipity_editor.js.tpl. 2013-05-30 17:41:35 +02:00
Matthias Mees
5058866698 Include image_selector.js in serendipity_editor.js.tpl. 2013-05-30 17:28:46 +02:00
Matthias Mees
1a3f4d37be Drop IE7 boxsizing polyfill. 2013-05-30 17:19:41 +02:00
Matthias Mees
3e536dd4a8 Move backend jQuery plugins to dedicated subdirectory.
From now on, we'll keep jQuery plugins required by the backend in
/templates/2k11/admin/js/ (as well as other vendor JS like e.g.
Modernizr).
2013-05-30 17:15:54 +02:00
onli
85c20f7b4b add autoscroll to plugins 2013-05-30 16:52:51 +02:00
onli
e4f3365414 typo 2013-05-30 16:51:01 +02:00
onli
8165bd59a4 jquery.sortable needs position: relative on the container 2013-05-30 16:49:56 +02:00
onli
a89de7da1f entryproperties: Always delete cache on uninstall 2013-05-28 18:00:27 +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
Ian
6573a64544 upport fc184b8 2013-05-28 11:44:01 +03:00
Ian
7fd2cab387 upport 4883824 2013-05-28 10:43:17 +02:00