From 52ac243e1a089004ff3b3ca6ecf5638da6d91572 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 20 Mar 2016 16:45:08 +0100
Subject: [PATCH] Continuous numeration of edit history version in template

---
 CHANGELOG.md                              | 1 +
 com.woltlab.wcf/templates/editHistory.tpl | 6 +++---
 wcfsetup/install/lang/de.xml              | 1 +
 wcfsetup/install/lang/en.xml              | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 265ac40172..2525eae4f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 * `wcf\system\event\listener\AbstractUserMergeListener` added.
 * Notice texts support `{$username}` and `{$email}` placeholders.
 * Notifications for comments in moderation.
+* Continuous numeration of edit history version in template.  
 
 #### New Traits
 
diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index 0d824b8ffd..65ff3ab79d 100644
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -73,7 +73,7 @@
 		<table class="table">
 			<thead>
 				<tr>
-					<th class="columnID columnEditID" colspan="2">{lang}wcf.global.objectID{/lang}</th>
+					<th class="columnID columnEditID" colspan="2">{lang}wcf.edit.version{/lang}</th>
 					<th class="columnText columnUser">{lang}wcf.user.username{/lang}</th>
 					<th class="columnText columnEditReason">{lang}wcf.edit.reason{/lang}</th>
 					<th class="columnDate columnTime">{lang}wcf.edit.time{/lang}</th>
@@ -96,14 +96,14 @@
 					
 					{event name='columns'}
 				</tr>
-				{foreach from=$objects item=edit}
+				{foreach from=$objects item=edit name=edit}
 					<tr class="jsEditRow">
 						<td class="columnIcon">
 							<span class="icon icon16 fa-undo pointer jsRevertButton jsTooltip" title="{lang}wcf.edit.revert{/lang}" data-object-id="{@$edit->entryID}" data-confirm-message="{lang}wcf.edit.revert.sure{/lang}"></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="columnID">{#($tpl[foreach][edit][total] - $tpl[foreach][edit][iteration] + 1)}</td>
 						<td class="columnText columnUser"><a href="{link controller='User' id=$edit->userID title=$edit->username}{/link}">{$edit->username}</a></td>
 						<td class="columnText columnEditReason">{$edit->editReason}</td>
 						<td class="columnDate columnTime">{@$edit->time|time}</td>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 3e70b9a135..0576f94bd3 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2185,6 +2185,7 @@ Fehler sind beispielsweise:
 	</category>
 	
 	<category name="wcf.edit">
+		<item name="wcf.edit.version"><![CDATA[Version]]></item>
 		<item name="wcf.edit.versions"><![CDATA[Versionen]]></item>
 		<item name="wcf.edit.time"><![CDATA[Änderungszeitpunkt]]></item>
 		<item name="wcf.edit.reason"><![CDATA[Änderungsgrund]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9eaf33e3c5..4cd50b4e3e 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2188,6 +2188,7 @@ Errors are:
 	</category>
 	
 	<category name="wcf.edit">
+		<item name="wcf.edit.version"><![CDATA[Version]]></item>
 		<item name="wcf.edit.versions"><![CDATA[Versions]]></item>
 		<item name="wcf.edit.time"><![CDATA[Edit Time]]></item>
 		<item name="wcf.edit.reason"><![CDATA[Edit Reason]]></item>
-- 
2.20.1