From 7fbb9d73e0c7bd504b0dec7a5c9b02b4be6d1a53 Mon Sep 17 00:00:00 2001 From: Morton Jonuschat Date: Fri, 11 Sep 2015 14:21:30 +0200 Subject: [PATCH] [FOLLOWUP][TASK] Replace sprite icon "actions-document-open" with IconFactory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaces IconUtility::getSpriteIcon calls for the icon actions-document-open which have been missed in the initial patchset with the new IconFactory. Resolves: #68845 Releases: master Change-Id: I7265c21ec93e1ca15869039329a86fe04e17e940 Reviewed-on: http://review.typo3.org/43192 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn Reviewed-by: Frank Nägler Tested-by: Frank Nägler --- Classes/FrontendEditPanel.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Classes/FrontendEditPanel.php b/Classes/FrontendEditPanel.php index 9ed362c..5899d77 100644 --- a/Classes/FrontendEditPanel.php +++ b/Classes/FrontendEditPanel.php @@ -110,7 +110,7 @@ class FrontendEditPanel { $panel .= $this->backendUser->adminPanel->ext_makeToolBar(); } if (isset($allow['edit'])) { - $icon = IconUtility::getSpriteIcon('actions-document-open', array('title' => $this->backendUser->extGetLL('p_editRecord'))); + $icon = '' . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL) . ''; $panel .= $this->editPanelLinkWrap($icon, $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord); } // Hiding in workspaces because implementation is incomplete @@ -213,12 +213,9 @@ class FrontendEditPanel { // Special content is about to be shown, so the cache must be disabled. $this->frontendController->set_no_cache('Display frontend edit icons', TRUE); $iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']); - $optionsArray = array( - 'title' => htmlspecialchars($iconTitle, ENT_COMPAT, 'UTF-8', FALSE), - 'class' => 'frontEndEditIcons', - 'style' => $conf['styleAttribute'] ? htmlspecialchars($conf['styleAttribute']) : '' - ); - $iconImg = $conf['iconImg'] ? $conf['iconImg'] : IconUtility::getSpriteIcon('actions-document-open', $optionsArray); + $iconImg = '' + . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL) + . ''; $nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0; $url = BackendUtility::getModuleUrl(