urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* template: Remove bogus htmlize pass added in 2.16. 

* template: Htmlize template variables, but also provide a raw version
  via `<TMPL_VAR raw_variable>`.
master
Joey Hess 2008-01-09 14:17:25 -05:00
parent 5d3c225ad7
commit 57ff2ecaed
5 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IkiWiki/Plugin/template.pm
View File

@ -46,13 +46,20 @@ sub preprocess (@) { #{{{
}
foreach my $param (keys %params) {
$template->param($param => $params{$param});
if ($template->query(name => $param)) {
$template->param($param =>
IkiWiki::htmlize($params{page},
pagetype($pagesources{$params{page}}),
$params{$param}));
}
if ($template->query(name => "raw_$param")) {
$template->param("raw_$param" => $params{$param});
}
}
return IkiWiki::htmlize($params{page}, pagetype($pagesources{$params{page}}),
IkiWiki::preprocess($params{page}, $params{destpage},
return IkiWiki::preprocess($params{page}, $params{destpage},
IkiWiki::filter($params{page}, $params{destpage},
$template->output)));
$template->output));
} # }}}
1

8
debian/NEWS vendored
View File

@ -1,3 +1,11 @@
ikiwiki (2.20) unstable; urgency=low
The template plugin has begin to htmlize the variables passed to templates.
This is normally what you want, but to get the old behavior and get at the
raw value, you can use `<TMPL_VAR raw_variable>` in a template.
-- Joey Hess <joeyh@debian.org> Sat, 08 Dec 2007 16:04:43 -0500
ikiwiki (2.16) unstable; urgency=low
Many of the pages in ikiwiki's basewiki have been moved and renamed in this

3
debian/changelog vendored
View File

@ -14,6 +14,9 @@ ikiwiki (2.20) UNRELEASED; urgency=low
meta link.
* Fix support for the case where metadata appears after an inline directive
that needs to use it. This was broken in version 2.16.
* template: Remove bogus htmlize pass added in 2.16.
* template: Htmlize template variables, but also provide a raw version
via `<TMPL_VAR raw_variable>`.
-- Joey Hess <joeyh@debian.org> Wed, 09 Jan 2008 00:34:46 -0500

17
doc/templates.mdwn
View File

@ -26,9 +26,9 @@ Using a template works like this:
This fills out the [[note]] template, filling in the `text` field with
the specified value, and inserts the result into the page.
A value can include any markup that would be allowed in the wiki page
outside the template. Triple-quoting the value even allows quotes to be
included in it. Combined with multi-line quoted values, this allows for
Generally, a value can include any markup that would be allowed in the wiki
page outside the template. Triple-quoting the value even allows quotes to
be included in it. Combined with multi-line quoted values, this allows for
large chunks of marked up text to be embedded into a template:
\[[template id=foo name="Sally" color="green" age=8 notes="""
@ -48,7 +48,10 @@ module, which allows for some fairly complex things to be done. Consult its
documentation for the full syntax, but all you really need to know are a
few things:
* To insert the value of a variable, use `<TMPL_VAR variable>`.
* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
in the value will first be converted to html.
* To insert the raw value of a variable, with wiki markup not yet converted
to html, use `<TMPL_VAR raw_variable>`.
* To make a block of text conditional on a variable being set use
`<TMPL_IF NAME="variable">text</TMPL_IF>`.
* To use one block of text if a variable is set and a second if it's not,
@ -57,7 +60,7 @@ few things:
Here's a sample template:
<span class="infobox">
Name: <TMPL_VAR name><br />
Name: [[<TMPL_VAR raw_name>]]<br />
Age: <TMPL_VAR age><br />
<TMPL_IF NAME="color">
Favorite color: <TMPL_VAR color><br />
@ -74,3 +77,7 @@ 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
markup in the template. Note though that such WikiLinks will not show up as
backlinks to the page that uses the template.
Note the use of "raw_name" inside the [[WikiLink]] generator. This ensures
that if the name contains something that might be mistaken for wiki markup,
it's not converted to html before being processed as a [[WikiLink]].

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-09 02:42-0500\n"
"POT-Creation-Date: 2008-01-09 14:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"