From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 7 Jul 2014 17:52:05 +0000 (+0200)
Subject: Show nice diff instead of unix diff in editHistory.tpl
X-Git-Tag: 2.1.0_Alpha_1~590^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6dcf3602c0c04eb63ee4cf46d3482b9b5993d2f8;p=GitHub%2FWoltLab%2FWCF.git

Show nice diff instead of unix diff in editHistory.tpl
---

diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index d3c40fe44c..d14134a54d 100644
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -16,7 +16,42 @@
 
 {include file='userNotice'}
 
-<pre>{$diff}</pre>
+{if $diff}
+<div><div>
+{assign var='prevType' value=''}
+{foreach from=$diff->getRawDiff() item='line'}
+{if $line[0] !== $prevType}
+	</div>
+	
+	{* unmodified, after deletion needs a "fake" insertion *}
+	{if $line[0] === ' ' && $prevType === '-'}<div class="containerPadding"></div>{/if}
+	
+	{* unmodified and deleted start a new container *}
+	{if $line[0] === ' ' || $line[0] === '-'}</div>{/if}
+	
+	{* adding, without deleting needs a "fake" deletion *}
+	{if $line[0] === '+' && $prevType !== '-'}
+		</div>
+		<div class="container marginTop sideBySide">
+			<div class="containerPadding">
+			</div>
+	{/if}
+	
+	{if $line[0] === ' '}
+		<div class="container marginTop">
+	{/if}
+	{if $line[0] === '-'}
+		<div class="container marginTop sideBySide">
+	{/if}
+	<div class="containerPadding"{if $line[0] === '+'} style="color: green;"{elseif $line[0] === '-'} style="color: red;"{/if}>
+{/if}
+{if $line[0] === ' '}{$line[1]}<br />{/if}
+{if $line[0] === '-'}{$line[1]}<br />{/if}
+{if $line[0] === '+'}{$line[1]}<br />{/if}
+{assign var='prevType' value=$line[0]}
+{/foreach}
+</div></div>
+{/if}
 
 <form action="{link controller='EditHistory'}{/link}" method="get">
 	<div class="tabularBox tabularBoxTitle marginTop">
@@ -40,7 +75,7 @@
 				<tr>
 					<td class="columnIcon">
 						<span class="icon icon16 icon-undo disabled"></span>
-						<input type="radio" name="oldID" value="current"{if $oldID == 'current'} checked="checked"{/if} /> <input type="radio" name="newID" value="current"{if $newID == 'current'} checked="checked"{/if} />
+						<input type="radio" name="oldID" value="current"{if $oldID === 'current'} checked="checked"{/if} /> <input type="radio" name="newID" value="current"{if $newID === 'current'} checked="checked"{/if} />
 						{event name='rowButtons'}
 					</td>
 					<td class="columnID"><strong>{lang}wcf.edit.currentVersion{/lang}</strong></td>