[TASK] Align submit and action button's positions 38/36738/9
authorFelix Kopp <felix-source@phorax.com>
Sat, 21 Feb 2015 23:42:21 +0000 (00:42 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 26 Feb 2015 16:42:36 +0000 (17:42 +0100)
Unify button positions as last column in tables and obvious submit
buttons underneath tables.

+ extension manager - switch state/action columns
+ scheduler - add button style to overview/info
+ func wizards sort - add submit button style

Resolves: #64926
Releases: master
Change-Id: If6a413d24c7af769284ac77d5764cced7b14f5bc
Reviewed-on: http://review.typo3.org/36738
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
typo3/sysext/scheduler/Resources/Private/Styles/styles.less
typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
typo3/sysext/scheduler/Resources/Public/Styles/styles.css
typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php

index a93ea33..9d33ab0 100644 (file)
@@ -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();
        }
index 0e8521f..b18cead 100644 (file)
@@ -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>
index 72c42fc..915ded8 100644 (file)
@@ -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
index d9fc0ad..780c16f 100644 (file)
                                <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>
index 082605b..8394025 100644 (file)
@@ -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;
-}
index b6926d4..0139e4b 100644 (file)
@@ -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,