Follow-up to bug #13379: Sprite Icon API (thanks to Steffen Ritter)
authorSteffen Kamper <info@sk-typo3.de>
Tue, 25 May 2010 23:49:35 +0000 (23:49 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Tue, 25 May 2010 23:49:35 +0000 (23:49 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7674 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_iconworks.php
t3lib/config_default.php
t3lib/stddb/tables.php

index f2fe4d5..025fedf 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-05-26  Steffen Kamper  <info@sk-typo3.de>
 
+       * Follow-up to bug #13379: Sprite Icon API (thanks to Steffen Ritter)
        * Follow-up to bug #14324: Feature: Add spriteGeneratorAPI to support the new sprite-icon-api (thanks to Steffen Ritter)
 
 2010-05-25  Stanislas Rolland  <typo3@sjbr.ca>
index 701c462..2c0b96c 100644 (file)
@@ -877,12 +877,12 @@ final class t3lib_iconWorks       {
 
 
                        // now only show the status with the highest priority
-               $priorities = $GLOBALS['TYPO3_CONF_VARS']['BE']['spriteIconRecordOverlayPriorities'];
+               $priorities = $GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayPriorities'];
 
                $iconName = '';
                foreach ($priorities as $priority) {
                        if ($status[$priority]) {
-                               $iconName = $GLOBALS['TYPO3_CONF_VARS']['BE']['spriteIconRecordOverlayNames'][$priority];
+                               $iconName = $GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayNames'][$priority];
                                break;
                        }
                }
index 43f59ec..074135e 100644 (file)
@@ -291,19 +291,6 @@ $TYPO3_CONF_VARS = array(
                        'ExtDirect::route' => 't3lib/extjs/class.t3lib_extjs_extdirectrouter.php:t3lib_extjs_ExtDirectRouter->route',
                ),
                'XCLASS' => array(),                                    // See 'Inside TYPO3' document for more information.
-               'spriteIconRecordOverlayPriorities' => array('hidden', 'starttime', 'endtime', 'futureendtime', 'fe_group', 'protectedSection'),
-               'spriteIconRecordOverlayNames' => array(
-                       'hidden'           => 'status-overlay-hidden',
-                       'fe_group'         => 'status-overlay-access-restricted',
-                       'starttime'        => 'status-overlay-scheduled-start',
-                       'endtime'          => 'status-overlay-scheduled-end',
-                       'futureendtime'    => 'status-overlay-scheduled-future-end',
-                       'readonly'         => 'status-overlay-locked',
-                       'deleted'          => 'status-overlay-deleted',
-                       'missing'          => 'status-overlay-missing',
-                       'translated'       => 'status-overlay-translated',
-                       'protectedSection' => 'status-overlay-includes-subpages',
-               ),
        ),
        'FE' => array(                  // Configuration for the TypoScript frontend (FE). Nothing here relates to the administration backend!
                'png_to_gif' => FALSE,                                  // Boolean. Enables conversion back to gif of all png-files generated in the frontend libraries. Notice that this leaves an increased number of temporary files in typo3temp/
index ae2eadf..d899b99 100644 (file)
@@ -526,5 +526,18 @@ $FILEICONS = array(
 
 
 
+$GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayPriorities'] = array('hidden', 'starttime', 'endtime', 'futureendtime', 'fe_group', 'protectedSection');
+$GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayNames'] = array(
+       'hidden'           => 'status-overlay-hidden',
+       'fe_group'         => 'status-overlay-access-restricted',
+       'starttime'        => 'status-overlay-scheduled-start',
+       'endtime'          => 'status-overlay-scheduled-end',
+       'futureendtime'    => 'status-overlay-scheduled-future-end',
+       'readonly'         => 'status-overlay-locked',
+       'deleted'          => 'status-overlay-deleted',
+       'missing'          => 'status-overlay-missing',
+       'translated'       => 'status-overlay-translated',
+       'protectedSection' => 'status-overlay-includes-subpages',
+);
 
 ?>