danielsiepmann/feedit
danielsiepmann/feedit
1
0
mirror of https://github.com/FriendsOfTYPO3/feedit.git synced 2024-11-22 14:36:08 +01:00
Code Issues Releases Wiki Activity

[FOLLOWUP][TASK] Replace sprite icon "actions-document-open" with IconFactory

Browse source 
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 <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
This commit is contained in:
Morton Jonuschat 2015-09-11 14:21:30 +02:00 committed by Frank Nägler
parent 5ac25867ff
commit 7fbb9d73e0
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Classes/FrontendEditPanel.php
View file

@ -110,7 +110,7 @@ class FrontendEditPanel {
$panel .= $this->backendUser->adminPanel->ext_makeToolBar(); $panel .= $this->backendUser->adminPanel->ext_makeToolBar();
} }
if (isset($allow['edit'])) { if (isset($allow['edit'])) {
$icon = IconUtility::getSpriteIcon('actions-document-open', array('title' => $this->backendUser->extGetLL('p_editRecord'))); $icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_editRecord')) . '">' . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL) . '</span>';
$panel .= $this->editPanelLinkWrap($icon, $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord); $panel .= $this->editPanelLinkWrap($icon, $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord);
} }
// Hiding in workspaces because implementation is incomplete // 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. // Special content is about to be shown, so the cache must be disabled.
$this->frontendController->set_no_cache('Display frontend edit icons', TRUE); $this->frontendController->set_no_cache('Display frontend edit icons', TRUE);
$iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']); $iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']);
$optionsArray = array( $iconImg = '<span title="' . htmlspecialchars($iconTitle, ENT_COMPAT, 'UTF-8', FALSE) . '" class="frontEndEditIcons" style="' . ($conf['styleAttribute'] ? htmlspecialchars($conf['styleAttribute']) : '') . '">'
'title' => htmlspecialchars($iconTitle, ENT_COMPAT, 'UTF-8', FALSE), . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)
'class' => 'frontEndEditIcons', . '</span>';
'style' => $conf['styleAttribute'] ? htmlspecialchars($conf['styleAttribute']) : ''
);
$iconImg = $conf['iconImg'] ? $conf['iconImg'] : IconUtility::getSpriteIcon('actions-document-open', $optionsArray);
$nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0; $nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0;
$url = BackendUtility::getModuleUrl( $url = BackendUtility::getModuleUrl(