From f62a1a3ddc3f14104e98c96707dccdf8bbecd97f Mon Sep 17 00:00:00 2001 From: Bjoern Pedersen Date: Thu, 21 Jul 2011 11:19:24 +0200 Subject: [PATCH] [BUGFIX] feedit: Use skinImage for edit icons Replace hardcoded icons with t3lib_iconWorks::skinImage calls Change-Id: I02236b36facb53222ccc8e0bfc17adf7b2ac7ae4 Resolves: #24920 Releases: 4.5, 4.6 Reviewed-on: http://review.typo3.org/3448 Reviewed-by: Steffen Kamper Tested-by: Steffen Kamper Reviewed-by: Stefan Neufeind Reviewed-by: Susanne Moog Tested-by: Susanne Moog --- view/class.tx_feedit_editpanel.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/view/class.tx_feedit_editpanel.php b/view/class.tx_feedit_editpanel.php index 0653084..91d6ae2 100644 --- a/view/class.tx_feedit_editpanel.php +++ b/view/class.tx_feedit_editpanel.php @@ -90,31 +90,31 @@ class tx_feedit_editpanel { $panel .= $GLOBALS['BE_USER']->adminPanel->ext_makeToolBar() . ''; } if (isset($allow['edit'])) { - $panel .= $this->editPanelLinkWrap('', $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord); + $panel .= $this->editPanelLinkWrap('', $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord); } // Hiding in workspaces because implementation is incomplete if (isset($allow['move']) && $sortField && $GLOBALS['BE_USER']->workspace === 0) { - $panel .= $this->editPanelLinkWrap('', $formName, 'up'); - $panel .= $this->editPanelLinkWrap('', $formName, 'down'); + $panel .= $this->editPanelLinkWrap('', $formName, 'up'); + $panel .= $this->editPanelLinkWrap('', $formName, 'down'); } // Hiding in workspaces because implementation is incomplete, Hiding for localizations because it is unknown what should be the function in that case if (isset($allow['hide']) && $hideField && $GLOBALS['BE_USER']->workspace === 0 && !$dataArr['_LOCALIZED_UID']) { if ($dataArr[$hideField]) { - $panel .= $this->editPanelLinkWrap('', $formName, 'unhide'); + $panel .= $this->editPanelLinkWrap('', $formName, 'unhide'); } else { - $panel .= $this->editPanelLinkWrap('', $formName, 'hide', '', $GLOBALS['BE_USER']->extGetLL('p_hideConfirm')); + $panel .= $this->editPanelLinkWrap('', $formName, 'hide', '', $GLOBALS['BE_USER']->extGetLL('p_hideConfirm')); } } if (isset($allow['new'])) { if ($table == 'pages') { - $panel .= $this->editPanelLinkWrap('', $formName, 'new', $currentRecord, ''); + $panel .= $this->editPanelLinkWrap('', $formName, 'new', $currentRecord, ''); } else { - $panel .= $this->editPanelLinkWrap('', $formName, 'new', $currentRecord, '', $newUID); + $panel .= $this->editPanelLinkWrap('', $formName, 'new', $currentRecord, '', $newUID); } } // Hiding in workspaces because implementation is incomplete, Hiding for localizations because it is unknown what should be the function in that case if (isset($allow['delete']) && $GLOBALS['BE_USER']->workspace === 0 && !$dataArr['_LOCALIZED_UID']) { - $panel .= $this->editPanelLinkWrap('', $formName, 'delete', '', $GLOBALS['BE_USER']->extGetLL('p_deleteConfirm')); + $panel .= $this->editPanelLinkWrap('', $formName, 'delete', '', $GLOBALS['BE_USER']->extGetLL('p_deleteConfirm')); } // Final $labelTxt = $this->cObj->stdWrap($conf['label'],$conf['label.']); @@ -190,7 +190,7 @@ class tx_feedit_editpanel { $GLOBALS['TSFE']->set_no_cache(); $style = $conf['styleAttribute'] ? ' style="' . htmlspecialchars($conf['styleAttribute']) . '"' : ''; $iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']); - $iconImg = $conf['iconImg'] ? $conf['iconImg'] : ''; + $iconImg = $conf['iconImg'] ? $conf['iconImg'] : ''; $nV=t3lib_div::_GP('ADMCMD_view') ? 1 : 0; $adminURL = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir; $icon = $this->editPanelLinkWrap_doWrap($iconImg, $adminURL . 'alt_doc.php?edit[' . $table . '][' . $editUid . ']=edit&columnsOnly=' . rawurlencode($fieldList) . '&noView=' . $nV . $addUrlParamStr, $currentRecord);