From 9389273c2e3adc579d45688fc0bd855e9817ff36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20N=C3=A4gler?= <typo3@naegler.net>
Date: Sun, 23 Nov 2014 22:26:52 +0100
Subject: [PATCH] [TASK] Table cell icons as btn-group
Extension module: Table cell icons as btn-group with
empty-empty / order
Resolves: #63236
Releases: master
Change-Id: I83f3dbdf2ad3b7fee3d882ff02633ca590d45d76
Reviewed-on: http://review.typo3.org/34517
Reviewed-by: Sebastian Fischer <typo3@evoweb.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
---
.../ViewHelpers/ConfigureExtensionViewHelper.php | 4 +++-
.../DownloadExtensionDataViewHelper.php | 6 ++++--
.../ViewHelpers/RemoveExtensionViewHelper.php | 8 +++++---
.../ViewHelpers/UpdateScriptViewHelper.php | 3 +++
.../Resources/Private/Templates/List/Index.html | 16 +++++++++-------
5 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
index 21d1900e814d..a436615e216c 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
*
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Backend\Utility\IconUtility;
+
/**
* View helper for configure extension link
*
@@ -56,7 +58,7 @@ class ConfigureExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\Act
$this->tag->setContent($content);
$content = $this->tag->render();
} elseif ($forceConfiguration) {
- $content = '';
+ $content = '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
}
return $content;
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
index 8d1e372fe1c3..7327ecc65374 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
*
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Backend\Utility\IconUtility;
+
/**
* view helper for displaying a download extension data link
*
@@ -35,7 +37,7 @@ class DownloadExtensionDataViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\
public function render($extension) {
$filePrefix = PATH_site . $extension['siteRelPath'];
if (!file_exists(($filePrefix . 'ext_tables.sql')) && !file_exists(($filePrefix . 'ext_tables_static+adt.sql'))) {
- return '';
+ return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
}
$uriBuilder = $this->controllerContext->getUriBuilder();
$uriBuilder->reset();
@@ -43,7 +45,7 @@ class DownloadExtensionDataViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\
'extension' => $extension['key']
), 'Action');
$this->tag->addAttribute('href', $uri);
- $cssClass = 'downloadExtensionData';
+ $cssClass = 'downloadExtensionData btn';
$this->tag->addAttribute('class', $cssClass);
$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.downloadsql', 'extensionmanager'));
$this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-extension-sqldump'));
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
index a175221f1910..f87a0a22de5d 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
*
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Backend\Utility\IconUtility;
+
/**
* view helper for displaying a remove extension link
*
@@ -34,13 +36,13 @@ class RemoveExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\Action
*/
public function render($extension) {
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extension['key'])) {
- return '';
+ return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
}
if (
!in_array($extension['type'], \TYPO3\CMS\Extensionmanager\Domain\Model\Extension::returnAllowedInstallTypes()) ||
$extension['type'] === 'System'
) {
- return '';
+ return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
}
$uriBuilder = $this->controllerContext->getUriBuilder();
$action = 'removeExtension';
@@ -50,7 +52,7 @@ class RemoveExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\Action
'extension' => $extension['key']
), 'Action');
$this->tag->addAttribute('href', $uri);
- $cssClass = 'removeExtension';
+ $cssClass = 'removeExtension btn';
$this->tag->addAttribute('class', $cssClass);
$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.remove', 'extensionmanager'));
$this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-edit-delete'));
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
index c21e79eaec6e..78f0c8ae051a 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
*
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Backend\Utility\IconUtility;
/**
* View helper for update script link
@@ -57,6 +58,8 @@ class UpdateScriptViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionVie
$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.update.script', 'extensionmanager'));
$this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('extensions-extensionmanager-update-script'));
$tag = $this->tag->render();
+ } else {
+ return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
}
return $tag;
}
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index be7a798649c4..9fbbea1c72e9 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -87,13 +87,15 @@
{extension.version}
</td>
<td class="icons">
- <em:processAvailableActions extension="{extension}">
- <em:configureExtension extension="{extension}"><f:be.buttons.icon icon="actions-system-extension-configure" title="{f:translate(key:'extensionList.configure')}" /></em:configureExtension>
- <em:updateScript extensionKey="{extension.key}" />
- <em:removeExtension extension="{extension}" />
- <f:be.buttons.icon uri="{f:uri.action(action:'downloadExtensionZip',controller:'Action',arguments:'{extension:extension.key}')}" icon="actions-system-extension-download" title="{f:translate(key:'extensionList.downloadzip')}"/>
- <em:downloadExtensionData extension="{extension}" />
- </em:processAvailableActions>
+ <div class="btn-group">
+ <em:processAvailableActions extension="{extension}">
+ <em:configureExtension class="btn" extension="{extension}"><f:be.buttons.icon icon="actions-system-extension-configure" title="{f:translate(key:'extensionList.configure')}" /></em:configureExtension>
+ <em:updateScript class="btn" extensionKey="{extension.key}" />
+ <em:removeExtension class="btn" extension="{extension}" />
+ <span class="btn"><f:be.buttons.icon uri="{f:uri.action(action:'downloadExtensionZip',controller:'Action',arguments:'{extension:extension.key}')}" icon="actions-system-extension-download" title="{f:translate(key:'extensionList.downloadzip')}"/></span>
+ <em:downloadExtensionData class="btn" extension="{extension}" />
+ </em:processAvailableActions>
+ </div>
</td>
<td class="state {extension.state}">
{extension.state}
--
GitLab