diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php index 53b17edc6e71b03cc382149aaa9e8924294e1eaa..2a788294930ef8bb7c641fc15e20deed325a5fc8 100644 --- a/typo3/sysext/backend/Classes/Controller/BackendController.php +++ b/typo3/sysext/backend/Classes/Controller/BackendController.php @@ -490,8 +490,7 @@ class BackendController implements \TYPO3\CMS\Core\Http\ControllerInterface { 'refresh_login_countdown' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown'), 'login_about_to_expire' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_refresh_about_to_expire'), 'login_about_to_expire_title' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire_title'), - 'refresh_login_abort_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_abort_button'), - 'refresh_login_confirm_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_confirm_button'), + 'refresh_login_logout_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_logout_button'), 'refresh_login_refresh_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_refresh_button'), 'tabs_closeAll' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeAll'), 'tabs_closeOther' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeOther'), diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js b/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js index 36a27dbf55ff403ee7609ff5d23e5aa666b3f8a0..0712f3f87162b0ae4018ebf4c20ab404c6807efc 100644 --- a/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js +++ b/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js @@ -104,7 +104,10 @@ define('TYPO3/CMS/Backend/LoginRefresh', ['jquery', 'bootstrap'], function($) { ) ); LoginRefresh.$timeoutModal.find('.modal-footer').append( - $('<button />', {class: 'btn btn-default', 'data-action': 'refreshSession'}).text(TYPO3.LLL.core.refresh_login_abort_button).on('click', function() { + $('<button />', {class: 'btn btn-default', 'data-action': 'logout'}).text(TYPO3.LLL.core.refresh_login_logout_button).on('click', function() { + top.location.href = TYPO3.configuration.siteUrl + LoginRefresh.logoutUrl; + }), + $('<button />', {class: 'btn btn-primary t3js-active', 'data-action': 'refreshSession'}).text(TYPO3.LLL.core.refresh_login_refresh_button).on('click', function() { $.ajax({ url: TYPO3.settings.ajaxUrls['BackendLogin::isTimedOut'], method: 'GET', @@ -112,9 +115,6 @@ define('TYPO3/CMS/Backend/LoginRefresh', ['jquery', 'bootstrap'], function($) { LoginRefresh.hideTimeoutModal(); } }); - }), - $('<button />', {class: 'btn btn-primary t3js-active', 'data-action': 'logout'}).text(TYPO3.LLL.core.refresh_login_confirm_button).on('click', function() { - top.location.href = TYPO3.configuration.siteUrl + LoginRefresh.logoutUrl; }) ); LoginRefresh.registerDefaultModalEvents(LoginRefresh.$timeoutModal); diff --git a/typo3/sysext/lang/locallang_core.xlf b/typo3/sysext/lang/locallang_core.xlf index d24eccb3298cb445055323753dbe85a466b965fc..cb6efd7b5887974773436bf133785838841c4761 100644 --- a/typo3/sysext/lang/locallang_core.xlf +++ b/typo3/sysext/lang/locallang_core.xlf @@ -686,10 +686,7 @@ Do you want to refresh it now?</source> <trans-unit id="mess.login_about_to_expire"> <source>Your TYPO3 login is about to expire. Please confirm that you want to stay logged in.</source> </trans-unit> - <trans-unit id="mess.refresh_login_abort_button"> - <source>Abort</source> - </trans-unit> - <trans-unit id="mess.refresh_login_confirm_button"> + <trans-unit id="mess.refresh_login_logout_button"> <source>Log me out</source> </trans-unit> <trans-unit id="mess.login_refresh_about_to_expire">