690 Commits

Author SHA1 Message Date
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
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
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
8165bd59a4 jquery.sortable needs position: relative on the container 2013-05-30 16:49:56 +02:00
onli
d566e54dfe smarty_show: use fetch, for better control 2013-05-28 17:34:24 +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
Matthias Mees
9f59ab6081 Use smartified serendipity_editor.js. 2013-05-27 17:23:49 +02:00
Matthias Mees
5ce2f4aeff We'll need this. Oops. 2013-05-27 17:07:02 +02:00
Matthias Mees
f2e40a87d4 Equal heights for media library elements. 2013-05-27 12:05:59 +02:00
Matthias Mees
2ae8c3dca5 Move drag 'n' drop styles to admin stylesheet.
References #6b49f49
2013-05-27 11:24:42 +02:00
Matthias Mees
73bd4bb628 Use proper markup in the footer. 2013-05-27 11:03:46 +02:00
Matthias Mees
a0333cfffc Stylesheet readability. 2013-05-27 11:00:55 +02:00
Matthias Mees
65d5cd5918 Slight tweaking of lighter color scheme. 2013-05-27 10:55:32 +02:00
onli
6b49f49ba0 ported plugin drag&drop to jquery 2013-05-24 20:40:39 +02:00
Matthias Mees
0cd4115c25 Trying out a lighter color scheme. 2013-05-11 22:00:33 +02:00
Matthias Mees
f37663053e Update AccessifyHTML5 to support main element. 2013-05-11 14:44:10 +02:00
Matthias Mees
1281376681 Use new HTML5 main element. 2013-05-11 14:07:16 +02:00
Matthias Mees
b543fae655 Updated 2k11 to v1.2.7. 2013-05-04 13:27:43 +02:00
Matthias Mees
4affeb3107 Backported 2k11 translations from master branch. 2013-03-31 22:03:24 +02:00
Matthias Mees
d4341061e5 Updated 2k11 to v1.2.6. 2013-03-30 12:55:45 +01:00
Matthias Mees
fb544e8ad5 Fixes static page date format. 2013-03-26 18:43:48 +01:00
onli
aad1ea6a01 2k11 config.inc.php: Removed debug and unused code 2013-03-06 20:42:49 +01:00