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 d8f53a42ee6031b072dab134ec6c6740c156be3c..015ce9c148d554c29a3db6a04227a2a50c88f02e 100644 (file)
--- 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);
                $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 1e2d070ed530601fcf7967571e2053d39a553c73..118ca455046ad414f1e41366d7fbb16b33e984e4 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -54,3 +54,12 @@
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
 <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>