Commit Graph

6781 Commits (76bda69a92075cbe73ba64232c69e32d7346b277)

Author SHA1 Message Date
Joey Hess 2d6263b991 web commit by http://smcv.pseudorandom.co.uk/: Patched 2008-07-13 10:31:09 -04:00
Simon McVittie c588845a05 Merge branch 'css' 2008-07-13 15:29:28 +01:00
Simon McVittie f6e6d561e9 Don't set clear:both on .pagedate etc., only on .pagefooter
This removes clear:both from the trailing metadata of inlined entries as
requested by tschwinge, but if you want that feature back, you can set
.inlinefooter { clear: both; } in local.css.
2008-07-13 15:16:41 +01:00
Simon McVittie 879d780603 Add more CSS hooks to inlinepage.tmpl
* Wrap everything before the content in <div class="inlineheader">
* Wrap the inlined content itself in <div class="inlinecontent">
* Wrap everything after the content in <div class="inlinefooter">
2008-07-13 15:13:20 +01:00
Simon McVittie fe242ad996 Add more stylesheet hooks to the page template
* Wrap header stuff, including actions, in <div class="pageheader">
  (there is already a class="header", which is a subset of this, so
  using id="header" would be confusing)
* Add class="pagefooter" to the existing <div id="footer">, for symmetry
2008-07-13 15:09:37 +01:00
Joey Hess 74bc4af998 web commit by http://smcv.pseudorandom.co.uk/: on second thoughts, more changes are desirable 2008-07-13 09:50:33 -04:00
Joey Hess 4ad9680d52 web commit by http://smcv.pseudorandom.co.uk/: suggest solution 2008-07-13 09:45:59 -04:00
Joey Hess a6b4d94e0c web commit by http://mornfall.myopenid.com/ 2008-07-13 08:03:27 -04:00
Joey Hess 154a572ec6 make errors red 2008-07-12 23:45:36 -04:00
Joey Hess 180c963074 revert eval change 2008-07-12 23:45:21 -04:00
Joey Hess 0b140ed1c8 avoid hardlinking files owned by others
If hardlinks are enabled, it would hardlink files from the underlay. That
was sorta annoying if you tried to edit by hand for some reason, so let's
not. Files that are hardlinked should be rare enough that a few extra stats
won't hurt.
2008-07-12 23:31:27 -04:00
Joey Hess e3c0e49774 only htmlize errors when cgi is actually running 2008-07-12 23:23:25 -04:00
Joey Hess e4e3d7e2d4 convert fatal error to warning
Since perlmagick is not a hard dep, and goodstuff is enabled by default,
imgs should not crash builds
2008-07-12 20:21:42 -04:00
Joey Hess 71fba7791f add perlmagick to build deps
needed since the doc wiki is using an [[img]]
2008-07-12 20:20:26 -04:00
Simon McVittie e41e96f832 Merge branch 'bugs' 2008-07-12 23:01:42 +01:00
Simon McVittie 60dc17c39c Hopefully fix regression tests in non-English environments 2008-07-12 23:00:57 +01:00
Simon McVittie ac8a862a06 Merge branch 'master' of git://git.ikiwiki.info into bugs 2008-07-12 22:56:55 +01:00
Joey Hess 44e42209a8 web commit by http://smcv.pseudorandom.co.uk/: I think I know what's wrong here too 2008-07-12 17:56:38 -04:00
Joey Hess 1cbcdd2d8a web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 17:54:21 -04:00
Simon McVittie 5fe26d6bfc Merge branch 'bugs' 2008-07-12 22:53:25 +01:00
Simon McVittie bed1f1037a Add missing requirement of IkiWiki::render before starting to render things 2008-07-12 22:52:46 +01:00
Joey Hess 85cc90cccd web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 17:50:51 -04:00
Joey Hess 99523151a8 web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 17:48:41 -04:00
Joey Hess 40975cd29d web commit by intrigeri: initial bug submission 2008-07-12 17:47:51 -04:00
Simon McVittie f59d7f1e9b Merge branch 'master' of git://git.ikiwiki.info 2008-07-12 22:44:36 +01:00
Joey Hess ce4c5142b0 web commit by intrigeri: update, found a possible (random) fix 2008-07-12 17:40:25 -04:00
Joey Hess 299fd7fa2e web commit by intrigeri: bug submission 2008-07-12 17:32:13 -04:00
Joey Hess 4f51703fea web commit by intrigeri: bug submission 2008-07-12 17:25:43 -04:00
Joey Hess 9b62dac4bc web commit by intrigeri: changed my mind, sorry 2008-07-12 17:15:08 -04:00
Simon McVittie 23a3de5e8c Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal 2008-07-12 19:01:56 +01:00
Joey Hess 3f38fab150 sounds good 2008-07-12 13:30:54 -04:00
Joey Hess 065ac90e0a web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 13:28:47 -04:00
Simon McVittie 5c0896e674 Make aggregated items be internal pages if --aggregateinternal is used.
This addresses <http://ikiwiki.info/todo/aggregate_to_internal_pages/>
in a simple way. With this approach, a flag day is required, on which all
users of aggregated pages start to inline them using the internal() pagespec;
after that, the aggregateinternal option can safely be switched on in the
setup file (and the old aggregated pages can be deleted by hand).
2008-07-12 18:15:11 +01:00
Joey Hess ee4e6058e3 update, splitting parameters in two
fixed some unclear descriptions
2008-07-12 12:52:06 -04:00
Joey Hess 208ccbed0e changelog 2008-07-12 12:43:02 -04:00
Simon McVittie e1f66dafca Fix link from meta plugin to tips/howto_stop_flooding_aggregators 2008-07-12 17:36:23 +01:00
Simon McVittie 9a184badf5 Stop prepending urn:uuid: to guids that look like UUIDs 2008-07-12 17:34:40 +01:00
Simon McVittie b269835a7f Re-work [[meta guid=""]] documentation, and stop claiming that urn:uuid: is automatically prepended 2008-07-12 17:33:40 +01:00
Simon McVittie f517121d64 Document [[inline guid="..."]] 2008-07-12 17:27:54 +01:00
Simon McVittie 415c8e0cb5 Rename [[!inline atomid="..."]] to [[!inline guid="..."]] to be consistent with [[!meta guid="..."]], which also outputs an Atom <id> 2008-07-12 17:12:37 +01:00
Simon McVittie 2bd8ada5a6 Accept [[!inline ... atomid="..."]] and use it to populate the feed's Atom <id>.
This is often the same as the feed's <link> (in which case it can be omitted) but sometimes it's a urn:uuid: URN instead.
2008-07-12 17:09:41 +01:00
Simon McVittie 50ec532bba Add MIME type to Atom feeds' <link rel='self'> 2008-07-12 17:09:35 +01:00
Joey Hess 52cccc6fd4 remove example (which was lacking escaping) 2008-07-12 12:04:47 -04:00
Joey Hess 6255c88e89 fixed 2008-07-12 12:04:10 -04:00
Joey Hess f707d62481 Merge commit 'smcv/master' 2008-07-12 12:02:57 -04:00
Joey Hess d101269bde Move yesno function out of inline and into IkiWiki core, not exported. 2008-07-12 12:01:22 -04:00
Joey Hess d36361b010 web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 12:01:05 -04:00
Joey Hess e93ec71748 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:

	doc/todo/aggregate_to_internal_pages.mdwn
2008-07-12 11:58:11 -04:00
Joey Hess cbfcaede12 response 2008-07-12 11:56:44 -04:00
Joey Hess f3b561721b web commit by http://smcv.pseudorandom.co.uk/: reference a patch 2008-07-12 11:52:54 -04:00