diff options
Diffstat (limited to 'doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change')
-rw-r--r-- | doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change new file mode 100644 index 000000000..b784d2250 --- /dev/null +++ b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change @@ -0,0 +1,102 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14"]] + +<div id="change-62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/directive/template.mdwn;h=9e3ae54dfd6209c92528ace49ad5ae2b3279d486;hp=df391f99e0a23dd7cda85a8c29c1aef80baa707f;hb=62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14;hpb=9d0ac3170a8f90d2139ef75698e8af21a6435fb4" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwiki%2Fdirective%2Ftemplate&do=goto" rel="nofollow">ikiwiki/directive/template</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:41:40 -0400">10:41:40 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +I totally misinterpreted what included() is supposed to be for.<br /> + + + + + +This reverts commit da9e1ea667f82d5fca9168dbed19be08040570ff<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn +index df391f9..9e3ae54 100644 +--- a/doc/ikiwiki/directive/template.mdwn ++++ b/doc/ikiwiki/directive/template.mdwn +@@ -60,30 +60,22 @@ few things: + `<TMPL_IF variable>text</TMPL_IF>`. + * To use one block of text if a variable is set and a second if it's not, + use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>` +-* Each template file included in the wiki's source will also generate a regular +- wiki page. In many cases you might want to prevent some of your template +- being interpreted for the regular page. Use the [[if]] directive with the +- `included()` test to guard the template code. + + Here's a sample template: + +- \[[!if test="included()" then=""" +- <span class="infobox"> +- Name: \[[<TMPL_VAR raw_name>]]<br /> +- Age: <TMPL_VAR age><br /> +- <TMPL_IF color> +- Favorite color: <TMPL_VAR color><br /> +- <TMPL_ELSE> +- No favorite color.<br /> +- </TMPL_IF> +- <TMPL_IF notes> +- <hr /> +- <TMPL_VAR notes> +- </TMPL_IF> +- </span> +- """ else=""" +- This is a template page. +- """]] ++ <span class="infobox"> ++ Name: \[[<TMPL_VAR raw_name>]]<br /> ++ Age: <TMPL_VAR age><br /> ++ <TMPL_IF color> ++ Favorite color: <TMPL_VAR color><br /> ++ <TMPL_ELSE> ++ No favorite color.<br /> ++ </TMPL_IF> ++ <TMPL_IF notes> ++ <hr /> ++ <TMPL_VAR notes> ++ </TMPL_IF> ++ </span> + + The filled out template will be formatted the same as the rest of the page + that contains it, so you can include WikiLinks and all other forms of wiki + +</pre> +</div> + +<!-- 62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14 --> |