From 519200ebab1705821dc6b7ca8e2cfbaf89384c17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 2 Jul 2014 15:05:53 +0200
Subject: [PATCH] Add form for edit history entry comparing

---
 com.woltlab.wcf/templates/editHistory.tpl     | 113 +++++++++++-------
 .../files/lib/page/EditHistoryPage.class.php  |   1 +
 2 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index 70e5f49020..1c5fc9689b 100644
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -17,54 +17,87 @@
 {include file='userNotice'}
 
 <pre>{$diff}</pre>
-<div class="tabularBox tabularBoxTitle marginTop">
-	<header>
-		<h2>{lang}wcf.edit.versions{/lang} <span class="badge badgeInverse">{#$objects|count}</span></h2>
-	</header>
-	
-	<table class="table">
-		<thead>
-			<tr>
-				<th class="columnID columnEditID" colspan="2">{lang}wcf.global.objectID{/lang}</th>
-				<th class="columnText columnUser">{lang}wcf.user.username{/lang}</th>
-				<th class="columnText columnTime">{lang}wcf.edit.time{/lang}</th>
-				<th class="columnText columnEditReason">{lang}wcf.edit.reason{/lang}</th>
-				
-				{event name='columnHeads'}
-			</tr>
-		</thead>
+
+<form action="{link controller='EditHistory'}{/link}" method="get">
+	<div class="tabularBox tabularBoxTitle marginTop">
+		<header>
+			<h2>{lang}wcf.edit.versions{/lang} <span class="badge badgeInverse">{#$objects|count}</span></h2>
+		</header>
 		
-		<tbody>
-			<tr>
-				<td class="columnIcon">
-					<span class="icon icon16 icon-undo disabled"></span>
-					{event name='rowButtons'}
-				</td>
-				<td class="columnID"><strong>{lang}wcf.edit.currentVersion{/lang}</strong></td>
-				<td class="columnText columnUser"><a href="{link controller='User' id=$object->getUserID() title=$object->getUsername()}{/link}">{$object->getUsername()}</a></td>
-				<td class="columnText columnTime">{@$object->getTime()|time}</td>
-				<td class="columnText columnEditReason">{$object->getEditReason()}</td>
-				
-				{event name='columns'}
-			</tr>
-			{foreach from=$objects item=edit}
-				<tr class="jsEditRow">
+		<table class="table">
+			<thead>
+				<tr>
+					<th class="columnID columnEditID" colspan="2">{lang}wcf.global.objectID{/lang}</th>
+					<th class="columnText columnUser">{lang}wcf.user.username{/lang}</th>
+					<th class="columnText columnTime">{lang}wcf.edit.time{/lang}</th>
+					<th class="columnText columnEditReason">{lang}wcf.edit.reason{/lang}</th>
+					
+					{event name='columnHeads'}
+				</tr>
+			</thead>
+			
+			<tbody>
+				<tr>
 					<td class="columnIcon">
-						<span class="icon icon16 icon-undo"></span>
+						<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} />
 						{event name='rowButtons'}
 					</td>
-					<td class="columnID">{@$edit->entryID}</td>
-					<td class="columnText columnUser"><a href="{link controller='User' id=$edit->userID title=$edit->username}{/link}">{$edit->username}</a></td>
-					<td class="columnText columnTime">{@$edit->time|time}</td>
-					<td class="columnText columnEditReason">{$edit->editReason}</td>
+					<td class="columnID"><strong>{lang}wcf.edit.currentVersion{/lang}</strong></td>
+					<td class="columnText columnUser"><a href="{link controller='User' id=$object->getUserID() title=$object->getUsername()}{/link}">{$object->getUsername()}</a></td>
+					<td class="columnText columnTime">{@$object->getTime()|time}</td>
+					<td class="columnText columnEditReason">{$object->getEditReason()}</td>
 					
 					{event name='columns'}
 				</tr>
-			{/foreach}
-		</tbody>
-	</table>
+				{foreach from=$objects item=edit}
+					<tr class="jsEditRow">
+						<td class="columnIcon">
+							<span class="icon icon16 icon-undo"></span>
+							<input type="radio" name="oldID" value="{@$edit->entryID}"{if $oldID == $edit->entryID} checked="checked"{/if} /> <input type="radio" name="newID" value="{@$edit->entryID}"{if $newID == $edit->entryID} checked="checked"{/if} />
+							{event name='rowButtons'}
+						</td>
+						<td class="columnID">{@$edit->entryID}</td>
+						<td class="columnText columnUser"><a href="{link controller='User' id=$edit->userID title=$edit->username}{/link}">{$edit->username}</a></td>
+						<td class="columnText columnTime">{@$edit->time|time}</td>
+						<td class="columnText columnEditReason">{$edit->editReason}</td>
+						
+						{event name='columns'}
+					</tr>
+				{/foreach}
+			</tbody>
+			<script data-relocate="true">
+				//<![CDATA[
+				$(function () {
+					$('input[name=newID]').on('change', function (event) {
+						var newID = $(this).val();
+						
+						$('input[name=oldID]').each(function (event) {
+							if ($(this).val() >= newID) $(this).disable();
+							else $(this).enable();
+						});
+					});
+					
+					$('input[name=oldID]').on('change', function (event) {
+						var oldID = $(this).val();
+						
+						$('input[name=newID]').each(function (event) {
+							if ($(this).val() <= oldID) $(this).disable();
+							else $(this).enable();
+						});
+					});
+					$('input:checked').trigger('change');
+				});
+				//]]>
+			</script>
+		</table>
+	</div>
 	
-</div>
+	<div class="formSubmit">
+		{@SID_INPUT_TAG}
+		<button class="button" data-type="submit">{lang}wcf.edit.button.compare{/lang}</button>
+	</div>
+</form>
 
 {include file='footer'}
 
diff --git a/wcfsetup/install/files/lib/page/EditHistoryPage.class.php b/wcfsetup/install/files/lib/page/EditHistoryPage.class.php
index ae2e5f9043..c692cbb268 100644
--- a/wcfsetup/install/files/lib/page/EditHistoryPage.class.php
+++ b/wcfsetup/install/files/lib/page/EditHistoryPage.class.php
@@ -124,6 +124,7 @@ class EditHistoryPage extends AbstractPage {
 		
 		if (!$this->new) {
 			$this->new = $this->object;
+			$this->newID = 'current';
 		}
 	}
 	
-- 
2.20.1