simplified plugin definitions

2007-02-13 18:51:21 +00:00 · 2007-02-13 18:51:21 +00:00 · 19c58ac7c1
parent 716b0486f4
commit 19c58ac7c1
47 changed files with 48 additions and 47 deletions
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=aggregate included=1 author="[[Joey]]"]]
+[[template id=plugin name=aggregate author="[[Joey]]"]]
 [[tag type/useful]]

 This plugin allows content from other feeds to be aggregated into the wiki.
--- a/doc/plugins/anonok.mdwn
+++ b/doc/plugins/anonok.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=anonok included=1 author="[[Joey]]"]]
+[[template id=plugin name=anonok author="[[Joey]]"]]
 [[tag type/auth]]

 By default, anonymous users cannot edit the wiki. This plugin allows
--- a/doc/plugins/brokenlinks.mdwn
+++ b/doc/plugins/brokenlinks.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=brokenlinks included=1 author="[[Joey]]"]]
+[[template id=plugin name=brokenlinks author="[[Joey]]"]]
 [[tag type/link type/meta]]

 This plugin generates a list of broken links on pages in the wiki. This is
--- a/doc/plugins/camelcase.mdwn
+++ b/doc/plugins/camelcase.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=camelcase included=1 author="[[Joey]]"]]
+[[template id=plugin name=camelcase author="[[Joey]]"]]

 This plugin makes words in CamelCase be treated as a [[WikiLink]]. That is
 to say, any two or more words capitalised and mashed together are assumed
--- a/doc/plugins/conditional.mdwn
+++ b/doc/plugins/conditional.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=conditional core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=conditional core=1 author="[[Joey]]"]]
 [[tag type/format]]

 With this plugin, you can make text be conditionally displayed on a page.
--- a/doc/plugins/ddate.mdwn
+++ b/doc/plugins/ddate.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=ddate included=1 author="[[Joey]]"]]
+[[template id=plugin name=ddate author="[[Joey]]"]]
 [[tag type/fun]]

 Enables use of Discordian dates. `--timeformat` can be used to change
--- a/doc/plugins/favicon.mdwn
+++ b/doc/plugins/favicon.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=favicon included=1 author="[[Joey]]"]]
+[[template id=plugin name=favicon author="[[Joey]]"]]
 [[tag type/chrome]]

 If this plugin is enabled, then an icon link is added to pages, for web
--- a/doc/plugins/fortune.mdwn
+++ b/doc/plugins/fortune.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=fortune included=1 author="[[Joey]]"]]
+[[template id=plugin name=fortune author="[[Joey]]"]]
 [[tag type/fun]]

 This just uses the `fortune` program to insert a fortune into the page.
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=goodstuff included=1 author="[[Joey]]"]]
+[[template id=plugin name=goodstuff author="[[Joey]]"]]
 [[tag type/bundle]]

 This plugin enables a bunch of other plugins -- basically all the ones that
--- a/doc/plugins/googlecalendar.mdwn
+++ b/doc/plugins/googlecalendar.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=linkmap included=1 author="[[Joey]]"]]
+[[template id=plugin name=googlecalendar author="[[Joey]]"]]
 [[tag type/special-purpose]]

 This plugin allows embedding a google calendar iframe in the wiki.
--- a/doc/plugins/haiku.mdwn
+++ b/doc/plugins/haiku.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=haiku included=1 author="[[Joey]]"]]
+[[template id=plugin name=haiku author="[[Joey]]"]]
 [[tag type/fun]]

 This plugin allows inserting a randomly generated haiku into a wiki page.
--- a/doc/plugins/html.mdwn
+++ b/doc/plugins/html.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=html included=1 author="[[Joey]]"]]
+[[template id=plugin name=html author="[[Joey]]"]]
 [[tag type/html type/format]]

 This plugin lets html pages be used as source pages for the wiki. The
--- a/doc/plugins/htmlscrubber.mdwn
+++ b/doc/plugins/htmlscrubber.mdwn
@ -1,5 +1,4 @@
-[[template id=plugin name=htmlscrubber core=1 included=1
-author="[[Joey]]"]]
+[[template id=plugin name=htmlscrubber core=1 author="[[Joey]]"]]
 [[tag type/html type/core]]

 This plugin is enabled by default. It sanitizes the html on pages it renders
--- a/doc/plugins/htmltidy.mdwn
+++ b/doc/plugins/htmltidy.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=htmltidy included=1 author="Faidon Liambotis"]]
+[[template id=plugin name=htmltidy author="Faidon Liambotis"]]
 [[tag type/html]]
 [[tag type/slow]]

--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=httpauth included=1 author="Alec Berryman"]]
+[[template id=plugin name=httpauth author="Alec Berryman"]]
 [[tag type/auth]]

 This plugin allows HTTP basic authentication to be used to log into the
--- a/doc/plugins/img.mdwn
+++ b/doc/plugins/img.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=img included=1 author="Christian Mock" ]]
+[[template id=plugin name=img author="Christian Mock"]]
 [[tag type/chrome]]

 This is an image handling plugin. While ikiwiki supports inlining full-size
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=inline core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=inline core=1 author="[[Joey]]"]]
 [[tag type/core]]

 This is a [[PreProcessorDirective]] that allows including one wiki page
--- a/doc/plugins/linkmap.mdwn
+++ b/doc/plugins/linkmap.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=linkmap included=1 author="Joey Hess"]]
+[[template id=plugin name=linkmap author="Joey Hess"]]
 [[tag type/meta]]
 [[tag type/slow]]
 This plugin uses [graphviz](http://www.graphviz.org/) to generate a graph showing the links between a
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=lockedit core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=lockedit core=1 author="[[Joey]]"]]
 [[tag type/auth]]

 This plugin enables [[page_locking]]. It is enabled by default.
--- a/doc/plugins/map.mdwn
+++ b/doc/plugins/map.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=map included=1 author="Alessandro Dotti Contra"]]
+[[template id=plugin name=map author="Alessandro Dotti Contra"]]
 [[tag type/meta]]

 This plugin generates a hierarchical page map for the wiki. Example usage:
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=mdwn core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=mdwn core=1 author="[[Joey]]"]]
 [[tag type/format type/core]]

 This plugin lets ikwiki convert files with names ending in ".mdwn" to html.
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=meta included=1 author="[[Joey]]"]]
+[[template id=plugin name=meta author="[[Joey]]"]]
 [[tag type/meta]]

 This plugin allows inserting arbitrary metadata into the source of a page.
--- a/doc/plugins/mirrorlist.mdwn
+++ b/doc/plugins/mirrorlist.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=mirror included=1 author="[[Joey]]"]]
+[[template id=plugin name=mirror author="[[Joey]]"]]
 [[tag type/special-purpose]]

 This plugin allows adding links a list of mirrors to each page in the
--- a/doc/plugins/opendiscussion.mdwn
+++ b/doc/plugins/opendiscussion.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=opendiscussion included=1 author="[[Joey]]"]]
+[[template id=plugin name=opendiscussion author="[[Joey]]"]]
 [[tag type/auth]]

 This plugin allows editing of Discussion pages by anonymous users who have
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=openid included=1 author="[[Joey]]"]]
+[[template id=plugin name=openid author="[[Joey]]"]]
 [[tag type/auth]]

 This plugin allows users to use their [OpenID](http://openid.net/) to log
--- a/doc/plugins/orphans.mdwn
+++ b/doc/plugins/orphans.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=orphans included=1 author="[[Joey]]"]]
+[[template id=plugin name=orphans author="[[Joey]]"]]
 [[tag type/meta]]

 This plugin generates a list of possibly orphaned pages -- pages that no
--- a/doc/plugins/otl.mdwn
+++ b/doc/plugins/otl.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=otl included=1 author="[[Joey]]"]]
+[[template id=plugin name=otl author="[[Joey]]"]]
 [[tag type/format]]

 This plugin allows ikiwiki to process `.otl` outline files, as created by 
--- a/doc/plugins/pagecount.mdwn
+++ b/doc/plugins/pagecount.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=pagecount included=1 author="[[Joey]]"]]
+[[template id=plugin name=pagecount author="[[Joey]]"]]
 [[tag type/meta]]

 Provides a \\[[pagecount ]] [[PreProcessorDirective]] that is replaced with
--- a/doc/plugins/pagestats.mdwn
+++ b/doc/plugins/pagestats.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=pagestate included=1 author="Enrico Zini"]]
+[[template id=plugin name=pagestate author="Enrico Zini"]]
 [[tag type/meta type/tags]]

 This plugin can generate stats about how pages link to each other. It can
--- a/doc/plugins/passwordauth.mdwn
+++ b/doc/plugins/passwordauth.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=passwordauth core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=passwordauth core=1 author="[[Joey]]"]]
 [[tag type/auth]]
 [[tag type/core]]

--- a/doc/plugins/poll.mdwn
+++ b/doc/plugins/poll.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=poll included=1 author="[[Joey]]"]]
+[[template id=plugin name=poll author="[[Joey]]"]]
 [[tag type/useful]]

 This plugin allows you to create online polls in the wiki. Here's an
--- a/doc/plugins/polygen.mdwn
+++ b/doc/plugins/polygen.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=polygen included=1 author="Enrico Zini"]]
+[[template id=plugin name=polygen author="Enrico Zini"]]
 [[tag type/fun]]

 This plugin allows inserting text generated by polygen into a wiki page.
--- a/doc/plugins/rawhtml.mdwn
+++ b/doc/plugins/rawhtml.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=rawhtml included=1 author="[[Joey]]"]]
+[[template id=plugin name=rawhtml author="[[Joey]]"]]
 [[tag type/html type/format]]

 This plugin changes how ikiwiki handles html files, making it treat html
--- a/doc/plugins/rst.mdwn
+++ b/doc/plugins/rst.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=rst included=1 author="Sergio Talens-Oliag"]]
+[[template id=plugin name=rst author="Sergio Talens-Oliag"]]
 [[tag type/format]]
 [[tag type/slow]]

--- a/doc/plugins/search.mdwn
+++ b/doc/plugins/search.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=search included=1 author="[[Joey]]"]]
+[[template id=plugin name=search author="[[Joey]]"]]
 [[tag type/useful]]

 This plugin is included in ikiwiki, but is not enabled by default. It adds
--- a/doc/plugins/shortcut.mdwn
+++ b/doc/plugins/shortcut.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=shortcut included=1 author="[[Joey]]"]]
+[[template id=plugin name=shortcut author="[[Joey]]"]]
 [[tag type/format]]

 This plugin allows external links to commonly linked to sites to be made
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=sidebar included=1 author="Tuomo Valkonen"]]
+[[template id=plugin name=sidebar author="Tuomo Valkonen"]]
 [[tag type/chrome]]

 If this plugin is enabled, then a sidebar is added to pages in the wiki.
--- a/doc/plugins/signinedit.mdwn
+++ b/doc/plugins/signinedit.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=signinedit core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=signinedit core=1 author="[[Joey]]"]]
 [[tag type/auth]]

 This plugin, which is enabled by default, requires users be logged in
--- a/doc/plugins/smiley.mdwn
+++ b/doc/plugins/smiley.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=smiley included=1 author="[[Joey]]"]]
+[[template id=plugin name=smiley author="[[Joey]]"]]
 [[tag type/chrome]]

 This plugin makes it easy to insert smileys and other special symbols into
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=tag included=1 author="[[Joey]]"]]
+[[template id=plugin name=tag author="[[Joey]]"]]
 [[tag type/tags type/link]]

 This plugin allows tagging pages. List tags as follows:
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=template included=1 author="[[Joey]]"]]
+[[template id=plugin name=template author="[[Joey]]"]]
 [[tag type/format]]

 With this plugin, you can set up templates, and cause them to be filled out
--- a/doc/plugins/toc.mdwn
+++ b/doc/plugins/toc.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=toc included=1 author="Joey Hess"]]
+[[template id=plugin name=toc author="Joey Hess"]]
 [[tag type/chrome]]

 Add a table of contents be to a page:
--- a/doc/plugins/toggle.mdwn
+++ b/doc/plugins/toggle.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=toggle included=1 author="[[Joey]]"]]
+[[template id=plugin name=toggle author="[[Joey]]"]]
 [[tag type/chrome]]

 With this plugin you can create links on pages that, when clicked, toggle
--- a/doc/plugins/typography.mdwn
+++ b/doc/plugins/typography.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=typography included=1 author="[[Roktas]]"]]
+[[template id=plugin name=typography author="[[Roktas]]"]]
 [[tag type/format]]

 This plugin, also known as
--- a/doc/plugins/wikitext.mdwn
+++ b/doc/plugins/wikitext.mdwn
@ -1,4 +1,4 @@
-[[template id=plugin name=wikitext included=1 author="[[Joey]]"]]
+[[template id=plugin name=wikitext author="[[Joey]]"]]
 [[tag type/format]]

 This plugin allows ikiwiki to process pages written in the original wiki
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@ -12,3 +12,5 @@ john
 Couldn't the [[templates/plugin]] template replace the "included" parameter
 with the same check used for "third-party plugin"?  Don't "third-party plugin"
 and "included in ikiwiki" form precisely complementary sets?  --[[JoshTriplett]]
+
+> Yes, can be done..
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@ -1,7 +1,7 @@
 <span class="infobox">
 Plugin: <TMPL_VAR name><br />
 Author: <TMPL_VAR author><br />
-Included in ikiwiki: <TMPL_IF included>yes<TMPL_ELSE>no</TMPL_IF><br />
+Included in ikiwiki: [[if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]<br />
 Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
 Currently enabled: [[if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>