From dc3b9934d5660a085d9b5e041b7e8749493b9360 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 18 Mar 2012 17:01:45 +0000 Subject: [PATCH 1/1] Move trail out of the contrib directory in preparation for eventual merge --- .../ikiwiki/directive/trailinline.mdwn | 2 +- .../ikiwiki/directive/trailitem.mdwn | 2 +- .../ikiwiki/directive/trailitems.mdwn | 2 +- .../ikiwiki/directive/traillink.mdwn | 2 +- .../ikiwiki/directive/trailoptions.mdwn | 2 +- doc/plugins/{contrib => }/trail.mdwn | 57 ------------------- 6 files changed, 5 insertions(+), 62 deletions(-) rename doc/{plugins/contrib => }/ikiwiki/directive/trailinline.mdwn (90%) rename doc/{plugins/contrib => }/ikiwiki/directive/trailitem.mdwn (75%) rename doc/{plugins/contrib => }/ikiwiki/directive/trailitems.mdwn (92%) rename doc/{plugins/contrib => }/ikiwiki/directive/traillink.mdwn (93%) rename doc/{plugins/contrib => }/ikiwiki/directive/trailoptions.mdwn (88%) rename doc/plugins/{contrib => }/trail.mdwn (54%) diff --git a/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn b/doc/ikiwiki/directive/trailinline.mdwn similarity index 90% rename from doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn rename to doc/ikiwiki/directive/trailinline.mdwn index 91d8a4edf..e32fb34d0 100644 --- a/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn +++ b/doc/ikiwiki/directive/trailinline.mdwn @@ -1,5 +1,5 @@ The `trailinline` directive is provided by the -[[!iki plugins/contrib/trail desc=trail]] +[[!iki plugins/trail desc=trail]] plugin. It is equivalent to combining [[ikiwiki/directive/trailitems]] and [[ikiwiki/directive/inline]] directives with the same options. diff --git a/doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn b/doc/ikiwiki/directive/trailitem.mdwn similarity index 75% rename from doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn rename to doc/ikiwiki/directive/trailitem.mdwn index 73b1985a5..59626b5a1 100644 --- a/doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn +++ b/doc/ikiwiki/directive/trailitem.mdwn @@ -1,5 +1,5 @@ The `trailitem` directive is supplied by the -[[!iki plugins/contrib/trail desc=trail]] plugin. It is used like this: +[[!iki plugins/trail desc=trail]] plugin. It is used like this: \[[!trailitem some_other_page]] diff --git a/doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn b/doc/ikiwiki/directive/trailitems.mdwn similarity index 92% rename from doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn rename to doc/ikiwiki/directive/trailitems.mdwn index 4106ed33b..b1ba8d356 100644 --- a/doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn +++ b/doc/ikiwiki/directive/trailitems.mdwn @@ -1,5 +1,5 @@ The `trailitems` directive is supplied by the -[[!iki plugins/contrib/trail desc=trail]] plugin. It adds pages +[[!iki plugins/trail desc=trail]] plugin. It adds pages to the trail represented by the current page, without producing any output on that page. diff --git a/doc/plugins/contrib/ikiwiki/directive/traillink.mdwn b/doc/ikiwiki/directive/traillink.mdwn similarity index 93% rename from doc/plugins/contrib/ikiwiki/directive/traillink.mdwn rename to doc/ikiwiki/directive/traillink.mdwn index 0e40e2411..090e2538d 100644 --- a/doc/plugins/contrib/ikiwiki/directive/traillink.mdwn +++ b/doc/ikiwiki/directive/traillink.mdwn @@ -1,5 +1,5 @@ The `traillink` directive is supplied by the -[[!iki plugins/contrib/trail desc=trail]] +[[!iki plugins/trail desc=trail]] plugin. It generates a visible [[ikiwiki/WikiLink]], and also adds the linked page to the trail represented by the page containing the directive. diff --git a/doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn b/doc/ikiwiki/directive/trailoptions.mdwn similarity index 88% rename from doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn rename to doc/ikiwiki/directive/trailoptions.mdwn index e1603f11b..d83f444c0 100644 --- a/doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn +++ b/doc/ikiwiki/directive/trailoptions.mdwn @@ -1,5 +1,5 @@ The `trailoptions` directive is supplied by the -[[!iki plugins/contrib/trail desc=trail]] plugin. It sets options for the +[[!iki plugins/trail desc=trail]] plugin. It sets options for the trail represented by this page. \[[!trailoptions sort="meta(title)" circular="no"]] diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/trail.mdwn similarity index 54% rename from doc/plugins/contrib/trail.mdwn rename to doc/plugins/trail.mdwn index bfd4d3d0b..406d40246 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/trail.mdwn @@ -1,60 +1,3 @@ -[[!tag patch]] -[[!template id=gitbranch branch=smcv/trail3 author="[[smcv]]"]] - -Available from [[smcv]]'s git repository, in the `trail3` branch. This -plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be -used for [[navigation through blog posts|todo/Pagination_next_prev_links]]. - -If you don't want to use a branch of ikiwiki, manual installation requires -these files (use the "raw" link in gitweb to download): - -* [trail.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/IkiWiki/Plugin/trail.pm) - in an `IkiWiki/Plugin` subdirectory of your configured `plugindir` -* [page.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/templates/page.tmpl) - and - [trails.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/templates/trails.tmpl) - in your configured `templatedir`, or a `templates` subdirectory of your wiki repository -* the trail-related bits from the end of the - [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/doc/style.css) - (put them in your local.css) -* the trail-related bits at the end of the - [actiontabs](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/themes/actiontabs/style.css) - or [blueview/goldtype](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/themes/blueview/style.css) - stylesheets, if you use one of those themes (again, put them in your local.css) - -The branch also includes [[todo/test_coverage]] machinery. - -Demo: - -* [in use on entries in my blog](http://smcv.pseudorandom.co.uk/) -* [a demo trail based on links](http://demo.hosted.pseudorandom.co.uk/trail/) -* [a demo hybrid trail/inline](http://demo.hosted.pseudorandom.co.uk/trail2/) - -The page `e` is in both demo trails, to demonstrate how a page in more than -one trail looks. - -The `smcv/trail2` branch is an older version of `trail3` which used typed links -as its data structure, resulting in timing-related limitations (it couldn't -select pages for the trail by using pagespecs, because pagespecs can't be -evaluated correctly until the scan stage has finished). - -Updated, November 2011: - -* reinstated `inline` integration ([[report]] integration would probably be - pretty easy too, if this gets merged) -* switched from typed links back to a custom data structure to avoid - chicken/egg problems with ordering -* create typed links too, as a side-effect, but not when using an inline -* regression test with nearly full coverage -* CSS for the default anti-theme and all built-in themes (it looks nicest - in the default anti-theme and in actiontabs - the demo uses actiontabs) - -Known bugs: - -* the blueview and goldtype CSS nearly work, but the alignment is a bit off - ----- - [[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]] [[!tag type/chrome]] -- 2.44.0