diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-05-28 23:33:30 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-05-28 23:33:30 +0200 |
| commit | ca952f3eaea5227909b8cf574ee2d8fa34aa21b7 (patch) | |
| tree | 6c179979a1f32a348ce341718e6da1c4fe25251c | |
| parent | e39521bb357bf6f996b6c775e5b3d5cd6a5eb0a7 (diff) | |
Sync with ikiwiki 2.47.
| -rw-r--r-- | aggregatepost.tmpl | 12 | ||||
| -rw-r--r-- | change.tmpl | 15 | ||||
| -rw-r--r-- | editpage.tmpl | 1 | ||||
| -rw-r--r-- | estseek.conf | 2 | ||||
| -rw-r--r-- | misc.tmpl | 4 | ||||
| -rw-r--r-- | page.tmpl | 1 |
6 files changed, 24 insertions, 11 deletions
diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 739a576..8b89367 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -1,15 +1,15 @@ <TMPL_VAR CONTENT> <TMPL_LOOP NAME="TAGS"> -[[tag <TMPL_VAR TAG>]] +[[!tag <TMPL_VAR TAG>]] </TMPL_LOOP> <TMPL_IF NAME="TITLE"> -[[meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]] +[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]] </TMPL_IF> <TMPL_IF NAME="PERMALINK"> -[[meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]] +[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]] </TMPL_IF> <TMPL_IF NAME="COPYRIGHT"> -[[meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]] +[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]] </TMPL_IF> -[[meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]] -[[meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]] +[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]] +[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]] diff --git a/change.tmpl b/change.tmpl index 16ef08a..4a99cf5 100644 --- a/change.tmpl +++ b/change.tmpl @@ -1,13 +1,13 @@ -[[meta author="""<TMPL_VAR AUTHOR>"""]] +[[!meta author="""<TMPL_VAR AUTHOR>"""]] <TMPL_IF AUTHORURL> -[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]] +[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]] </TMPL_IF> -[[meta title="""update of <TMPL_VAR WIKINAME>'s<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]] +[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]] <div class="metadata"> <span class="desc"><br />Changed pages:</span> <span class="pagelinks"> <TMPL_LOOP NAME="PAGES"> -<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>"><img alt="diff" src="<TMPL_VAR BASEURL>wikiicons/diff.png" /></a><TMPL_VAR LINK> +<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK> <TMPL_ELSE> <TMPL_VAR LINK> </TMPL_IF> @@ -33,4 +33,11 @@ </TMPL_IF> </TMPL_LOOP> </div> +<TMPL_IF NAME="DIFF"> +<div class=diff> +<pre> +<TMPL_VAR NAME="DIFF" ESCAPE="HTML"> +</pre> +</div> +</TMPL_IF> <!-- <TMPL_VAR REV> --> diff --git a/editpage.tmpl b/editpage.tmpl index cf4950e..b0bb0ec 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -41,6 +41,7 @@ together before saving. </TMPL_IF> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> +<TMPL_VAR FIELD-SID> <TMPL_VAR FIELD-FROM> <TMPL_VAR FIELD-RCSINFO> <TMPL_VAR FIELD-NEWFILE> diff --git a/estseek.conf b/estseek.conf index 43bd303..2abf413 100644 --- a/estseek.conf +++ b/estseek.conf @@ -25,7 +25,7 @@ relkeynum: 0 spcache: wildmax: 256 qxpndcmd: -helpfile: estseek.help +helpfile: /usr/share/hyperestraier/estseek.help deftitle: attrwidth: 80 dispproxy: @@ -2,7 +2,11 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> +<TMPL_IF NAME="FORCEBASEURL"> +<base href="<TMPL_VAR FORCEBASEURL>" /> +<TMPL_ELSE> <base href="<TMPL_VAR BASEURL>" /> +</TMPL_IF> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR TITLE></title> <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> @@ -104,6 +104,7 @@ License: <TMPL_VAR LICENSE> <div class="pagedate"> Last edited <TMPL_VAR NAME=MTIME> +<!-- Created <TMPL_VAR NAME=CTIME> --> </div> </div> |