Index: classes/class.tx_templavoila_icons.php =================================================================== --- classes/class.tx_templavoila_icons.php (revision 36016) +++ classes/class.tx_templavoila_icons.php (working copy) @@ -1,128 +1,133 @@ - -* All rights reserved -* -* This script is part of the Typo3 project. The Typo3 project is -* free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* The GNU General Public License can be found at -* http://www.gnu.org/copyleft/gpl.html. -* -* This script is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This copyright notice MUST APPEAR in all copies of the script! -***************************************************************/ - -/** - * Class which adds an additional layer for icon creation - * - */ -final class tx_templavoila_icons { - - static $oldIcons = array( - 'actions-view-go-back' => array('file' => 'gfx/goback.gif', 'attributes' => 'width="14" height="14"'), - 'actions-document-new' => array('file' => 'gfx/new_el.gif'), - 'actions-insert-record' => array('file' => 'gfx/insert3.gif'), - 'actions-edit-hide'=> array('file' => 'gfx/button_hide.gif'), - 'actions-edit-unhide'=> array('file' => 'gfx/button_unhide.gif'), - 'actions-document-view' => array('file' => 'gfx/zoom.gif', 'attributes' => 'width="12" height="12"'), - 'actions-system-list-open' => array('file' => 'gfx/list.gif', 'attributes' => 'width="11" height="11"'), - 'actions-document-history-open' => array('file' => 'gfx/history2.gif', 'attributes' => 'width="13" height="12"'), - 'actions-page-move' => array('file' => 'gfx/move_page.gif', 'attributes' => 'width="11" height="12"'), - 'actions-page-new' => array('file' => 'gfx/new_page.gif', 'attributes' => 'width="13" height="12"'), - 'actions-document-open' => array('file' => 'gfx/edit2.gif', 'attributes' => 'width="11" height="12"'), - 'actions-edit-delete' => array('file' => 'gfx/deletedok.gif'), - 'actions-edit-copy' => array('file' => 'gfx/clip_copy.gif'), - 'actions-edit-copy-release' => array('file' => 'gfx/clip_copy_h.gif'), - 'actions-edit-cut' => array('file' => 'gfx/clip_cut.gif'), - 'actions-edit-cut-release' => array('file' => 'gfx/clip_cut_h.gif'), - 'actions-system-list-open' => array('file' => 'mod/web/list/list.gif'), - 'apps-pagetree-page-shortcut' => array('file' => 'gfx/shortcut.gif'), - 'actions-move-up' => array('file' => 'gfx/pilup.gif'), - 'actions-move-down' => array('file' => 'gfx/pildown.gif'), - 'actions-view-table-expand' => array('file' => 'gfx/plusbullet_list.gif'), - 'actions-view-table-collapse' => array('file' => 'gfx/minusbullet_list.gif'), - ); - - static $useOldIcons = null; - static $reInit = true; - - public static function init() { - - if(self::$useOldIcons !== null && self::$reInit == false) { - return; - } - - if(version_compare(TYPO3_version,'4.4','<') || self::$useOldIcons) { - self::$useOldIcons = true; - if (is_array($GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'])) { - foreach($GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'] as $name => $file) { - if (!isset(self::$oldIcons[$name])) { - self::$oldIcons[$name] = array('file' => $file); - } - } - } - } else { - self::$useOldIcons = false; - } - self::$reInit = true; - } - - /** - * - * @param string $iconName - * @param array $options - * @param array $overlays - * @return string - */ - public static function getIcon($iconName, $options = array(), $overlays = array()) { - - self::init(); - - if (self::$useOldIcons) { - $alt = isset($options['alt']) ? ' alt="' . $options['alt'] .'"': ' alt=""'; - $title = isset($options['title']) ? ' alt="' . $options['title'] .'"': ''; - $wHattribs = isset(self::$oldIcons[$iconName]['attributes']) ? self::$oldIcons[$iconName]['attributes'] : ''; - return ''; - } else { - return t3lib_iconWorks::getSpriteIcon($iconName, $options, $overlays); - } - } - - /** - * - * @param string $table - * @param array $row - * @param array $options - * @return string - */ - public static function getIconForRecord($table, $row, $options = array()) { - - if (self::$useOldIcons === null) { - self::init(); - } - if (self::$useOldIcons) { - - if($table == 'pages') { - $title = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $row), 50)); - } else { - $title = '[' . $table . ':'.$row['uid']; - } - - return ''; - } else { - return t3lib_iconWorks::getSpriteIconForRecord($table, $row, $options); - } - } - -} -?> + +* All rights reserved +* +* This script is part of the Typo3 project. The Typo3 project is +* free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* The GNU General Public License can be found at +* http://www.gnu.org/copyleft/gpl.html. +* +* This script is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* This copyright notice MUST APPEAR in all copies of the script! +***************************************************************/ + +/** + * Class which adds an additional layer for icon creation + * + */ +final class tx_templavoila_icons { + + static $oldIcons = array( + 'actions-view-go-back' => array('file' => 'gfx/goback.gif', 'attributes' => 'width="14" height="14"'), + 'actions-document-new' => array('file' => 'gfx/new_el.gif'), + 'actions-insert-record' => array('file' => 'gfx/insert3.gif'), + 'actions-edit-hide'=> array('file' => 'gfx/button_hide.gif'), + 'actions-edit-unhide'=> array('file' => 'gfx/button_unhide.gif'), + 'actions-document-view' => array('file' => 'gfx/zoom.gif', 'attributes' => 'width="12" height="12"'), + 'actions-system-list-open' => array('file' => 'gfx/list.gif', 'attributes' => 'width="11" height="11"'), + 'actions-document-history-open' => array('file' => 'gfx/history2.gif', 'attributes' => 'width="13" height="12"'), + 'actions-page-move' => array('file' => 'gfx/move_page.gif', 'attributes' => 'width="11" height="12"'), + 'actions-page-new' => array('file' => 'gfx/new_page.gif', 'attributes' => 'width="13" height="12"'), + 'actions-document-open' => array('file' => 'gfx/edit2.gif', 'attributes' => 'width="11" height="12"'), + 'actions-edit-delete' => array('file' => 'gfx/deletedok.gif'), + 'actions-edit-copy' => array('file' => 'gfx/clip_copy.gif'), + 'actions-edit-copy-release' => array('file' => 'gfx/clip_copy_h.gif'), + 'actions-edit-cut' => array('file' => 'gfx/clip_cut.gif'), + 'actions-edit-cut-release' => array('file' => 'gfx/clip_cut_h.gif'), + 'actions-system-list-open' => array('file' => 'gfx/list.gif'), + 'apps-pagetree-page-shortcut' => array('file' => 'gfx/shortcut.gif'), + 'actions-move-up' => array('file' => 'gfx/pilup.gif'), + 'actions-move-down' => array('file' => 'gfx/pildown.gif'), + 'actions-view-table-expand' => array('file' => 'gfx/plusbullet_list.gif'), + 'actions-view-table-collapse' => array('file' => 'gfx/minusbullet_list.gif'), + 'status-dialog-ok' => array('file' => 'gfx/icon_ok2.gif'), + 'status-dialog-warning' => array('file' => 'gfx/icon_warning2.gif'), + 'status-dialog-error' => array('file' => 'gfx/icon_fatalerror.gif'), + 'status-dialog-information' => array('file' => 'gfx/info.gif'), + 'status-dialog-notification' => array('file' => 'gfx/icon_note.gif'), + ); + + static $useOldIcons = null; + static $reInit = true; + + public static function init() { + + if(self::$useOldIcons !== null && self::$reInit == false) { + return; + } + + if(version_compare(TYPO3_version,'4.4','<') || self::$useOldIcons) { + self::$useOldIcons = true; + if (is_array($GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'])) { + foreach($GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'] as $name => $file) { + if (!isset(self::$oldIcons[$name])) { + self::$oldIcons[$name] = array('file' => $file); + } + } + } + } else { + self::$useOldIcons = false; + } + self::$reInit = true; + } + + /** + * + * @param string $iconName + * @param array $options + * @param array $overlays + * @return string + */ + public static function getIcon($iconName, $options = array(), $overlays = array()) { + + self::init(); + + if (self::$useOldIcons) { + $alt = isset($options['alt']) ? ' alt="' . $options['alt'] .'"': ' alt=""'; + $title = isset($options['title']) ? ' alt="' . $options['title'] .'"': ''; + $wHattribs = isset(self::$oldIcons[$iconName]['attributes']) ? self::$oldIcons[$iconName]['attributes'] : ''; + return ''; + } else { + return t3lib_iconWorks::getSpriteIcon($iconName, $options, $overlays); + } + } + + /** + * + * @param string $table + * @param array $row + * @param array $options + * @return string + */ + public static function getIconForRecord($table, $row, $options = array()) { + + if (self::$useOldIcons === null) { + self::init(); + } + if (self::$useOldIcons) { + + if($table == 'pages') { + $title = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $row), 50)); + } else { + $title = '[' . $table . ':'.$row['uid']; + } + + return ''; + } else { + return t3lib_iconWorks::getSpriteIconForRecord($table, $row, $options); + } + } + +} +?> Index: cm1/index.php =================================================================== --- cm1/index.php (revision 36016) +++ cm1/index.php (working copy) @@ -575,7 +575,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase { ); $msg[] = $flashMessage->render(); } else { - $msg[] = ''.$GLOBALS['LANG']->getLL('error').' '.$GLOBALS['LANG']->getLL('errorNoToTitleDefined'); + $msg[] = tx_templavoila_icons::getIcon('status-dialog-error') . ''.$GLOBALS['LANG']->getLL('error').' '.$GLOBALS['LANG']->getLL('errorNoToTitleDefined'); } } else { $cmd = 'saveDSandTO'; @@ -608,7 +608,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase { // Checking Storage Folder PID: if (!count($this->storageFolders)) { - $msg[] = ''.$GLOBALS['LANG']->getLL('error').' '.$GLOBALS['LANG']->getLL('errorNoStorageFolder'); + $msg[] = tx_templavoila_icons::getIcon('status-dialog-error') . ''.$GLOBALS['LANG']->getLL('error').' '.$GLOBALS['LANG']->getLL('errorNoStorageFolder'); } // Session data @@ -813,15 +813,15 @@ class tx_templavoila_cm1 extends t3lib_SCbase { $tce->process_datamap(); $newToID = intval($tce->substNEWwithIDs['NEW']); if ($newToID) { - $msg[] = '' . + $msg[] = tx_templavoila_icons::getIcon('status-dialog-ok') . sprintf($GLOBALS['LANG']->getLL('msgDSTOSaved'), $dataArr['tx_templavoila_tmplobj']['NEW']['datastructure'], $tce->substNEWwithIDs['NEW'], $this->_saveDSandTO_pid); } else { - $msg[] = ''.$GLOBALS['LANG']->getLL('error').': '.sprintf($GLOBALS['LANG']->getLL('errorTONotSaved'), $dataArr['tx_templavoila_tmplobj']['NEW']['datastructure']); + $msg[] = tx_templavoila_icons::getIcon('status-dialog-warning') . ''.$GLOBALS['LANG']->getLL('error').': '.sprintf($GLOBALS['LANG']->getLL('errorTONotSaved'), $dataArr['tx_templavoila_tmplobj']['NEW']['datastructure']); } } else { - $msg[] = ''.$GLOBALS['LANG']->getLL('error').': '.$GLOBALS['LANG']->getLL('errorTONotCreated'); + $msg[] = tx_templavoila_icons::getIcon('status-dialog-warning') . ' border="0" align="top" class="absmiddle" alt="" />'.$GLOBALS['LANG']->getLL('error').': '.$GLOBALS['LANG']->getLL('errorTONotCreated'); } unset($tce); @@ -893,7 +893,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase { unset($tce); - $msg[] = ''.sprintf($GLOBALS['LANG']->getLL('msgDSTOUpdated'), $dsREC['uid'], $toREC['uid']); + $msg[] = tx_templavoila_icons::getIcon('status-dialog-notification') . sprintf($GLOBALS['LANG']->getLL('msgDSTOUpdated'), $dsREC['uid'], $toREC['uid']); if ($cmd == 'updateDSandTO') { if (!$this->_load_ds_xml_to) { @@ -1704,7 +1704,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase { // Making messages: foreach($msg as $msgStr) { $content.=' -
'.htmlspecialchars($msgStr).'
'; +' . tx_templavoila_icons::getIcon('status-dialog-notification') . ''.htmlspecialchars($msgStr).'
'; } @@ -1788,7 +1788,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase { $headerParts .= $flashMessage->render(); } else { $headerParts .= '' . - 'doc->backPath, 'gfx/icon_warning.gif', 'width="18" height="16"').' alt="" align="absmiddle" /> '. + tx_templavoila_icons::getIcon('status-dialog-warning') . '' . $GLOBALS['LANG']->getLL('msgHeaderSet') . '
'; } @@ -2126,11 +2126,11 @@ class tx_templavoila_cm1 extends t3lib_SCbase { // Render HTML path: list($pI) = $this->markupObj->splitPath($currentMappingInfo[$key]['MAP_EL']); - $okayIcon = t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/icon_ok2.gif', 'width="18" height="16"') . ' alt="" border="0"'; $tagIcon = t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_extMgm::extRelPath('templavoila') . 'html_tags/' . $pI['el'] . '.gif', 'height="17"') . ' alt="" border="0"'; - $rowCells['htmlPath'] = ''. + $okTitle = htmlspecialchars($cF ? sprintf($GLOBALS['LANG']->getLL('displayDSContentFound'), strlen($contentSplittedByMapping['cArray'][$key])) . ($multilineTooltips ? ':' . chr(10) . chr(10) . $cF : '') : $GLOBALS['LANG']->getLL('displayDSContentEmpty')); + + $rowCells['htmlPath'] = tx_templavoila_icons::getIcon('status-dialog-ok', array('title' => $okTitle)). '' . ($pI['modifier'] ? $pI['modifier'] . ($pI['modifier_value'] ? ':' . ($pI['modifier'] != 'RANGE' ? $pI['modifier_value'] : '...') : '') : ''); $rowCells['htmlPath'] = '' . htmlspecialchars($mappingElement); + $rowCells['htmlPath'] = tx_templavoila_icons::getIcon('status-dialog-warning', array('title' => $GLOBALS['LANG']->getLL('msgNoContentFound'))) . htmlspecialchars($mappingElement); } } else { // For non-mapped cases, just output a no-break-space: $rowCells['htmlPath'] = ' '; @@ -2215,7 +2214,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase { $rowCells['cmdLinks'].= $this->cshItem('xMOD_tx_templavoila','mapping_modeset',$this->doc->backPath,'',FALSE,'margin-bottom: 0px;'); } else { - $rowCells['cmdLinks'] = ' + $rowCells['cmdLinks'] = tx_templavoila_icons::getIcon('status-dialog-notification') . ' ' . $GLOBALS['LANG']->getLL('msgHowToMap') . ''; $rowCells['cmdLinks'].= ''.str_replace(chr(9),' ',$hlObj->highLight_DS($dsR['dataprot'])).''; } - $lpXML.= 'doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" class="absmiddle" />'; + $lpXML.= '' . tx_templavoila_icons::getIcon('actions-document-open') . ''; } } else { // DS was a file: @@ -846,16 +846,16 @@ class tx_templavoila_module2 extends t3lib_SCbase { $modified = ($toObj['fileref_mtime'] != $fileMtime); } if ($modified) { - $mappingStatus = $mappingStatus_index = 'doc->backPath,'gfx/icon_warning2.gif','width="18" height="16"').' alt="" class="absmiddle" />'; + $mappingStatus = $mappingStatus_index = tx_templavoila_icons::getIcon('status-dialog-warning'); $mappingStatus.= sprintf($GLOBALS['LANG']->getLL('towasupdated', 1), t3lib_BEfunc::datetime($toObj['tstamp'])); $this->setErrorLog($scope, 'warning', sprintf($GLOBALS['LANG']->getLL('warning_mappingstatus', 1), $mappingStatus, $toObj['title'])); } else { - $mappingStatus = $mappingStatus_index = 'doc->backPath,'gfx/icon_ok2.gif','width="18" height="16"').' alt="" class="absmiddle" />'; + $mappingStatus = $mappingStatus_index = tx_templavoila_icons::getIcon('status-dialog-ok'); $mappingStatus.= $GLOBALS['LANG']->getLL('mapping_uptodate', 1); } $mappingStatus .= '
'.str_replace(chr(9),' ',$hlObj->highLight_DS($toObj['localprocessing'])).''; } else $lpXML = ''; } - $lpXML.= 'doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" class="absmiddle" />'; + $lpXML.= '' . tx_templavoila_icons::getIcon('actions-document-open') . ''; // Compile info table: $tableAttribs = ' border="0" cellpadding="1" cellspacing="1" width="98%" style="margin-top: 3px;" class="lrPadding"'; // Links: - $editLink = 'doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" class="absmiddle" />'; + $editLink = '' . tx_templavoila_icons::getIcon('actions-document-open') . ''; $toTitle = '' . htmlspecialchars($GLOBALS['LANG']->sL($toObj['title'])) . ''; $fRWTOUres = array(); @@ -1137,7 +1137,7 @@ class tx_templavoila_module2 extends t3lib_SCbase { . implode('', $output) . ' '; } else { - $outputString = 'doc->backPath,'gfx/icon_warning2.gif','width="18" height="16"').' alt="" class="absmiddle" />No usage!'; + $outputString = tx_templavoila_icons::getIcon('status-dialog-warning') . 'No usage!'; $this->setErrorLog($scope, 'warning', sprintf($GLOBALS['LANG']->getLL('warning_mappingstatus', 1), $outputString , $GLOBALS['LANG']->sL($toObj['title']))); } } @@ -1252,13 +1252,13 @@ class tx_templavoila_module2 extends t3lib_SCbase { // Create final output table: if (count($output)) { if (count($output)>1) { - $outputString = 'doc->backPath,'gfx/icon_fatalerror.gif','width="18" height="16"').' alt="" class="absmiddle" />'. + $outputString = tx_templavoila_icons::getIcon('status-dialog-error'). sprintf($GLOBALS['LANG']->getLL('invalidtemplatevalues', 1), count($output) - 1); $this->setErrorLog($scope,'fatal',$outputString); $outputString.='
doc->backPath,'gfx/icon_warning2.gif','width="18" height="16"').' alt="" class="absmiddle" /> The element has no children!
'; + $HTML .= '' . tx_templavoila_icons::getIcon('status-dialog-warning') . ' The element has no children!
'; return $HTML; }