diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
| commit | f4a1732b0e65ea4459098e4e852dff10a5af9320 (patch) | |
| tree | 60b8cf4b1677504cb86f301bb62a33cc769fafd9 /templates | |
| parent | cc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964 (diff) | |
| parent | 0978be7affa6222d91a0bc71ddd1e86f81fc56cd (diff) | |
| download | ikiwiki-f4a1732b0e65ea4459098e4e852dff10a5af9320.tar ikiwiki-f4a1732b0e65ea4459098e4e852dff10a5af9320.tar.gz | |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editcomment.tmpl | 1 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl index 891bcae65..7590cdfd7 100644 --- a/templates/editcomment.tmpl +++ b/templates/editcomment.tmpl @@ -15,6 +15,7 @@ Subject: <TMPL_VAR FIELD-SUBJECT><br /> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br /> IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br /> <TMPL_VAR NAME="FORM-END"> +<TMPL_VAR WMD_PREVIEW> <TMPL_IF NAME="PAGE_PREVIEW"> <hr /> diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 4b54db2d1..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -37,6 +37,7 @@ Optional comment about this change:<br /> </div> </TMPL_IF> <TMPL_VAR FORM-END> +<TMPL_VAR WMD_PREVIEW> <TMPL_IF NAME="PAGE_PREVIEW"> <hr /> |