diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-06 22:19:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-06 22:19:14 -0400 |
| commit | d3aaf6e01fe7f90a530e640957b5908d5dba2f7f (patch) | |
| tree | f851472eb9746cfbd66c5ae7437cc696d5ddd31d | |
| parent | a47e835f3a97c9f490622f21562b32fbf527ef1b (diff) | |
| download | ikiwiki-d3aaf6e01fe7f90a530e640957b5908d5dba2f7f.tar ikiwiki-d3aaf6e01fe7f90a530e640957b5908d5dba2f7f.tar.gz | |
fix pagediff to not display as "preview"
I think originally, the page preview header was not displayed,
so diff was hacked in using it.
| -rw-r--r-- | IkiWiki/Plugin/editdiff.pm | 2 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 9 |
2 files changed, 10 insertions, 1 deletions
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> |