Commit Graph

12786 Commits (fa2918f13f03a3d8dfd6f987a518695d7763fb01)

Author SHA1 Message Date
Joey Hess e8a23c299e Merge branch 'master' into templatemove 2010-04-23 16:48:53 -04:00
Joey Hess d5c5fef363 update 2010-04-23 16:48:37 -04:00
Joey Hess 7bba522545 Merge branch 'master' into templatemove
Conflicts:
	doc/templates.mdwn
2010-04-23 16:43:44 -04:00
Joey Hess 6486452e4c special case for page.tmpl dependency handling
Rather than wasting resources recording that every page depends on
page.tmpl, add a special case. The special case curretly rebuilds non-page
files too when page.tmpl changes, but that's minor.
2010-04-23 16:41:07 -04:00
Joey Hess 8d72e3dc09 add myclean 2010-04-23 16:40:42 -04:00
Joey Hess 96c9c8aa92 fix return of tpage 2010-04-23 16:20:02 -04:00
Joey Hess 7e79da7633 template docu reorg
Remove wikitemplates page; fold its contents into templates page.
Update all backlinks. Document new ability to put templates inside srcdir.
2010-04-23 16:14:33 -04:00
Joey Hess d822e37d0e move template documentation to the template directive
allow new templates to be created via the inline that lists them
(cherry picked from commit 83703d2f4a)
2010-04-23 15:33:32 -04:00
Joey Hess 83703d2f4a move template documentation to the template directive
allow new templates to be created via the inline that lists them
2010-04-23 15:32:39 -04:00
Joey Hess 0e68f76a9a update 2010-04-23 15:23:34 -04:00
Joey Hess d1cc7e81c8 use template() rather than rolling it by hand 2010-04-23 15:11:25 -04:00
Joey Hess 78fd3b35a2 allow template pages to not be under templates/ 2010-04-23 15:02:07 -04:00
Joey Hess ee8d237f98 improved error message 2010-04-23 14:50:00 -04:00
Joey Hess 753bfb17a0 switch to using template_depends
It now handles all the details of finding a page template that this used to
need to implement.
2010-04-23 14:45:48 -04:00
Joey Hess d4d7d5ddaf use same error string as template.pm does 2010-04-23 14:45:02 -04:00
Joey Hess 54898d16d4 allow a bare page name to be specified as a template 2010-04-23 14:44:37 -04:00
Joey Hess 011d88052d fix logic 2010-04-23 14:00:53 -04:00
Joey Hess 796ece2a8a response 2010-04-23 13:30:52 -04:00
Joey Hess a45f31ae03 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-23 13:28:49 -04:00
privat 53c8bf9ed9 multiple_sidebars in a gitbranch 2010-04-23 17:28:38 +00:00
Jon Dowland 92c927cb92 half-formed thought about accessible profiling 2010-04-23 18:28:20 +01:00
privat 4afe2d1170 add my repository in the list 2010-04-23 17:20:51 +00:00
Joey Hess e779098796 update copyright years 2010-04-23 12:35:23 -04:00
Jon Dowland f5466ad717 how important is perl 5.10? 2010-04-23 16:29:05 +01:00
Joey Hess aaf1d98ebe better fix for use lib issue
PER5LIB does not override fully, so need to run .in versions
2010-04-22 23:14:57 -04:00
Joey Hess 5bc7efab7c switch to PERL5LIB so that use lib inserted for INSTALL_BASE is overridden during build 2010-04-22 23:00:33 -04:00
Joey Hess 83dc7d2574 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-22 22:59:06 -04:00
blipvert a2feb7d477 rename bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn to bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn 2010-04-23 02:40:36 +00:00
blipvert 898fc10955 2010-04-23 02:36:27 +00:00
Joey Hess 2cd92fcb22 use meta title 2010-04-22 20:13:47 -04:00
Joey Hess 4c99904af3 reference my branch for this 2010-04-22 16:29:49 -04:00
Joey Hess 915d5bc326 add 2010-04-22 15:59:04 -04:00
Joey Hess bbd7e73f64 refactor to remove template_params
template_file will be kept separate, since it needs to be memoized
2010-04-22 15:58:06 -04:00
Joey Hess abd2339312 look for templates in srcdir and underlays, first
This entailed changing template_params; it no longer takes the template
filename as its first parameter.

Add template_depends to api and replace calls to template() with
template_depends() in appropriate places, where a dependency should be
added on the template.

Other plugins don't use template(), so will need further work.

Also, includes are disabled for security. Enabling includes only when using
templates from the templatedir would be nice, but would add a lot of
complexity to the implementation.
2010-04-22 15:55:58 -04:00
http://smcv.pseudorandom.co.uk/ 418670c7e8 map can't currently change sort ordering 2010-04-22 19:28:31 +00:00
http://seph.myopenid.com/ 8eac7c2ad4 2010-04-22 19:15:42 +00:00
Joey Hess 23d62f42bd remove add_templates option
Templates are moving into the srcdir, and will also be searched for in
configured underlays, so this is redundant.
2010-04-22 14:35:00 -04:00
Joey Hess 584391aedd clarify 2010-04-22 14:07:45 -04:00
Joey Hess ad296f90c3 add 2010-04-22 13:45:25 -04:00
Joey Hess 8dc7f3005e only remove page from influences when influences are not static
This matches what add_depends done
2010-04-22 13:17:45 -04:00
Joey Hess 1f5d1dff61 update 2010-04-22 00:42:53 -04:00
Joey Hess 170725dc3e update 2010-04-22 00:40:05 -04:00
Joey Hess 56bb1b48e4 format 2010-04-22 00:36:13 -04:00
Joey Hess 3ee571390e Merge branch 'autotag' 2010-04-22 00:34:03 -04:00
Joey Hess 0db4d920aa force rebuild from pre 20100422
to ensure those wrong massive depends_simple don't linger on systems that
rebuilt for the other reasons already
2010-04-22 00:28:58 -04:00
Joey Hess 738bd2fa1f note that the new version will have some optimisation fixes 2010-04-22 00:28:21 -04:00
Joey Hess 2b175d7c1f improved fix for depends_simple_mixup
Avoid adding the page matched against as an influence for
currently failing pagespec matches, while still adding
any other influences.

This avoids bloating depends_simple with lots of bogus influences when
matching eg, "!link(done)". It's only necessary for the page being tested
to be an influence of that if the page matches.
2010-04-22 00:18:20 -04:00
Joey Hess bc6d602609 add influence info for failed metadata matches
This is needed so that when a negated pagespec like "!author(foo)"
stops matching, due to the page being changed, ikiwiki knows that
the match was influenced by the page content.
2010-04-22 00:10:13 -04:00
Joey Hess ef34ea7c05 fix test cases for dynamic influence calculation 2010-04-22 00:07:25 -04:00
Joey Hess c98414e192 added a test case for this bug
Further analysis suggests fixing this might not be as dreadful as I first
thought!
2010-04-21 23:08:54 -04:00