Index: t3lib/class.t3lib_admin.php
===================================================================
--- t3lib/class.t3lib_admin.php (revision 8070)
+++ t3lib/class.t3lib_admin.php (working copy)
@@ -167,7 +167,7 @@
$this->genTree_HTML.= $depthData.
'backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' align="top" alt="" />'.
$versionLabel.
- t3lib_iconWorks::getIconImage('pages',$row,$this->backPath,'align="top"').
+ t3lib_iconWorks::getSpriteIconForRecord('pages', $row) .
htmlspecialchars($row['uid'].': '.t3lib_div::fixed_lgd_cs(strip_tags($row['title']),50)).'';
}
@@ -257,7 +257,7 @@
$this->genTree_HTML.= $depthData.
'backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' align="top" alt="" />'.
$versionLabel.
- t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'align="top" title="'.$table.'"').htmlspecialchars($row['uid'].': '.t3lib_BEfunc::getRecordTitle($table,$row)).'';
+ t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title'=> $table)) . htmlspecialchars($row['uid'] . ': ' . t3lib_BEfunc::getRecordTitle($table,$row)) . '';
}
// Register various data for this item:
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 8070)
+++ t3lib/class.t3lib_befunc.php (working copy)
@@ -4403,7 +4403,7 @@
while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
$theRows[] = $row;
$out.=''.
- t3lib_iconWorks::getIconImage('pages', $row, $backPath, 'title="' . htmlspecialchars(self::getRecordPath($row['uid'], $perms_clause, 20)) . '" align="top"') .
+ t3lib_iconWorks::getSpriteIconForRecord('pages', $row, array('title' => htmlspecialchars(self::getRecordPath($row['uid'], $perms_clause, 20)))) .
htmlspecialchars($row['title']).
'
';
}
Index: t3lib/class.t3lib_clipboard.php
===================================================================
--- t3lib/class.t3lib_clipboard.php (revision 8070)
+++ t3lib/class.t3lib_clipboard.php (working copy)
@@ -527,7 +527,7 @@
$lines[]='
' .
- t3lib_iconWorks::getIconImage($table, $rec, $this->backPath,' style="margin-left: 38px;"') . ' |
+ t3lib_iconWorks::getSpriteIconForRecord($table, $rec, array('style' => "margin-left: 38px;")) . '
' . htmlspecialchars(
t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle($table, $rec), $GLOBALS['BE_USER']->uc['titleLen'])) .
$modeData . ' |
Index: t3lib/class.t3lib_positionmap.php
===================================================================
--- t3lib/class.t3lib_positionmap.php (revision 8070)
+++ t3lib/class.t3lib_positionmap.php (working copy)
@@ -541,7 +541,7 @@
* @return string HTML
*/
function getRecordHeader($row) {
- $line = t3lib_iconWorks::getIconImage('tt_content',$row,$this->backPath,' align="top" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($row,'tt_content')).'"');
+ $line = t3lib_iconWorks::getSpriteIconForRecord('tt_content', $row, array('title' => htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($row,'tt_content'))));
$line.= t3lib_BEfunc::getRecordTitle('tt_content',$row,TRUE);
return $this->wrapRecordTitle($line,$row);
}
Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php (revision 8070)
+++ t3lib/class.t3lib_tceforms.php (working copy)
@@ -2277,7 +2277,7 @@
$onlySingleTableAllowed = (count($tempFT) == 1);
foreach ($tempFT as $theT) {
$info.= ' ' .
- t3lib_iconWorks::getIconImage($theT, array(), $this->backPath, 'align="top"') .
+ t3lib_iconWorks::getSpriteIconForRecord($theT, array()) .
htmlspecialchars($this->sL($GLOBALS['TCA'][$theT]['ctrl']['title'])) .
'
';
}
@@ -4970,8 +4970,8 @@
$arr[$k] = str_replace('###RECORD_LABEL###', $rLabel, $arr[$k]);
$arr[$k] = str_replace('###TABLE_TITLE###',htmlspecialchars($this->sL($TCA[$table]['ctrl']['title'])),$arr[$k]);
- $titleA=t3lib_BEfunc::titleAltAttrib($this->getRecordPath($table,$rec));
- $arr[$k]=str_replace('###RECORD_ICON###',t3lib_iconWorks::getIconImage($table,$rec,$this->backPath,'class="absmiddle"'.$titleA),$arr[$k]);
+ $arr[$k] = str_replace('###RECORD_ICON###', t3lib_iconWorks::getSpriteIconForRecord($table, $rec, array('title' => $this->getRecordPath($table, $rec))), $arr[$k]);
+
}
return $arr;
}
Index: t3lib/class.t3lib_tceforms_inline.php
===================================================================
--- t3lib/class.t3lib_tceforms_inline.php (revision 8070)
+++ t3lib/class.t3lib_tceforms_inline.php (working copy)
@@ -539,7 +539,7 @@
}
$altText = t3lib_BEfunc::getRecordIconAltText($rec, $foreign_table);
- $iconImg = t3lib_iconWorks::getIconImage($foreign_table, $rec, $this->backPath, 'title="' . htmlspecialchars($altText) . '" class="absmiddle" id="' . $objectId . '_icon"');
+ $iconImg = t3lib_iconWorks::getSpriteIconForRecord($foreign_table, $rec, array('title' => htmlspecialchars($altText), 'id' => $objectId . '_icon"'));
$label = '' . $recTitle . '';
if (!$isVirtualRecord) {
$iconImg = $this->wrapWithAnchor($iconImg, '#', array('onclick' => $onClick));
Index: typo3/alt_clickmenu.php
===================================================================
--- typo3/alt_clickmenu.php (revision 8070)
+++ typo3/alt_clickmenu.php (working copy)
@@ -1089,7 +1089,7 @@
// Return the printed elements:
return $this->printItems($menuItems,
- t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)
+ t3lib_iconWorks::getSpriteIconForRecord($table,$this->rec,array('title'=> t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)))
);
}
Index: typo3/alt_shortcut.php
===================================================================
--- typo3/alt_shortcut.php (revision 8070)
+++ typo3/alt_shortcut.php (working copy)
@@ -714,7 +714,7 @@
}
$selector.= ''.
- t3lib_iconWorks::getIconImage('sys_workspace',array(),$this->doc->backPath,'align="top"').
+ t3lib_iconWorks::getSpriteIconForRecord('sys_workspace', array()).
'';
if (count($options) > 1) {
$selector .= '';
Index: typo3/class.browse_links.php
===================================================================
--- typo3/class.browse_links.php (revision 8070)
+++ typo3/class.browse_links.php (working copy)
@@ -1819,7 +1819,7 @@
// Create header for listing, showing the page title/icon:
$titleLen=intval($GLOBALS['BE_USER']->uc['titleLen']);
$mainPageRec = t3lib_BEfunc::getRecordWSOL('pages',$expPageId);
- $picon = t3lib_iconWorks::getIconImage('pages', $mainPageRec, $BACK_PATH, '');
+ $picon = t3lib_iconWorks::getSpriteIconForRecord('pages', $mainPageRec);
$picon.= htmlspecialchars(t3lib_div::fixed_lgd_cs($mainPageRec['title'],$titleLen));
$out.=$picon.'
';
@@ -1839,7 +1839,7 @@
$c=0;
while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
$c++;
- $icon=t3lib_iconWorks::getIconImage('tt_content',$row,$BACK_PATH,'');
+ $icon=t3lib_iconWorks::getSpriteIconForRecord('tt_content', $row,$BACK_PATH);
if ($this->curUrlInfo['act']=='page' && $this->curUrlInfo['cElement']==$row['uid']) {
$arrCol='';
} else {
@@ -1910,7 +1910,7 @@
$ATag_alt=substr($ATag,0,-4).",'',1);\">";
$ATag_e='';
}
- $picon=t3lib_iconWorks::getIconImage('pages',$mainPageRec,$BACK_PATH,'');
+ $picon=t3lib_iconWorks::getSpriteIconForRecord('pages', $mainPageRec);
$pBicon=$ATag2?'':'';
$pText=htmlspecialchars(t3lib_div::fixed_lgd_cs($mainPageRec['title'],$titleLen));
$out.=$picon.$ATag2.$pBicon.$ATag_e.$ATag.$pText.$ATag_e.'
';
Index: typo3/class.db_list.inc
===================================================================
--- typo3/class.db_list.inc (revision 8070)
+++ typo3/class.db_list.inc (working copy)
@@ -386,7 +386,7 @@
while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
// Create content:
- $iconImg = t3lib_iconWorks::getIconImage('sys_note',$row,$this->backPath,'');
+ $iconImg = t3lib_iconWorks::getSpriteIconForRecord('sys_note', $row);
$subject = htmlspecialchars($row['subject']);
$fields = array();
$fields['Author:'] = htmlspecialchars($row['author'].($row['email'] && $row['author'] ? ', ':'').$row['email']);
Index: typo3/class.db_list_extra.inc
===================================================================
--- typo3/class.db_list_extra.inc (revision 8070)
+++ typo3/class.db_list_extra.inc (working copy)
@@ -682,7 +682,6 @@
// The icon with link
$alttext = t3lib_BEfunc::getRecordIconAltText($row,$table);
- //$iconImg = t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.htmlspecialchars($alttext).'"'.);
$iconImg = t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title' => htmlspecialchars($alttext), 'style' => ($indent ? ' margin-left: ' . $indent . 'px;' : '')));
Index: typo3/mod/user/ws/class.wslib_gui.php
===================================================================
--- typo3/mod/user/ws/class.wslib_gui.php (revision 8070)
+++ typo3/mod/user/ws/class.wslib_gui.php (working copy)
@@ -383,7 +383,7 @@
// Get CURRENT online record and icon based on "t3ver_oid":
$rec_on = t3lib_BEfunc::getRecord($table,$oid);
- $icon = t3lib_iconWorks::getIconImage($table, $rec_on, $this->doc->backPath,' align="top" title="'.t3lib_BEfunc::getRecordIconAltText($rec_on,$table).'"');
+ $icon = t3lib_iconWorks::getSpriteIconForRecord($table, $rec_on, array('title' => t3lib_BEfunc::getRecordIconAltText($rec_on,$table)));
if ($GLOBALS['BE_USER']->workspace===0) { // Only edit online records if in ONLINE workspace:
$icon = $this->doc->wrapClickMenuOnIcon($icon, $table, $rec_on['uid'], 2, '', '+edit,view,info,delete');
}
@@ -427,8 +427,8 @@
}
// Get icon:
- $icon = t3lib_iconWorks::getIconImage($table, $rec_off, $this->doc->backPath, ' align="top" title="'.t3lib_BEfunc::getRecordIconAltText($rec_off,$table).'"');
+ $icon = t3lib_iconWorks::getSpriteIconForRecord($table, $rec_on, array('title' => t3lib_BEfunc::getRecordIconAltText($rec_on, $table)));
$icon = $this->doc->wrapClickMenuOnIcon($icon, $table, $tempUid, 2, '', '+edit,' . ($table == 'pages' ? 'view,info,' : '') . 'delete');
// Prepare diff-code:
@@ -613,7 +613,7 @@
function displayWorkspaceOverview_pageTreeIconTitle($pageUid, $title, $indentCount) {
$pRec = t3lib_BEfunc::getRecord('pages',$pageUid);
return ''. // Indenting page tree
- t3lib_iconWorks::getIconImage('pages',$pRec,$this->doc->backPath,' align="top" title="'.t3lib_BEfunc::getRecordIconAltText($pRec,'pages').'"').
+ t3lib_iconWorks::getSpriteIconForRecord('pages', $pRec, array('title' => t3lib_BEfunc::getRecordIconAltText($pRec, 'pages'))) .
htmlspecialchars(t3lib_div::fixed_lgd_cs($title,$this->pageTreeIndent_titleLgd)).
' ';
}
@@ -1153,7 +1153,7 @@
$HTMLdata.
($iconMode < 2 ?
'doc->backPath,'gfx/ol/join'.($iconMode ? 'bottom' : '').'.gif','width="18" height="16"').' alt="" />'.
- t3lib_iconWorks::getIconImage($tN, $rec, $this->doc->backPath,'') : '').
+ t3lib_iconWorks::getSpriteIconRecord($tN, $rec) : '').
t3lib_BEfunc::getRecordTitle($tN, $rec, TRUE).
'
'.
Index: typo3/mod/user/ws/index.php
===================================================================
--- typo3/mod/user/ws/index.php (revision 8070)
+++ typo3/mod/user/ws/index.php (working copy)
@@ -430,11 +430,11 @@
$description = '';
switch($GLOBALS['BE_USER']->workspace) {
case 0:
- $title = t3lib_iconWorks::getIconImage('sys_workspace', array(), $this->doc->backPath, ' align="top"').'['.$LANG->getLL('shortcut_onlineWS').']';
+ $title = t3lib_iconWorks::getSpriteIconForRecord('sys_workspace', array()) . '[' . $LANG->getLL('shortcut_onlineWS') . ']';
$description = $LANG->getLL('workspace_description_live');
break;
case -1:
- $title = t3lib_iconWorks::getIconImage('sys_workspace', array(), $this->doc->backPath, ' align="top"').'['.$LANG->getLL('shortcut_offlineWS').']';
+ $title = t3lib_iconWorks::getSpriteIconForRecord('sys_workspace', array()) . '[' . $LANG->getLL('shortcut_offlineWS') . ']';
$description = $LANG->getLL('workspace_description_draft');
break;
case -99:
@@ -442,7 +442,7 @@
$description = $LANG->getLL('workspace_description_no_access');
break;
default:
- $title = t3lib_iconWorks::getIconImage('sys_workspace', $GLOBALS['BE_USER']->workspaceRec, $this->doc->backPath, ' align="top"').
+ $title = t3lib_iconWorks::getSpriteIconForRecord('sys_workspace', $GLOBALS['BE_USER']->workspaceRec) .
'['.$GLOBALS['BE_USER']->workspace.'] '.t3lib_BEfunc::getRecordTitle('sys_workspace',$GLOBALS['BE_USER']->workspaceRec,TRUE);
$description = ($GLOBALS['BE_USER']->workspaceRec['description'] ? htmlspecialchars($GLOBALS['BE_USER']->workspaceRec['description']) : '[' . $LANG->getLL('shortcut_noWSfound') . ']');
break;
@@ -763,7 +763,7 @@
}
else {
// normal icon
- $str = t3lib_iconWorks::getIconImage('pages', $mp, $GLOBALS['BACK_PATH'], ' align="absmiddle"');
+ $str = t3lib_iconWorks::getSpriteIconForRecord('pages', $mp);
$classAttr = '';
}
// Will show UID on hover. Just convinient to user.
@@ -815,7 +815,7 @@
}
else {
// normal icon
- $str = t3lib_iconWorks::getIconImage('sys_filemounts', $mp, $GLOBALS['BACK_PATH'], ' align="absmiddle"');
+ $str = t3lib_iconWorks::getSpriteIconForRecord('sys_filemounts', $mp);
$classAttr = '';
}
// Will show UID on hover. Just convinient to user.
@@ -895,7 +895,7 @@
else {
$tag0 = $tag1 = '';
}
- $content_array[] = $this->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getIconImage('be_users', $uid, $GLOBALS['BACK_PATH'], ' align="middle" alt="UID: ' . $uid . '"'), 'be_users', $uid, 2).
+ $content_array[] = $this->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getSpriteIconForRecord('be_users', array('uid' => $uid), array('title' => '"UID: ' . $uid . '"')), 'be_users', $uid, 2).
$tag0 . htmlspecialchars($user['username']) . $tag1;
}
}
@@ -934,7 +934,7 @@
else {
$tag0 = $tag1 = '';
}
- $content_array[] = $this->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getIconImage($table, $this->be_user_Array[$id], $GLOBALS['BACK_PATH'], ' align="middle" alt="UID: ' . $id . '"'), $table, $id, 2) .
+ $content_array[] = $this->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getSpriteIconForRecord($table, $this->be_user_Array[$id], array('title' => '"UID: ' . $id . '"')), $table, $id, 2) .
$tag0 . htmlspecialchars($this->be_user_Array_full[$id]['username']) . $tag1;
}
else {
@@ -942,7 +942,7 @@
if (false === $groups) {
$groups = t3lib_BEfunc::getGroupNames();
}
- $content_array[] = $this->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getIconImage($table, $groups[$id], $GLOBALS['BACK_PATH'], ' align="middle" alt="UID: ' . $id . '"'), $table, $id, 2) .
+ $content_array[] = $this->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getSpriteIconForRecord($table, $groups[$id], array('title' => '"UID: ' . $id . '"')), $table, $id, 2) .
$groups[$id]['title'];
}
}
@@ -956,7 +956,7 @@
else {
$tag0 = $tag1 = '';
}
- $content_array[] = t3lib_iconWorks::getIconImage('be_users', $this->be_user_Array[$id], $GLOBALS['BACK_PATH'], ' align="middle" alt="UID: ' . $id . '"') .
+ $content_array[] = t3lib_iconWorks::getSpriteIconForRecord('be_users', $this->be_user_Array[$id], array('title' => '"UID: ' . $id . '"')) .
$tag0 . htmlspecialchars($this->be_user_Array_full[$userUID]['username']) . $tag1;
}
}
Index: typo3/move_el.php
===================================================================
--- typo3/move_el.php (revision 8070)
+++ typo3/move_el.php (working copy)
@@ -289,7 +289,7 @@
$elRow = t3lib_BEfunc::getRecordWSOL($this->table,$this->moveUid);
// Headerline: Icon, record title:
- $hline = t3lib_iconWorks::getIconImage($this->table,$elRow,$BACK_PATH,' id="c-recIcon" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,$this->table)).'"');
+ $hline = t3lib_iconWorks::getSpriteIconForRecord($this->table, $elRow, array('id' => "c-recIcon", 'title' => htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,$this->table))));
$hline.= t3lib_BEfunc::getRecordTitle($this->table,$elRow,TRUE);
// Make-copy checkbox (clicking this will reload the page with the GET var makeCopy set differently):
@@ -324,7 +324,7 @@
t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
' ';
} else {
- $code.= t3lib_iconWorks::getIconImage('pages',$pidPageInfo,$BACK_PATH,'').
+ $code.= t3lib_iconWorks::getSpriteIconForRecord('pages', $pidPageInfo) .
t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
' ';
}
@@ -355,7 +355,7 @@
$posMap->cur_sys_language = $this->sys_language;
// Headerline for the parent page: Icon, record title:
- $hline = t3lib_iconWorks::getIconImage('pages',$pageinfo,$BACK_PATH,' title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($pageinfo,'pages')).'"');
+ $hline = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageinfo, array('title' => htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($pageinfo, 'pages'))));
$hline.= t3lib_BEfunc::getRecordTitle('pages',$pageinfo,TRUE);
// Load SHARED page-TSconfig settings and retrieve column list from there, if applicable:
@@ -379,7 +379,7 @@
t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
' ';
} else {
- $code.= t3lib_iconWorks::getIconImage('pages',$pidPageInfo,$BACK_PATH,'').
+ $code.= t3lib_iconWorks::getSpriteIconForRecord('pages', $pidPageInfo).
t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
' ';
}
Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php (revision 8070)
+++ typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php (working copy)
@@ -57,7 +57,7 @@
// Add icon with clickmenu, etc:
if ($pageRecord['uid']) { // If there IS a real page
$alttext = t3lib_BEfunc::getRecordIconAltText($pageRecord, 'pages');
- $iconImg = t3lib_iconWorks::getIconImage('pages', $pageRecord, $this->backPath, 'class="absmiddle" title="'. htmlspecialchars($alttext) . '"');
+ $iconImg = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageRecord, array('title' => htmlspecialchars($alttext)));
// Make Icon:
$theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', $pageRecord['uid']);
} else { // On root-level of page tree
Index: typo3/sysext/impexp/app/index.php
===================================================================
--- typo3/sysext/impexp/app/index.php (revision 8070)
+++ typo3/sysext/impexp/app/index.php (working copy)
@@ -221,7 +221,7 @@
if ($pid>0) {
$rootRec = t3lib_befunc::getRecordWSOL('pages',$pid);
- $firstHtml.= $this->wrapIcon(t3lib_iconWorks::getIconImage('pages',$rootRec,$this->backPath,'align="top"'),$rootRec);
+ $firstHtml.= $this->wrapIcon(t3lib_iconWorks::getSpriteIconForRecord('pages', $rootRec), $rootRec);
} else {
$rootRec = array(
'title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],
@@ -537,7 +537,7 @@
$tree = t3lib_div::makeInstance('t3lib_pageTree');
$tree->init('AND '.$this->perms_clause.$this->filterPageIds($this->export->excludeMap));
- $HTML = t3lib_iconWorks::getIconImage('pages',$sPage,$GLOBALS['BACK_PATH'],'align="top"');
+ $HTML = t3lib_iconWorks::getSpriteIconForRecord('pages', $sPage);
$tree->tree[] = Array('row'=>$sPage,'HTML'=>$HTML);
$tree->buffer_idH = array();
if ($inData['pagetree']['levels']>0) {
@@ -815,7 +815,7 @@
$row[] = '
|