[TASK] Timebased redirects shown correctly 42/55442/9
authorReiner Teubner <rteubner@me.com>
Wed, 24 Jan 2018 10:08:02 +0000 (11:08 +0100)
committerSusanne Moog <susanne.moog@typo3.org>
Sat, 27 Jan 2018 07:44:22 +0000 (08:44 +0100)
When a timebased redirect is not active now a
sheduled-end icon with additional information
is displayed.

Resolves: #83663
Releases: master
Change-Id: I345364ec9a83c8af317ac2cafe2e7a70d570a159
Reviewed-on: https://review.typo3.org/55442
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html

index fe53350..99b7d1c 100644 (file)
                                                                <tr>
                                                                        <td>{redirect.source_host}</td>
                                                                        <td>
-                                                                               <f:if condition="{redirect.disabled} == 1"><span title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:record_disabled')}"><core:icon identifier="overlay-hidden" /></span></f:if>
-                                                                               <f:if condition="{redirect.starttime} != 0 || {redirect.endtime} != 0"><span title="{f:format.date(date: redirect.starttime, format: '%d.%m.%Y %H:%M')} - {f:format.date(date: redirect.endtime, format: '%d.%m.%Y %H:%M')}"><core:icon identifier="overlay-scheduled" /></span></f:if>
+                                                                               <f:alias map="{
+                                                                                       disable: '{f:translate(key: \'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:record_disabled\')}',
+                                                                                       onlystart: '{f:translate(key: \'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:start\')}: {f:format.date(date: redirect.starttime, format: \'d.m.Y H:i:s\')}',
+                                                                                       onlyend: '{f:translate(key: \'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:stop\')}: {f:format.date(date: redirect.endtime, format: \'d.m.Y H:i:s\')}',
+                                                                                       startend: '{f:translate(key: \'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:start\')}: {f:format.date(date: redirect.starttime, format: \'d.m.Y H:i:s\')} - {f:translate(key: \'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:stop\')}: {f:format.date(date: redirect.endtime, format: \'d.m.Y H:i:s\')}'
+                                                                               }">
+                                                                               <f:if condition="{redirect.disabled}"><f:then><span title="{disable}"></f:then>
+                                                                               <f:else if="{redirect.starttime} && !{redirect.endtime}"><span title="{onlystart}"></f:else>
+                                                                               <f:else if="!{redirect.starttime} && {redirect.endtime}"><span title="{onlyend}"></f:else>
+                                                                               <f:else if="{redirect.starttime} && {redirect.endtime}"><span title="{startend}"></f:else>
+                                                                               <f:else><span></f:else>
+                                                                               </f:if>
+                                                                               <core:iconForRecord table="sys_redirect" row="{redirect}" /></span>
+                                                                               </f:alias>
                                                                                <strong><f:link.external uri="{redirect.source_host}{redirect.source_path}" target="_blank">{redirect.source_path}</f:link.external></strong>
                                                                        </td>
                                                                        <td><f:link.typolink parameter="{redirect.target}" target="_blank"><f:uri.typolink parameter="{redirect.target}"></f:uri.typolink></f:link.typolink> (<f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:destination_status_code"/>: {redirect.target_statuscode})</td>