Continuous numeration of edit history version in template

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 265ac40172bc7085d4dd40e145e3de4a2adb6149..2525eae4f602a32fb09bfed639f6d37812ea49d4 100644 (file)
--- 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 0d824b8ffdbb3d394b895ecc1844402bfe3c2403..65ff3ab79dfe437186e0e9e988f449f07f333e74 100644 (file)
--- 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 3e70b9a135190e90cc789c61224b034f41894c58..0576f94bd3562afc6e5a2dc4fa3c1a94091dfe3b 100644 (file)
--- 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 9eaf33e3c5fd503e02c27c7d1733bd83d0042020..4cd50b4e3e92a959bdefcc792ba262c24f09764a 100644 (file)
--- 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>