From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 02:19:14 +0000 (-0400)
Subject: fix pagediff to not display as "preview"
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/d3aaf6e01fe7f90a530e640957b5908d5dba2f7f?hp=a47e835f3a97c9f490622f21562b32fbf527ef1b;ds=sidebyside

fix pagediff to not display as "preview"

I think originally, the page preview header was not displayed,
so diff was hacked in using it.
---

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>