Skip to content
Snippets Groups Projects
Commit 960fa78c authored by Jan Helke's avatar Jan Helke Committed by Christian Kuhn
Browse files

[TASK] Fluidification of RecordHistory 

Resolves: #71744
Releases: master
Change-Id: Iacbce4bf0557f1ac0cfbe75a57bdcfaf772d391a
Reviewed-on: https://review.typo3.org/44843


Reviewed-by: default avatarFrank Nägler <frank.naegler@typo3.org>
Tested-by: default avatarFrank Nägler <frank.naegler@typo3.org>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 1a00cb52
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 314 additions and 159 deletions
typo3/sysext/backend/Classes/History/RecordHistory.php
+ 119
− 159
View file @ 960fa78c
This diff is collapsed.
typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Diff.html 0 → 100644
+ 12
− 0
View file @ 960fa78c
<div class="diff">
<f:for each="{differences}" as="differencesItem" key="key">
<div class="diff-item">
<div class="diff-item-title">
<f:format.raw>{differencesItem.title}</f:format.raw>
</div>
<div class="diff-item-result">
<f:format.raw>{differencesItem.result}</f:format.raw>
</div>
</div>
</f:for>
</div>
typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html 0 → 100644
+ 59
− 0
View file @ 960fa78c
{namespace be = TYPO3\CMS\Backend\ViewHelpers}
<h2>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:changes')}</h2>
<div>
<f:be.infobox state="-1">{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:differenceMsg')}</f:be.infobox>
<table class="table table-striped table-hover table-vertical-top" id="typo3-history">
<thead>
<tr>
<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:rollback')}</th>
<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:time')}</th>
<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:age')}</th>
<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:user')}</th>
<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:tableUid')}</th>
<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:differences')}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<f:for each="{history}" as="historyRow" key="key">
<tr>
<td><span><span title="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:sumUpChanges')}"><f:format.raw>
{historyRow.rollbackLink}
</f:format.raw></span></span></td>
<td>{historyRow.time}</td>
<td>{historyRow.age}</td>
<td>
<be:avatar backendUser="{historyRow.backendUserUid}"/>
{historyRow.backendUserName}
</td>
<td>
<f:format.raw>{historyRow.tableUid}</f:format.raw>
</td>
<td>
<f:if condition="{historyRow.action}">
<strong>
<f:format.raw>{historyRow.action}</f:format.raw>
</strong>
</f:if>
<f:if condition="{historyRow.fieldNames}">
<f:format.raw>{historyRow.fieldNames}</f:format.raw>
</f:if>
<f:if condition="{historyRow.differences}">
<f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
</f:if>
</td>
<td>
<f:format.raw>{historyRow.markState}</f:format.raw>
</td>
</tr>
</f:for>
</tbody>
</table>
<f:if condition="{fullViewLink}">
<br/>
<f:format.raw><span class="btn btn-default">{fullViewLink}</span></f:format.raw>
</f:if>
<br/>
<br/>
</div>
typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html 0 → 100644
+ 34
− 0
View file @ 960fa78c
<h2>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:mergedDifferences')}</h2>
<div>
<f:if condition="{revertAllLink}">
<f:then>
<f:format.raw>{revertAllLink}</f:format.raw>
<div
style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
<f:for each="{multipleDiff}" as="historyRow" key="key">
<h3>
<f:format.raw>{historyRow.revertRecordLink}</f:format.raw>
{historyRow.title}
</h3>
<div>
<div
style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
<f:if condition="{historyRow.insertDelete} == 'delete'">
<strong>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:delete')}</strong><br/>
</f:if>
<f:if condition="{historyRow.insertDelete} == 'insert'">
<strong>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:insert')}</strong><br/>
</f:if>
<f:if condition="{historyRow.differences}">
<f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
</f:if>
</div>
</div>
</f:for>
</div>
</f:then>
<f:else>
{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:noDifferences')}
</f:else>
</f:if>
</div>
typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html 0 → 100644
+ 76
− 0
View file @ 960fa78c
<div>
<f:if condition="{singleElement}">
<strong>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:elementHistory')}</strong><br/>
<f:if condition="{fullHistoryLink}">
<span class="btn btn-default" style="margin-bottom: 5px;"><f:format.raw>{fullHistoryLink}</f:format.raw></span>
</f:if>
</f:if>
<a name="settings_head"></a>
<form name="settings" action="{TYPO3_REQUEST_URI}" method="post">
<div class="row">
<div class="col-sm-12 col-md-6 col-lg-4">
<div class="panel panel-default">
<div class="panel-heading">{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:settings')}</div>
<table class="table">
<f:for each="{settings}" as="values" key="key">
<tr>
<td>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{key}')}</td>
<td>
<div class="btn-group">
<button class="btn btn-default dropdown-toggle" type="button" id="copymodeSelector"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<f:for each="{currentSelection}" as="currentSelectionValue" key="currentSelectionKey">
<f:if condition="{currentSelectionKey} == {key}">
<f:then>
<f:if condition="{currentSelectionValue}">
<f:then>
<f:for each="{values}" as="singleValue" key="singleKey">
<f:if condition="{currentSelectionValue} == {singleKey}">
<f:then>
<f:if condition="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}">
<f:then>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
<f:else>{singleValue.value}</f:else>
</f:if>
</f:then>
</f:if>
</f:for>
</f:then>
<f:else>
<f:for each="{values}" as="singleValue" iteration="iterator">
<f:if condition="{iterator.isFirst}">
<f:then>
<f:if condition="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}">
<f:then>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
<f:else>{singleValue.value}</f:else>
</f:if>
</f:then>
</f:if>
</f:for>
</f:else>
</f:if>
</f:then>
</f:if>
</f:for>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="copymodeSelector">
<f:for each="{values}" as="singleValue" key="singleKey">
<li><a href="#"
onclick="document.settings.method='POST'; document.settings.action={singleValue.scriptUrl}; document.settings.submit()">
<f:if condition="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}">
<f:then>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
<f:else>{singleValue.value}</f:else>
</f:if>
</a></li>
</f:for>
</ul>
</div>
</td>
</tr>
</f:for>
</table>
</div>
</div>
</div>
</form>
</div>
typo3/sysext/backend/Resources/Private/Templates/RecordHistory/Main.html 0 → 100644
+ 14
− 0
View file @ 960fa78c
<f:if condition="{reloadPageFrame}">
<script type="text/javascript">
/*<![CDATA[*/
if (top.content && top.content.nav_frame && top.content.nav_frame.refresh_nav) {
top.content.nav_frame.refresh_nav();
}
/*]]>*/
</script>
</f:if>
<f:render partial="RecordHistory/Settings" arguments="{_all}" />
<f:if condition="{lastSyslogId}">
<f:render partial="RecordHistory/MultipleDiff" arguments="{_all}" />
</f:if>
<f:render partial="RecordHistory/History" arguments="{_all}" />
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment