[TASK] Change HTML code to match Bootstrap layout 64/32764/3
authorFrank Nägler <typo3@naegler.net>
Sun, 14 Sep 2014 15:32:55 +0000 (17:32 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Sun, 14 Sep 2014 16:25:04 +0000 (18:25 +0200)
Fix markup for checkbox in:
* EditDocumentController.php
* FileListController.php

Resolves: #61579
Related: #61577
Releases: master
Change-Id: Ie49f75853bb9a5cbfeb9d44268f29655afbc2e49
Reviewed-on: http://review.typo3.org/32764
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Controller/EditDocumentController.php
typo3/sysext/filelist/Classes/Controller/FileListController.php

index 8e2f151..bd0f4bd 100644 (file)
@@ -1094,9 +1094,13 @@ class EditDocumentController {
        public function functionMenus() {
                if ($GLOBALS['BE_USER']->getTSConfigVal('options.enableShowPalettes')) {
                        // Show palettes:
-                       return '
-                               <!-- Function menu (checkbox for showing all palettes): -->
-                               <br />' . BackendUtility::getFuncCheck('', 'SET[showPalettes]', $this->MOD_SETTINGS['showPalettes'], 'alt_doc.php', (GeneralUtility::implodeArrayForUrl('', array_merge($this->R_URL_getvars, array('SET' => ''))) . BackendUtility::getUrlToken('editRecord')), 'id="checkShowPalettes"') . '<label for="checkShowPalettes">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPalettes', TRUE) . '</label>';
+
+                       return '<div class="checkbox">' .
+                               '<label for="checkShowPalettes">' .
+                                       BackendUtility::getFuncCheck('', 'SET[showPalettes]', $this->MOD_SETTINGS['showPalettes'], 'alt_doc.php', (GeneralUtility::implodeArrayForUrl('', array_merge($this->R_URL_getvars, array('SET' => ''))) . BackendUtility::getUrlToken('editRecord')), 'id="checkShowPalettes"') .
+                                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPalettes', TRUE) .
+                               '</label>'.
+                       '</div>';
                } else {
                        return '';
                }
index 0794f33..f624578 100644 (file)
@@ -347,15 +347,30 @@ class FileListController {
                                ';
                                // Add "display bigControlPanel" checkbox:
                                if ($GLOBALS['BE_USER']->getTSConfigVal('options.file_list.enableDisplayBigControlPanel') === 'selectable') {
-                                       $pageContent .= BackendUtility::getFuncCheck($this->id, 'SET[bigControlPanel]', $this->MOD_SETTINGS['bigControlPanel'], '', '', 'id="bigControlPanel"') . '<label for="bigControlPanel"> ' . $GLOBALS['LANG']->getLL('bigControlPanel', TRUE) . '</label><br />';
+                                       $pageContent .= '<div class="checkbox">' .
+                                               '<label for="bigControlPanel">' .
+                                                       BackendUtility::getFuncCheck($this->id, 'SET[bigControlPanel]', $this->MOD_SETTINGS['bigControlPanel'], '', '', 'id="bigControlPanel"') .
+                                                       $GLOBALS['LANG']->getLL('bigControlPanel', TRUE) .
+                                               '</label>' .
+                                       '</div>';
                                }
                                // Add "display thumbnails" checkbox:
                                if ($GLOBALS['BE_USER']->getTSConfigVal('options.file_list.enableDisplayThumbnails') === 'selectable') {
-                                       $pageContent .= BackendUtility::getFuncCheck($this->id, 'SET[displayThumbs]', $this->MOD_SETTINGS['displayThumbs'], '', '', 'id="checkDisplayThumbs"') . ' <label for="checkDisplayThumbs">' . $GLOBALS['LANG']->getLL('displayThumbs', TRUE) . '</label><br />';
+                                       $pageContent .= '<div class="checkbox">' .
+                                               '<label for="checkDisplayThumbs">' .
+                                                       BackendUtility::getFuncCheck($this->id, 'SET[displayThumbs]', $this->MOD_SETTINGS['displayThumbs'], '', '', 'id="checkDisplayThumbs"') .
+                                                       $GLOBALS['LANG']->getLL('displayThumbs', TRUE) .
+                                               '</label>' .
+                                       '</div>';
                                }
                                // Add "clipboard" checkbox:
                                if ($GLOBALS['BE_USER']->getTSConfigVal('options.file_list.enableClipBoard') === 'selectable') {
-                                       $pageContent .= BackendUtility::getFuncCheck($this->id, 'SET[clipBoard]', $this->MOD_SETTINGS['clipBoard'], '', '', 'id="checkClipBoard"') . ' <label for="checkClipBoard">' . $GLOBALS['LANG']->getLL('clipBoard', TRUE) . '</label>';
+                                       $pageContent .= '<div class="checkbox">' .
+                                               '<label for="checkClipBoard">' .
+                                                       BackendUtility::getFuncCheck($this->id, 'SET[clipBoard]', $this->MOD_SETTINGS['clipBoard'], '', '', 'id="checkClipBoard"') .
+                                                       $GLOBALS['LANG']->getLL('clipBoard', TRUE) .
+                                               '</label>' .
+                                       '</div>';
                                }
                                $pageContent .= '
                                        </div>