Merge branch 'master' of git://git.ikiwiki.info

6 files changed, 19 insertions, 4 deletions

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 220d36455..4ddc48ac3 100644
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -6,3 +6,14 @@ note and popups are templates? But they're not in the templates directory, and i
 > your personal wiki sources. The note and popup template pages are
 > installed there, typically in `/usr/share/ikiwiki/basewiki/templates/`
 > --[[Joey]]
+
+
+Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki?
+
+What I'm trying to achieve is to print the URL of every page on the page itself and therefore I would need the corresponding value in the Template.
+
+Am I missing something?  --[[jwalzer]]
+
+> If there isn't a suitable variable (I don't think there is a list at
+> the moment), a [[plugin|plugins/write]] to add one would be about 10
+> lines of perl - you'd just need to define a `pagetemplate` hook. --[[smcv]]
diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn
index fcce925d9..962420940 100644
--- a/doc/templates/gitbranch.mdwn
+++ b/doc/templates/gitbranch.mdwn
@@ -3,7 +3,7 @@ Available in a [[!taglink /git]] repository.<br />
 Branch: <TMPL_VAR branch><br />
 Author: <TMPL_VAR author><br />
 </span>
-<TMPL_UNLESS NAME="branch">
+<TMPL_UNLESS branch>
 This template is used to create an infobox for a git branch. It uses
 these parameters:
 
diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn
index 2b18bceb2..b7c3028cd 100644
--- a/doc/templates/links.mdwn
+++ b/doc/templates/links.mdwn
@@ -8,5 +8,9 @@
 <li>[[Users|IkiWikiUsers]]</li>
 <li>[[SiteMap]]</li>
 <li>[[Contact]]</li>
+<li>[[TipJar]]</li>
 </ul>
+<a href="http://flattr.com/thing/39811/ikiwiki">
+<img src="http://api.flattr.com/button/button-compact-static-100x17.png"
+alt="Flattr this" title="Flattr this" /></a>
 </div>
diff --git a/doc/templates/note.mdwn b/doc/templates/note.mdwn
index 4cc323c0e..9ef5ad942 100644
--- a/doc/templates/note.mdwn
+++ b/doc/templates/note.mdwn
@@ -1,7 +1,7 @@
 <div class="notebox">
 <TMPL_VAR text>
 </div>
-<TMPL_UNLESS NAME="text">
+<TMPL_UNLESS text>
 Use this template to insert a note into a page. The note will be styled to
 float to the right of other text on the page. This template has one
 parameter:
diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index c1d1974d6..322c49445 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -8,7 +8,7 @@ Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<
 </span>
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
-<TMPL_UNLESS NAME="name">
+<TMPL_UNLESS name>
 This template is used to create an infobox for an ikiwiki plugin. It uses
 these parameters:
 <ul>
diff --git a/doc/templates/popup.mdwn b/doc/templates/popup.mdwn
index b355daa2e..92455eb21 100644
--- a/doc/templates/popup.mdwn
+++ b/doc/templates/popup.mdwn
@@ -1,4 +1,4 @@
-<TMPL_UNLESS NAME="mouseover">
+<TMPL_UNLESS mouseover>
 Use this template to create a popup window that is displayed when the mouse
 is over part of the page. This template has two parameters:
 <ul>