[TASK] TS Object Browser: Add space to checkboxes 67/42067/5
authorJosef Glatz <jousch@gmail.com>
Tue, 28 Jul 2015 18:09:22 +0000 (20:09 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Tue, 28 Jul 2015 19:11:11 +0000 (21:11 +0200)
Add space between checkboxes and labels. Change
"typo3-listOptions" menu to gain the appearance of
the menu located in the list module.

Change-Id: I041ba83bf148b8dbd967bfd41744960e48809827
Releases: master
Resolves: #68597
Reviewed-on: http://review.typo3.org/42067
Reviewed-by: Alexander Grein <mail@mediaessenz.de>
Tested-by: Alexander Grein <mail@mediaessenz.de>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php

index 314989d..9d55b5c 100755 (executable)
@@ -163,7 +163,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass {
                                'template' => 'all'
                        );
                        $aHref = BackendUtility::getModuleUrl('web_ts', $urlParameters);
-                       $this->doc->form = '<form action="' . htmlspecialchars($aHref) . '" method="post" enctype="multipart/form-data" name="editForm" class="form-inline">';
+                       $this->doc->form = '<form action="' . htmlspecialchars($aHref) . '" method="post" enctype="multipart/form-data" name="editForm" class="form">';
 
                        // JavaScript
                        $this->doc->JScode = '
@@ -187,7 +187,6 @@ class TypoScriptTemplateModuleController extends BaseScriptClass {
                                TABLE#typo3-objectBrowser A { text-decoration: none; }
                                TABLE#typo3-objectBrowser .comment { color: maroon; font-weight: bold; }
                                .ts-typoscript { width: 100%; }
-                               .tsob-menu-row2 {margin-top: 10px;}
                                .tsob-search-submit {margin-left: 3px; margin-right: 3px;}
                                .tst-analyzer-options { margin:5px 0; }
                        ';
index 967ea0c..52ab411 100644 (file)
@@ -475,7 +475,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
                        $theOutput .= '</div>';
 
                        // second row options
-                       $menu = '<div class="tsob-menu-row2">';
+                       $menu = '<div id="typo3-listOptions">';
                        $menu .= '<div class="checkbox"><label for="checkTs_browser_showComments">' . BackendUtility::getFuncCheck($this->pObj->id, 'SET[ts_browser_showComments]', $this->pObj->MOD_SETTINGS['ts_browser_showComments'], '', '', 'id="checkTs_browser_showComments"');
                        $menu .= $lang->getLL('displayComments') . '</label></div>';
                        $menu .= '<div class="checkbox"><label for="checkTs_browser_alphaSort">' . BackendUtility::getFuncCheck($this->pObj->id, 'SET[ts_browser_alphaSort]', $this->pObj->MOD_SETTINGS['ts_browser_alphaSort'], '', '', 'id="checkTs_browser_alphaSort"');
@@ -483,12 +483,12 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
                        $menu .= '<div class="checkbox"><label for="checkTs_browser_fixedLgd">' . BackendUtility::getFuncCheck($this->pObj->id, 'SET[ts_browser_fixedLgd]', $this->pObj->MOD_SETTINGS['ts_browser_fixedLgd'], '', '', 'id="checkTs_browser_fixedLgd"');
                        $menu .= $lang->getLL('cropLines') . '</label></div>';
                        if ($bType == 'setup' && !$this->pObj->MOD_SETTINGS['ts_browser_fixedLgd']) {
-                               $menu .= '<div class="form-inline form-inline-spaced"><label>' . $lang->getLL('displayConstants') . '</label>';
+                               $menu .= '<div class="form"><label>' . $lang->getLL('displayConstants') . '</label>';
                                $menu .= BackendUtility::getDropdownMenu($this->pObj->id, 'SET[ts_browser_const]', $this->pObj->MOD_SETTINGS['ts_browser_const'], $this->pObj->MOD_MENU['ts_browser_const']);
                                $menu .= '</div>';
                        }
                        $menu .= '</div>';
-                       $theOutput .= $this->pObj->doc->section($lang->getLL('displayOptions'), '<span class="text-nowrap">' . $menu . '</span>', 0, 1);
+                       $theOutput .= $this->pObj->doc->section($lang->getLL('displayOptions'), $menu, 0, 1);
                        // Conditions:
                        if (is_array($templateService->sections) && !empty($templateService->sections)) {
                                $theOutput .= $this->pObj->doc->section($lang->getLL('conditions'), '', 0, 1);
@@ -498,7 +498,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
                                        $out .= '<input class="checkbox" type="checkbox" name="conditions[' . $key . ']" id="check' . $key . '" value="' . htmlspecialchars($val) . '"' . ($this->pObj->MOD_SETTINGS['tsbrowser_conditions'][$key] ? ' checked' : '') . ' />' . $templateService->substituteCMarkers(htmlspecialchars($val));
                                        $out .= '</label></div>';
                                }
-                               $theOutput .=  '<div class="tsob-menu-row2">' . $out . '</div><input class="btn btn-default" type="submit" name="Submit" value="' . $lang->getLL('setConditions') . '" />';
+                               $theOutput .=  '<div id="typo3-listOptions">' . $out . '</div><input class="btn btn-default" type="submit" name="Submit" value="' . $lang->getLL('setConditions') . '" />';
                        }
                        // Ending section:
                        $theOutput .= $this->pObj->doc->sectionEnd();