[TASK] Remove typo3/gfx 99/42299/3
authorBenjamin Mack <benni@typo3.org>
Wed, 5 Aug 2015 22:38:59 +0000 (00:38 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 6 Aug 2015 08:12:08 +0000 (10:12 +0200)
As all occurences are removed for now, the clear.gif icon and the whole
gfx/ directory can be removed as well.

Releases: master
Resolves: #25024
Change-Id: I2e87ccffdc1b27d2a78684b50bf47533d59ceb67
Reviewed-on: http://review.typo3.org/42299
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/clear.gif [deleted file]
typo3/gfx/.htaccess [deleted file]
typo3/gfx/clear.gif [deleted file]
typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
typo3/sysext/lang/Classes/Domain/Model/Extension.php
typo3/sysext/lang/Classes/Domain/Repository/ExtensionRepository.php

diff --git a/typo3/clear.gif b/typo3/clear.gif
deleted file mode 100644 (file)
index e1d2d83..0000000
Binary files a/typo3/clear.gif and /dev/null differ
diff --git a/typo3/gfx/.htaccess b/typo3/gfx/.htaccess
deleted file mode 100644 (file)
index 823a6bf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<FilesMatch "\.(gif|png|jpg)$">
-       <IfModule mod_expires.c>
-               ExpiresActive on
-               ExpiresDefault "access plus 7 days"
-       </IfModule>
-       FileETag MTime Size
-</FilesMatch>
diff --git a/typo3/gfx/clear.gif b/typo3/gfx/clear.gif
deleted file mode 100644 (file)
index e1d2d83..0000000
Binary files a/typo3/gfx/clear.gif and /dev/null differ
index f83f0a3..b7c6168 100644 (file)
@@ -855,7 +855,7 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                // Add a cell which will set a minimum width:
                $lines[] = '
                        <tr>
-                               <td nowrap="nowrap"><img src="clear.gif" width="70" height="1" alt="" /></td>
+                               <td nowrap="nowrap"><span style="width: 70px; height: 1px;"></span></td>
                                <td></td>
                        </tr>';
                // Wrap in table and return:
index 9899cf6..53e1197 100644 (file)
@@ -37,12 +37,12 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        /**
         * @var int
         */
-       protected $iconWidth = 0;
+       protected $iconWidth = 28;
 
        /**
         * @var int
         */
-       protected $iconHeight = 0;
+       protected $iconHeight = 28;
 
        /**
         * @var int
index 1f253b0..a86cc08 100644 (file)
@@ -55,8 +55,12 @@ class ExtensionRepository {
                                        $this->getExtensionIconWithPath($entry)
                                );
                                $extension->setVersionFromString($entry['version']);
-                               $extension->setIconWidth($entry['ext_icon_width']);
-                               $extension->setIconHeight($entry['ext_icon_height']);
+                               if ($entry['ext_icon_width'] > 0) {
+                                       $extension->setIconWidth($entry['ext_icon_width']);
+                               }
+                               if ($entry['ext_icon_height'] > 0) {
+                                       $extension->setIconHeight($entry['ext_icon_height']);
+                               }
 
                                $this->extensions[$entry['key']] = $extension;
                        }
@@ -103,7 +107,7 @@ class ExtensionRepository {
                        $extensionIcon = ExtensionManagementUtility::getExtensionIcon(PATH_site . $extensionEntry['siteRelPath'] . '/');
                }
                if (empty($extensionIcon)) {
-                       $extensionIcon = '/typo3/clear.gif';
+                       $extensionIcon = '/typo3/sysext/core/ext_icon.png';
                } else {
                        $extensionIcon = '../' . $extensionEntry['siteRelPath'] . '/' . $extensionIcon;
                }