From d3aaf6e01fe7f90a530e640957b5908d5dba2f7f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 22:19:14 -0400
Subject: [PATCH] fix pagediff to not display as "preview"
I think originally, the page preview header was not displayed,
so diff was hacked in using it.
---
IkiWiki/Plugin/editdiff.pm | 2 +-
templates/editpage.tmpl | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index d8f53a42e..015ce9c14 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -71,7 +71,7 @@ sub formbuilder_setup {
$content=~s/\r/\n/g;
my $diff = diff(srcfile($pagesources{$page}), $content);
- $form->tmpl_param("page_preview", $diff);
+ $form->tmpl_param("page_diff", $diff);
}
}
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 1e2d070ed..118ca4550 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -54,3 +54,12 @@
<TMPL_VAR PAGE_PREVIEW>
</div>
</TMPL_IF>
+<TMPL_IF NAME="PAGE_DIFF">
+<hr />
+<div class="header">
+<span>Diff:</span>
+</div>
+<div id="diff">
+<TMPL_VAR PAGE_DIFF>
+</div>
+</TMPL_IF>
--
2.39.5