Update of /cvsroot/tikiwiki/tiki/templates/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14002/templates/mail
Modified Files:
Tag: BRANCH-1-9
user_watch_wiki_page_changed.tpl
Log Message:
Added diffs to the wiki change notification mail.
Index: user_watch_wiki_page_changed.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/mail/user_watch_wiki_page_changed.tpl,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- user_watch_wiki_page_changed.tpl 23 Oct 2004 16:39:09 -0000 1.8.2.1
+++ user_watch_wiki_page_changed.tpl 2 Mar 2005 22:23:59 -0000 1.8.2.2
@@ -8,14 +8,45 @@
{$mail_machine_raw}/tiki-index.php?page={$mail_page|escape:"url"}
{if !$new_page}{tr}You can view a diff back to the previous version by following this link:{/tr}
-{$mail_machine_raw}/tiki-pagehistory.php?page={$mail_page|escape:"url"}&diff2={$mail_last_version}
+{$mail_machine_raw}/tiki-pagehistory.php?page={$mail_page|escape:"url"}&compare&oldver={$mail_oldver}&newver={$mail_newver}&diff_style=unidiff
{/if}
+
{if $mail_hash}{tr}If you don't want to receive these notifications follow this link:{/tr}
{$mail_machine_raw}/tiki-user_watches.php?hash={$mail_hash}
{/if}
+
+{tr}Comment:{/tr} {$mail_comment}
+
+{tr}The changes in this version follow below, followed after by the current full page text.{/tr}
+
+***********************************************************
+
+{section name=ix loop=$mail_diffdata}
+{if $mail_diffdata[ix].type == "diffheader"}
+{assign var="oldd" value=$mail_diffdata[ix].old}
+{assign var="newd" value=$mail_diffdata[ix].new}
+@@ {tr}-Lines: {$oldd} changed to +Lines: {$newd}{/tr} @@
+{elseif $mail_diffdata[ix].type == "diffdeleted"}
+{section name=iy loop=$mail_diffdata[ix].data}
+- {$mail_diffdata[ix].data[iy]|strip_tags:false}
+{/section}
+{elseif $mail_diffdata[ix].type == "diffadded"}
+{section name=iy loop=$mail_diffdata[ix].data}
++ {$mail_diffdata[ix].data[iy]|strip_tags:false}
+{/section}
+{elseif $mail_diffdata[ix].type == "diffbody"}
+{section name=iy loop=$mail_diffdata[ix].data}
+{$mail_diffdata[ix].data[iy]|strip_tags:false}
+{/section}
+{/if}
+{/section}
+
+***********************************************************
+
{tr}The new page content follows below.{/tr}
+
***********************************************************
{$mail_pagedata}
|
