[TASK] Unsplit the save button of the sites configuration module 46/57346/3
authorPatrick Schriner <patrick.schriner@diemedialen.de>
Sat, 23 Jun 2018 16:20:29 +0000 (18:20 +0200)
committerJigal van Hemert <jigal.van.hemert@typo3.org>
Sat, 23 Jun 2018 20:10:48 +0000 (22:10 +0200)
Resolves: #85365
Releases: master
Change-Id: Ie7a5bd60218b2dc9293a5a53995e5a63685c6288
Reviewed-on: https://review.typo3.org/57346
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
typo3/sysext/backend/Classes/Controller/SiteConfigurationController.php

index 5e38255..4561807 100644 (file)
@@ -551,25 +551,17 @@ class SiteConfigurationController
             ->setHref('#')
             ->setClasses('t3js-editform-close')
             ->setTitle($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
+            ->setShowLabelText(true)
             ->setIcon($iconFactory->getIcon('actions-close', Icon::SIZE_SMALL));
         $saveButton = $buttonBar->makeInputButton()
             ->setTitle($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
             ->setName('_savedok')
             ->setValue('1')
+            ->setShowLabelText(true)
             ->setForm('siteConfigurationController')
             ->setIcon($iconFactory->getIcon('actions-document-save', Icon::SIZE_SMALL));
-        $saveAndCloseButton = $buttonBar->makeInputButton()
-            ->setName('_saveandclosedok')
-            ->setClasses('t3js-editform-submitButton')
-            ->setValue('1')
-            ->setForm('siteConfigurationController')
-            ->setTitle($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
-            ->setIcon($iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL));
-        $saveSplitButton = $buttonBar->makeSplitButton();
-        $saveSplitButton->addItem($saveButton, true);
-        $saveSplitButton->addItem($saveAndCloseButton);
         $buttonBar->addButton($closeButton);
-        $buttonBar->addButton($saveSplitButton, ButtonBar::BUTTON_POSITION_LEFT, 2);
+        $buttonBar->addButton($saveButton, ButtonBar::BUTTON_POSITION_LEFT, 2);
     }
 
     /**