diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-18 13:33:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-18 13:33:54 -0400 |
| commit | 32d4d975ae33ab90340f6bcc0e80eec3944916f3 (patch) | |
| tree | d0c08d18349fc9f81327212c106310c2d4e1c687 /doc/todo | |
| parent | 7aa209f1ce882372590ff032a1a94ad2b977544d (diff) | |
| parent | 529141779fe8492defbfa3e879c15bc81b3907dd (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/allow_displaying_number_of_comments.mdwn | 3 | ||||
| -rw-r--r-- | doc/todo/multiple_template_directories.mdwn | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn index 7e8802210..02d55fc9b 100644 --- a/doc/todo/allow_displaying_number_of_comments.mdwn +++ b/doc/todo/allow_displaying_number_of_comments.mdwn @@ -25,3 +25,6 @@ Please review... and pull :) > --[[Joey]] [[patch]] + +>> Well, the COMMENTSLINK variable fits my needs. Sorry for +>> the disturbance. [[done]] --[[intrigeri]] diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn index fe1951d51..6a474b4f3 100644 --- a/doc/todo/multiple_template_directories.mdwn +++ b/doc/todo/multiple_template_directories.mdwn @@ -50,3 +50,24 @@ I have a use case for this, a site composed of blogs and wikis, templates divide >> multiple template directories is still present. Just put them in >> the templates/ subdirectory of multiple underlay directories instead. >> --[[Joey]] + +>>>Thanks, I didn't realize this was possible. Problem solved. -- Changaco + +>>>> We can consider this [[done]], then. For reference, the solution +>>>> to the hierarchy I mentioned above would be: +>>>> +>>>> all your sites have $your_underlay as an underlay +>>>> +>>>> the blogs and wikis all have $blog_underlay or $wiki_underlay +>>>> (as appropriate) as a higher priority underlay +>>>> +>>>> every ikiwiki in the world (/usr/share/ikiwiki/templates) +>>>> \--- your site ($your_underlay/templates, or templatedir) +>>>> \--- your blogs ($blog_underlay/templates) +>>>> \--- travel blog ($srcdir/templates) +>>>> \--- code blog ($srcdir/templates) +>>>> \--- your wikis ($wiki_underlay/templates) +>>>> \--- travel wiki ($srcdir/templates) +>>>> \--- code wiki ($srcdir/templates) +>>>> +>>>> --[[smcv]] |