From e22129945ee4507880be6e126f7d1f5f5fcf607b Mon Sep 17 00:00:00 2001 From: Andreas Fernandez <a.fernandez@scripting-base.de> Date: Wed, 4 Mar 2015 09:10:51 +0100 Subject: [PATCH] [TASK] EM: Fix icon leftovers The "Update extension" task uses an FA icon now. The obsolete file "ExtensionUpdateScript.png" is removed. Resolves: #65500 Releases: master Change-Id: If527b0e8fd77a059c8b25db16a926c5c80356331 Reviewed-on: http://review.typo3.org/37514 Reviewed-by: Markus Klein <klein.t3@reelworx.at> 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> --- .../Private/Templates/List/Index.html | 36 ++++++++++-------- .../Images/Icons/ExtensionUpdateScript.png | Bin 603 -> 0 bytes .../t3skin/Classes/Slot/IconStyleModifier.php | 1 + 3 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 typo3/sysext/extensionmanager/Resources/Public/Images/Icons/ExtensionUpdateScript.png diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html index b18cead98a80..d85159848f12 100644 --- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html +++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html @@ -46,21 +46,27 @@ </f:if> <td> <f:if condition="{extension.updateAvailable}"> - <f:if condition="{extension.state} == 'excludeFromUpdates'"> - <f:then> - <f:be.buttons.icon - icon="actions-system-extension-update-disabled" - title="{f:translate(key:'extensionList.updateDisabled')}" - /> - </f:then> - <f:else> - <f:be.buttons.icon - uri="{f:uri.action(action:'updateCommentForUpdatableVersions',controller:'Download',arguments:{extension:extension.key, integerVersion: extension.terObject.integerVersion},format:'json')}" - icon="actions-system-extension-update" - title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}" - /> - </f:else> - </f:if> + <div class="btn-group"> + <f:if condition="{extension.state} == 'excludeFromUpdates'"> + <f:then> + <span class="btn btn-default disabled"> + <f:be.buttons.icon + icon="actions-system-extension-update" + title="{f:translate(key:'extensionList.updateDisabled')}" + /> + </span> + </f:then> + <f:else> + <span class="btn btn-default"> + <f:be.buttons.icon + uri="{f:uri.action(action:'updateCommentForUpdatableVersions',controller:'Download',arguments:{extension:extension.key, integerVersion: extension.terObject.integerVersion},format:'json')}" + icon="actions-system-extension-update" + title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}" + /> + </span> + </f:else> + </f:if> + </div> </f:if> </td> <td> diff --git a/typo3/sysext/extensionmanager/Resources/Public/Images/Icons/ExtensionUpdateScript.png b/typo3/sysext/extensionmanager/Resources/Public/Images/Icons/ExtensionUpdateScript.png deleted file mode 100644 index 0e1a712d5da7bbde78907b0ab9a8df73fed45065..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 603 zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003^P)t-s|NsAP zz+-H@U~s}@Zogt<u~=B6PgI{vZNFk)tyNH&M{T}hM~^^ix?f$YQ(2}^R-sK&oJvE9 zJXxhsPM1bipiEz^RZyBpOqE1ir%_X#N=}$YN|QrEi90@oIH%U0p3#<*%Zr=OlbFts zX{%v}$b6a3ke$(#pwgCsz;}MUb(hSJjmL(R%Z!A;eQCK~X0}|U)SRNznSQ=@tJtBU z)R{_>LPm{0LWw&*gg9fdSfSIHd%AL_)tpI@LZsB2lF5mx*r1Zii<{7rjLL#Vj6Ok! zI(fKpa<yre%#M%Bh-If;M2kIMpjcX+R5^V!q0^RevT2XWhlIp^iN=D5#D9dteuBb# zQ<hCJb1Y`HTZPAaW2IYryLE-beuBb$fWdiwzjsfPN-b_Fsn?*O(U&`aH8*=PQIt$h zkx4CXC@*m<c)D;bZ73{kC&$LE?*IS*A9PYqQvhq&8q3(r8p~_TYirp3f`a|nf_H-0 z{ibWn8p~_b2Sn5j0001<Nkl<Z7}H~5APz7x=|{10!nw>WssWDjYB_A|Pyr4X6H{Az zX9agI2%kGTMLtziOIt}<g$FFatFEEI$1fnLqpK$b7BDb0G8SfF5HT~iumlTOSu5Cx zGBDV|EfI52bP|_faCL(TNP2iGdU^Z!`uW2|qymG2LqfyCBO;*!(lRlzaq$U>Ny%_y pWaZM*GcvPK{ga)G=D|D&1pw)k7+Qx8m>K{8002ovPDHLkV1iEI4i^9b diff --git a/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php b/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php index 91c21e40a656..0ecb47117f94 100644 --- a/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php +++ b/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php @@ -77,6 +77,7 @@ class IconStyleModifier { 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-download' => 'fa-download', 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-install' => 'fa-plus-circle', 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-sqldump' => 'fa-database', + 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-update' => 'fa-refresh', 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-uninstall' => 'fa-minus-square', 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-help-open' => 'fa-question-circle', 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-list-open' => 'fa-list-alt', -- GitLab