#
3ce125b2 |
| 21-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Only indent nested includes when indent is activated
|
#
af412742 |
| 20-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Only indent content without section when "indent" is set
|
#
fb0cc518 |
| 19-Dec-2010 |
Michael Hamann <michael@content-space.de> |
(Hopefully) fix the internal link and media handling
As proposed in issue #39 the link is now resolved using resolve_id and then again transformed into an absolute link by prepending ":".
|
#
17bd59ee |
| 19-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Detect more cases where additional sections aren't necessary
|
#
fa08f439 |
| 19-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Move the section edit recognition into the helper/wrap syntax
|
#
e91599b6 |
| 19-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Move existence check to the helper in order to avoid code duplication
|
#
e200f7a8 |
| 19-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Wrap content that is not in a section in a section
At the beginning of every page there might be content that is not in a section, that is the content before the first header. When such a page is in
Wrap content that is not in a section in a section
At the beginning of every page there might be content that is not in a section, that is the content before the first header. When such a page is included in another page at a higher level this content without a section hasn't been indented properly. Now when needed a new section around that content is created.
show more ...
|
#
24a55df7 |
| 19-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Add compatibility code for the blog plugin
|
#
993fccf3 |
| 18-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Add section edit button handling
This commit fixes section edit buttons. Now section edit buttons of included pages don't interfere with buttons of the parent page anymore and all section edits of t
Add section edit button handling
This commit fixes section edit buttons. Now section edit buttons of included pages don't interfere with buttons of the parent page anymore and all section edits of the included page are closed at the end of the included page. Furthermore the id and revision of section edit buttons of included pages are correct so they should actually work. A redirect_id like in other edit buttons ensures that the user is redirected to the correct page after the edit.
show more ...
|
#
84629dd2 |
| 14-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Merge branch 'master' into render_instructions_rewrite
Conflicts: syntax/meta.php
|
#
2524d407 |
| 14-Dec-2010 |
Michael Hamann <michael@content-space.de> |
vim-modelines: Remove no longer allowed enc=utf-8
|
#
baeb8527 |
| 12-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Remove superfluous and wrong cleanID call
This call to cleanID prevented things like :id, ..:id etc. from working and is superfluous as resolve_pageid calls cleanID anyway.
|
#
791e1550 |
| 10-Dec-2010 |
Michael Hamann <michael@content-space.de> |
Restructuring, first version of new cache handling
This commit replaces user dependent include keys by just one cache for each page. This means the cache needs to be regenerated more often when e.g.
Restructuring, first version of new cache handling
This commit replaces user dependent include keys by just one cache for each page. This means the cache needs to be regenerated more often when e.g. the edit permissions are different. As this is just a renderer cache this shouldn't be a big problem. The main reason for this is that the metadata won't be correctly updated when a different cache file is used for every user.
In the metadata all include instructions are stored so when the cache is checked the list of pages that actually should be included can be reconstructed and then compared to the list of pages that has been included when the page/metadata has been rendered.
The order of the includes and the respective parent pages are taken into consideration so something like the inclusion of two user-dependent pages that include each other won't break this cache handling. I'm not sure if all scenarios are handled by this cache correctly, but I can't think of a scenario where the page should be rendered but neither the order nor the parent id nor one of the included pages has been changed. When one included page is replaced by another one because of these placeholders all sub-includes of that page will still be checked but as then the cache will be purged anyway this doesn't matter.
I've decided against just storing one level of include instructions in the metadata of every page and for storing everything in the root as reading a lot of files should imho be avoided. The metadata that is read might be outdated, but outdated metadata can only be a result of a change in one of the included pages which is handled by the file dependencies.
show more ...
|
#
1a25f14b |
| 02-Dec-2010 |
Michael Hamann <michael@content-space.de> |
New attempt of a rewrite using instructions during rendering
This patch makes the include plugin no longer do all the work in the instructions but instead during rendering the instructions of the ch
New attempt of a rewrite using instructions during rendering
This patch makes the include plugin no longer do all the work in the instructions but instead during rendering the instructions of the child pages are converted and executed in the renderer of the page itself. This means all advantages of working at instruction level are preserved, but tricky caching problems are avoided. This is still not working completely:
- The cache doesn't work at all, if your metadata is fresh the renderer cache won't be used at all - No tests have been done if ACL support is actually working (but it should) - Problems with the box plugin that have been fixed might reappear - The support for different levels hasn't been tested that thoroughly - The blog plugin will be broken with this version, perhaps compatibility fixes will be added again later - The metadata cache isn't refreshed when it should, at least in the current git version of DokuWiki
show more ...
|
#
1a7f8161 |
| 22-Nov-2010 |
Michael Hamann <michael@content-space.de> |
Resolve page id before the ACL check
|
#
ffe98079 |
| 25-Sep-2010 |
Michael Klier <chi@chimeric.de> |
removed deprecated pass-by-reference
|
#
8b6dd715 |
| 22-May-2010 |
Michael Klier <chi@chimeric.de> |
fixed some instruction handling
|
#
a0a6f8fb |
| 07-Apr-2010 |
Michael Klier <chi@chimeric.de> |
added possiblity to include tagged pages closes #28
|
#
f759f787 |
| 07-Apr-2010 |
Michael Klier <chi@chimeric.de> |
fixed macro substitution
|
#
1148b0fe |
| 07-Apr-2010 |
Michael Klier <chi@chimeric.de> |
cleanID() prior to acl checks
|
#
e5a4d2cd |
| 30-Mar-2010 |
Michael Klier <chi@chimeric.de> |
don't close open sections in some cases (box plugin)
|
#
cd4be226 |
| 30-Mar-2010 |
Michael Klier <chi@chimeric.de> |
fixed header calculation (hopefully)
|
#
b2bd09f6 |
| 29-Mar-2010 |
Michael Klier <chi@chimeric.de> |
switched to new plugin.info.txt layout
|
#
270cff7f |
| 21-Dec-2009 |
Michael Klier <chi@chimeric.de> |
another attempt to fix the metadata issue
|
#
1eec08a3 |
| 27-Nov-2009 |
Michael Klier <chi@chimeric.de> |
sort pages in namespace mode
|