diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php index a93ea335d5c99f8798439dc9776e91d3c2e81957..9d33ab06b7be2fcfd2f972f2dc5d4c3cee560f3b 100644 --- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php +++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php @@ -51,7 +51,7 @@ class ToggleExtensionInstallationStateViewHelper extends \TYPO3\CMS\Fluid\ViewHe $label = $extension['installed'] ? 'deactivate' : 'activate'; $this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.' . $label, 'extensionmanager')); $icon = $extension['installed'] ? 'uninstall' : 'install'; - $this->tag->addAttribute('class', 'onClickMaskExtensionManager'); + $this->tag->addAttribute('class', 'onClickMaskExtensionManager btn btn-default'); $this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-extension-' . $icon)); return $this->tag->render(); } diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html index 0e8521f17860b615fcb440eb9e481b03eb9a3119..b18cead98a808ef75a92644a1b03276561d422d1 100644 --- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html +++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html @@ -30,8 +30,8 @@ <th><f:translate key="extensionList.header.extensionName"/></th> <th class="hidden-xs hidden-sm"><f:translate key="extensionList.header.extensionKey"/></th> <th class="hidden-xs"><f:translate key="extensionList.header.extensionVersion"/></th> - <th><f:translate key="extensionList.header.extensionActions"/></th> <th><f:translate key="extensionList.header.extensionState"/></th> + <th><f:translate key="extensionList.header.extensionActions"/></th> </tr> </thead> <tbody> @@ -85,6 +85,9 @@ <td class="hidden-xs"> {extension.version} </td> + <td> + <span class="label label-{extension.state}">{extension.state}</span> + </td> <td class="icons nowrap"> <div class="btn-group"> <em:processAvailableActions extension="{extension}"> @@ -96,9 +99,6 @@ </em:processAvailableActions> </div> </td> - <td> - <span class="label label-{extension.state}">{extension.state}</span> - </td> </tr> </f:for> </tbody> diff --git a/typo3/sysext/scheduler/Resources/Private/Styles/styles.less b/typo3/sysext/scheduler/Resources/Private/Styles/styles.less index 72c42fc832360f22ebae015a30b55551bf346621..915ded847070e7744a862e2499884943dd7565d0 100644 --- a/typo3/sysext/scheduler/Resources/Private/Styles/styles.less +++ b/typo3/sysext/scheduler/Resources/Private/Styles/styles.less @@ -44,12 +44,3 @@ Scheduler } } - -/* Definition for BE function "Setup check" */ -.info-block { - margin: 25px 0px 0px 0px; - - p { - margin: 8px 5px 8px 5px; - } -} \ No newline at end of file diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html index d9fc0adc92a69712285739709f9302fa6fb7175c..780c16f9f9c8ab4a97dc7228ea60a43ec99814e9 100644 --- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html +++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html @@ -25,14 +25,16 @@ <td>{classInfo.extension}</td> <td>{classInfo.description}</td> <td> - <a - href="{s:moduleLink(function:'list',cmd:'add',arguments:'{class: class}')}" - title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}" - class="icon"> - <s:spriteIcon iconName="actions-document-new" /> - </a> + <div class="btn-group" role="group"> + <a + href="{s:moduleLink(function:'list',cmd:'add',arguments:'{class: class}')}" + title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}" + class="btn btn-default"> + <s:spriteIcon iconName="actions-document-new" /> + </a> + </div> </td> </tr> </f:for> </tbody> -</table> \ No newline at end of file +</table> diff --git a/typo3/sysext/scheduler/Resources/Public/Styles/styles.css b/typo3/sysext/scheduler/Resources/Public/Styles/styles.css index 082605b4968883a26e9ecee5e9d7bf7322b992d4..8394025efe146017dfa2d39501a6fc60a4b95da0 100644 --- a/typo3/sysext/scheduler/Resources/Public/Styles/styles.css +++ b/typo3/sysext/scheduler/Resources/Public/Styles/styles.css @@ -32,10 +32,3 @@ Scheduler padding-bottom: 5px; font-weight: bold; } -/* Definition for BE function "Setup check" */ -.info-block { - margin: 25px 0px 0px 0px; -} -.info-block p { - margin: 8px 5px 8px 5px; -} diff --git a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php index b6926d452feaaa90add2b0aad8ac134aa2015015..0139e4bb3b7e443888373be566426c8ca97664e4 100644 --- a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php +++ b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php @@ -63,10 +63,10 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu if (!empty($menuItems)) { $lines = array(); $lines[] = '<thead><tr>'; - $lines[] = '<th>' . $this->wiz_linkOrder($GLOBALS['LANG']->getLL('wiz_changeOrder_title'), 'title') . '</th>'; - $lines[] = '<th>' . $this->wiz_linkOrder($GLOBALS['LANG']->getLL('wiz_changeOrder_subtitle'), 'subtitle') . '</th>'; - $lines[] = '<th>' . $this->wiz_linkOrder($GLOBALS['LANG']->getLL('wiz_changeOrder_tChange'), 'tstamp') . '</th>'; - $lines[] = '<th>' . $this->wiz_linkOrder($GLOBALS['LANG']->getLL('wiz_changeOrder_tCreate'), 'crdate') . '</th>'; + $lines[] = '<th>' . $GLOBALS['LANG']->getLL('wiz_changeOrder_title') . '</th>'; + $lines[] = '<th>' . $GLOBALS['LANG']->getLL('wiz_changeOrder_subtitle') . '</th>'; + $lines[] = '<th>' . $GLOBALS['LANG']->getLL('wiz_changeOrder_tChange') . '</th>'; + $lines[] = '<th>' . $GLOBALS['LANG']->getLL('wiz_changeOrder_tCreate') . '</th>'; $lines[] = '</tr></thead>'; foreach ($menuItems as $rec) { @@ -90,7 +90,7 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu $lines[] = $this->wiz_linkOrder($GLOBALS['LANG']->getLL('wiz_changeOrder_tCreate'), 'crdate'); $lines[] = ''; $lines[] = $this->wiz_linkOrder($GLOBALS['LANG']->getLL('wiz_changeOrder_REVERSE'), 'REV'); - $theCode .= '<h4>' . $GLOBALS['LANG']->getLL('wiz_changeOrder') . '</h4>' . implode('<br />', $lines); + $theCode .= '<h4>' . $GLOBALS['LANG']->getLL('wiz_changeOrder') . '</h4><p>' . implode(' ', $lines) . '</p>'; } else { $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $GLOBALS['LANG']->getLL('no_subpages'), '', \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE); $theCode .= $flashMessage->render(); @@ -112,7 +112,7 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu * @return string HTML string */ protected function wiz_linkOrder($title, $order) { - return '<a class="t3-link" href="' . htmlspecialchars( + return '<a class="btn btn-default" href="' . htmlspecialchars( BackendUtility::getModuleUrl('web_func', array( 'id' => $GLOBALS['SOBE']->id,