[TASK] Change Import/Export icons to sprite icons 84/40984/3
authorBenjamin Mack <benni@typo3.org>
Wed, 8 Jul 2015 11:55:55 +0000 (13:55 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Wed, 8 Jul 2015 17:52:46 +0000 (19:52 +0200)
Resolves: #67974
Releases: master
Change-Id: I28eb7c2305e3061fe92a03d15c1ef6d437d04edb
Reviewed-on: http://review.typo3.org/40984
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/gfx/rel_db.gif [deleted file]
typo3/gfx/rel_db_lost.gif [deleted file]
typo3/gfx/rel_db_static.gif [deleted file]
typo3/gfx/rel_file.gif [deleted file]
typo3/gfx/rel_softref.png [deleted file]
typo3/sysext/impexp/Classes/ImportExport.php

diff --git a/typo3/gfx/rel_db.gif b/typo3/gfx/rel_db.gif
deleted file mode 100644 (file)
index 594db2d..0000000
Binary files a/typo3/gfx/rel_db.gif and /dev/null differ
diff --git a/typo3/gfx/rel_db_lost.gif b/typo3/gfx/rel_db_lost.gif
deleted file mode 100644 (file)
index d35f1f2..0000000
Binary files a/typo3/gfx/rel_db_lost.gif and /dev/null differ
diff --git a/typo3/gfx/rel_db_static.gif b/typo3/gfx/rel_db_static.gif
deleted file mode 100644 (file)
index ff764d1..0000000
Binary files a/typo3/gfx/rel_db_static.gif and /dev/null differ
diff --git a/typo3/gfx/rel_file.gif b/typo3/gfx/rel_file.gif
deleted file mode 100644 (file)
index f602000..0000000
Binary files a/typo3/gfx/rel_file.gif and /dev/null differ
diff --git a/typo3/gfx/rel_softref.png b/typo3/gfx/rel_softref.png
deleted file mode 100644 (file)
index f54158f..0000000
Binary files a/typo3/gfx/rel_softref.png and /dev/null differ
index 428ebae..4b1cb30 100644 (file)
@@ -3731,7 +3731,8 @@ class ImportExport {
                                $this->error($pInfo['ref'] . ' was recursive...');
                                continue;
                        }
-                       $Iprepend = '';
+                       $spriteIconName = 'status-status-checked';
+                       $spriteIconClass = '';
                        $staticFixed = FALSE;
                        $record = NULL;
                        if ($uid > 0) {
@@ -3739,7 +3740,7 @@ class ImportExport {
                                if (!is_array($record)) {
                                        if ($this->isTableStatic($table) || $this->isExcluded($table, $uid) || $dat['tokenID'] && !$this->includeSoftref($dat['tokenID'])) {
                                                $pInfo['title'] = htmlspecialchars('STATIC: ' . $pInfo['ref']);
-                                               $Iprepend = '_static';
+                                               $spriteIconClass = 'text-info';
                                                $staticFixed = TRUE;
                                        } else {
                                                $doesRE = $this->doesRecordExist($table, $uid);
@@ -3747,7 +3748,8 @@ class ImportExport {
                                                $pInfo['title'] = htmlspecialchars($pInfo['ref']);
                                                $pInfo['title'] = '<span title="' . htmlspecialchars($lostPath) . '">' . $pInfo['title'] . '</span>';
                                                $pInfo['msg'] = 'LOST RELATION' . (!$doesRE ? ' (Record not found!)' : ' (Path: ' . $lostPath . ')');
-                                               $Iprepend = '_lost';
+                                               $spriteIconClass = 'text-danger';
+                                               $spriteIconName = 'status-dialog-warning';
                                        }
                                } else {
                                        $pInfo['title'] = htmlspecialchars($record['title']);
@@ -3758,7 +3760,10 @@ class ImportExport {
                                $pInfo['title'] = htmlspecialchars('FIXED: ' . $pInfo['ref']);
                                $staticFixed = TRUE;
                        }
-                       $pInfo['preCode'] = $preCode . '&nbsp;&nbsp;&nbsp;&nbsp;<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], ('gfx/rel_db' . $Iprepend . '.gif'), 'width="13" height="12"') . ' align="top" title="' . htmlspecialchars($pInfo['ref']) . '" alt="" />';
+
+                       $spriteIcon = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon($spriteIconName, array('class' => $spriteIconClass, 'title' => $pInfo['ref']));
+
+                       $pInfo['preCode'] = $preCode . '&nbsp;&nbsp;&nbsp;&nbsp;' . $spriteIcon;
                        $pInfo['class'] = $htmlColorClass ?: 'bgColor3';
                        $pInfo['type'] = 'rel';
                        if (!$staticFixed || $this->showStaticRelations) {