Index: t3lib/class.t3lib_recordlist.php =================================================================== --- t3lib/class.t3lib_recordlist.php (Revision 7665) +++ t3lib/class.t3lib_recordlist.php (Arbeitskopie) @@ -284,13 +284,13 @@ case 'fwd': $href = $this->listURL().'&pointer='.($pointer-$this->iLimit).$tParam; $content = ''. - 'backPath,'gfx/pilup.gif','width="14" height="14"').' alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-move-up'). ' [1 - '.$pointer.']'; break; case 'rwd': $href = $this->listURL().'&pointer='.$pointer.$tParam; $content = ''. - 'backPath,'gfx/pildown.gif','width="14" height="14"').' alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-move-down'). ' ['.($pointer+1).' - '.$this->totalItems.']'; break; } Index: t3lib/class.t3lib_tceforms.php =================================================================== --- t3lib/class.t3lib_tceforms.php (Revision 7665) +++ t3lib/class.t3lib_tceforms.php (Arbeitskopie) @@ -766,7 +766,7 @@ $thePalIcon = ''; if ($collapsed && $collapsedHeader !== NULL) { - list($thePalIcon,) = $this->wrapOpenPalette('backPath,'gfx/options.gif','width="18" height="16"').' border="0" title="'.htmlspecialchars($this->getLL('l_moreOptions')).'" alt="" />',$table,$row,$palette,1); + list($thePalIcon,) = $this->wrapOpenPalette(t3lib_iconWorks::getSpriteIcon('actions-system-options-view', array('title' => htmlspecialchars($this->getLL('l_moreOptions')))), $table, $row, $palette, 1); $thePalIcon = '' . $thePalIcon . $collapsedHeader . ''; } @@ -873,7 +873,7 @@ if (!$PA['palette']) { $paletteFields = $this->loadPaletteElements($table, $row, $PA['pal']); if ($PA['pal'] && $this->isPalettesCollapsed($table,$PA['pal']) && count($paletteFields)) { - list($thePalIcon,$palJSfunc) = $this->wrapOpenPalette('backPath,'gfx/options.gif','width="18" height="16"').' border="0" title="'.htmlspecialchars($this->getLL('l_moreOptions')).'" alt="" />',$table,$row,$PA['pal'],1); + list($thePalIcon,$palJSfunc) = $this->wrapOpenPalette(t3lib_iconWorks::getSpriteIcon('actions-system-options-view', array('title' => htmlspecialchars($this->getLL('l_moreOptions')))),$table,$row,$PA['pal'],1); } else { $thePalIcon = ''; $palJSfunc = ''; @@ -1801,7 +1801,7 @@ if ($hasHelp && $this->edit_showFieldHelp == 'icon') { $helpIcon = ''; - $helpIcon .= 'backPath, 'gfx/helpbubble.gif', 'width="14" height="14"'); + $helpIcon .= t3lib_iconWorks::getSpriteIcon('actions-system-help-open'); $helpIcon .= ' hspace="2" border="0" class="absmiddle"' . ($GLOBALS['CLIENT']['FORMSTYLE'] ? ' style="cursor:help;"' : '') . ' alt="" />' . $help; $helpIcon .= ''; $help = $helpIcon; @@ -1857,8 +1857,7 @@ // Add revert icon if (is_array($restoreCmd)) { $item .= '' . - 'backPath,'gfx/undo.gif','width="13" height="12"') . ' title="' . - htmlspecialchars($this->getLL('l_revertSelection')) . '" alt="" />' .''; + t3lib_iconWorks::getSpriteIcon('actions-edit-undo', array('title' => htmlspecialchars($this->getLL('l_revertSelection')))) . ''; } // Implode rows in table: $item .= ' @@ -1969,9 +1968,9 @@ ' - '. - 'backPath,'gfx/undo.gif','width="13" height="12"').' title="'.htmlspecialchars($this->getLL('l_revertSelection')).'" alt="" />'. - ' + ' . + t3lib_iconWorks::getSpriteIcon('actions-edit-undo') . + ' @@ -2704,8 +2703,8 @@ $this->additionalJS_post = $additionalJS_post_saved; $this->additionalJS_submit = $additionalJS_submit_saved; $new = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.new', 1); - $newElementsLinks[]= ' - backPath,'gfx/new_el.gif','width="11" height="12"').' alt="' . $new . '" title="' . $new . '" align="absmiddle" />' . + $newElementsLinks[]= '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . htmlspecialchars(t3lib_div::fixed_lgd_cs($this->sL($nCfg['tx_templavoila']['title']),30)) . ''; } @@ -2716,10 +2715,10 @@ $toggleAll = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.toggleall', 1); $output.= '
- - backPath, 'gfx/pil2right.gif', 'width="7" height="12"') . ' align="absmiddle" alt="' . - $toggleAll . '" title="' . $toggleAll . '" /> - backPath,'gfx/pil2right.gif','width="7" height="12"').' align="absmiddle" alt="' . + ' + . t3lib_iconWorks::getSpriteIcon('actions-move-right') . + $toggleAll . '" title="' . $toggleAll . '" />' + . t3lib_iconWorks::getSpriteIcon('actions-move-right') . $toggleAll . '" title="' . $toggleAll . '" />' . $toggleAll . '
@@ -2729,8 +2728,8 @@ } else { // It is a container - $toggleIcon_open = 'backPath,'gfx/pil2down.gif','width="12" height="7"').' hspace="2" alt="Open" title="Open" />'; - $toggleIcon_close = 'backPath,'gfx/pil2right.gif','width="7" height="12"').' hspace="2" alt="Close" title="Close" />'; + $toggleIcon_open = t3lib_iconWorks::getSpriteIcon('actions-move-down'); + $toggleIcon_close = t3lib_iconWorks::getSpriteIcon('actions-move-right'); // Create on-click actions. //$onClickCopy = 'new Insertion.After($("'.$idTagPrefix.'"), getOuterHTML("'.$idTagPrefix.'").replace(/'.$idTagPrefix.'-/g,"'.$idTagPrefix.'-copy"+Math.floor(Math.random()*100000+1)+"-")); return false;'; // Copied elements doesn't work (well) in Safari while they do in Firefox and MSIE! UPDATE: It turned out that copying doesn't work for any browser, simply because the data from the copied form never gets submitted to the server for some reason! So I decided to simply disable copying for now. If it's requested by customers we can look to enable it again and fix the issue. There is one un-fixable problem though; Copying an element like this will violate integrity if files are attached inside that element because the file reference doesn't get an absolute path prefixed to it which would be required to have TCEmain generate a new copy of the file. @@ -2754,9 +2753,9 @@ '.$theTitle.' '. - ($mayRestructureFlexforms ? 'backPath,'gfx/move.gif','width="16" height="16"').' alt="Drag to Move" title="Drag to Move" />' : ''). + ($mayRestructureFlexforms ? t3lib_iconWorks::getSpriteIcon('actions-move-move', array('title' => 'Drag to Move')) : ''). # 'backPath,'gfx/clip_copy.gif','width="12" height="12"').' alt="Copy" title="Copy" />'. // DISABLED - see what above in definition of variable $onClickCopy - ($mayRestructureFlexforms ? 'backPath,'gfx/garbage.gif','width="11" height="12"').' alt="Delete" title="Delete" />' : ''). + ($mayRestructureFlexforms ? ''.t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => 'Delete')) : ''). ' '; @@ -3616,25 +3615,25 @@ } $aOnClick='setFormValueOpenBrowser(\''.$mode.'\',\''.($fName.'|||'.$allowed.'|'.$aOnClickInline).'\'); return false;'; $icons['R'][]=''. - 'backPath, 'gfx/insert3.gif', 'width="14" height="14"') . ' border="0" ' . t3lib_BEfunc::titleAltAttrib($this->getLL('l_browse_' . ($mode == 'db' ? 'db' : 'file'))) . ' />' . - ''; + t3lib_iconWorks::getSpriteIcon('actions-insert-record', array('title' => htmlspecialchars($this->getLL('l_browse_' . ($mode == 'db' ? 'db' : 'file'))))) . + ''; } if (!$params['dontShowMoveIcons']) { if ($sSize>=5) { $icons['L'][]=''. - 'backPath,'gfx/group_totop.gif','width="14" height="14"').' border="0" '.t3lib_BEfunc::titleAltAttrib($this->getLL('l_move_to_top')).' />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-move-to-top', array('title' => htmlspecialchars($this->getLL('l_move_to_top')))) . + ''; } $icons['L'][]=''. - 'backPath,'gfx/up.gif','width="14" height="14"').' border="0" '.t3lib_BEfunc::titleAltAttrib($this->getLL('l_move_up')).' />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-move-up', array('title' => htmlspecialchars($this->getLL('l_move_up')))) . + ''; $icons['L'][]=''. - 'backPath,'gfx/down.gif','width="14" height="14"').' border="0" '.t3lib_BEfunc::titleAltAttrib($this->getLL('l_move_down')).' />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-move-down', array('title' => htmlspecialchars($this->getLL('l_move_down')))) . + ''; if ($sSize>=5) { $icons['L'][]=''. - 'backPath,'gfx/group_tobottom.gif','width="14" height="14"').' border="0" '.t3lib_BEfunc::titleAltAttrib($this->getLL('l_move_to_bottom')).' />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-move-to-bottom', array('title' => htmlspecialchars($this->getLL('l_move_to_bottom')))) . + ''; } } @@ -3654,13 +3653,13 @@ } $aOnClick.= 'return false;'; $icons['R'][]=''. - 'backPath, 'gfx/insert5.png', 'width="14" height="14"') . ' border="0" ' . t3lib_BEfunc::titleAltAttrib(sprintf($this->getLL('l_clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))) . ' />' . - ''; + t3lib_iconWorks::getSpriteIcon('actions-edit-paste', array('title' => htmlspecialchars(sprintf($this->getLL('l_clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))))) . + ''; } $rOnClick = $rOnClickInline.'setFormValueManipulate(\''.$fName.'\',\'Remove\'); return false'; $icons['L'][]=''. - 'backPath,'gfx/group_clear.gif','width="14" height="14"').' border="0" '.t3lib_BEfunc::titleAltAttrib($this->getLL('l_remove_selected')).' />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-selection-delete', array('title' => htmlspecialchars($this->getLL('l_remove_selected')))) . + ''; } $str=' @@ -5066,7 +5065,7 @@ // Hover popup textbox with alttitle and description if ($this->edit_showFieldHelp == 'icon') { - $arrow = ''; + $arrow = t3lib_iconWorks::getSpriteIcon('actions-view-go-forward'); // add description text $hoverText = '' . nl2br(htmlspecialchars($value)) . $arrow . ''; // put header before the rest of the text @@ -5085,8 +5084,8 @@ ))); $aOnClick = 'vHWin=window.open(\''.$this->backPath.'view_help.php?ffID=' . $params . '\',\'viewFieldHelp\',\'height=400,width=600,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;'; return ''. - 'backPath,'gfx/helpbubble.gif','width="14" height="14"').' hspace="2" border="0" class="absmiddle"'.($GLOBALS['CLIENT']['FORMSTYLE']?' style="cursor:help;"':'').' alt="" />' . $hoverText . - ''; + t3lib_iconWorks::getSpriteIcon('actions-system-help-open') . $hoverText . + ''; } } return ''; @@ -5333,8 +5332,8 @@ } // Toggle icons: - $toggleIcon_open = 'backPath,'gfx/pil2down.gif','width="12" height="7"').' hspace="2" alt="Open" title="Open" />'; - $toggleIcon_close = 'backPath,'gfx/pil2right.gif','width="7" height="12"').' hspace="2" alt="Close" title="Close" />'; + $toggleIcon_open = t3lib_iconWorks::getSpriteIcon('actions-move-down', array('title' => 'Open')); + $toggleIcon_close = t3lib_iconWorks::getSpriteIcon('actions-move-right', array('title' => 'Close')); $out .= ' function getOuterHTML(idTagPrefix) { // Function getting the outerHTML of an element with id Index: t3lib/class.t3lib_querygenerator.php =================================================================== --- t3lib/class.t3lib_querygenerator.php (Revision 7665) +++ t3lib/class.t3lib_querygenerator.php (Arbeitskopie) @@ -1061,7 +1061,7 @@ */ function mkFieldToInputSelect($name,$fieldName) { $out='formWidth().'>'.$this->updateIcon(); - $out.=''; + $out.='' . t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => 'Clear list')) . ''; $out.='
+ t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $LANG->sL('LLL:EXT:lang/locallang_core.php:buttons.clear', TRUE))) . + ''; @@ -375,7 +375,7 @@ $out[]=' '; @@ -386,7 +386,7 @@ $out[]=' '; Index: t3lib/class.t3lib_befunc.php =================================================================== --- t3lib/class.t3lib_befunc.php (Revision 7665) +++ t3lib/class.t3lib_befunc.php (Arbeitskopie) @@ -2483,7 +2483,7 @@ $text = t3lib_BEfunc::helpText($table, $field, $BACK_PATH, ''); $text = ''.$GLOBALS['LANG']->hscAndCharConv($text, false).''; } - return ''.$text.''; + return '' . t3lib_iconWorks::getSpriteIcon('actions-system-help-open', array('class' => 'typo3-csh-icon')) . $text.''; } } @@ -2509,7 +2509,7 @@ $data = $TCA_DESCR[$table]['columns'][$field]; // add see also arrow if ($data['image_descr'] || $data['seeAlso'] || $data['details'] || $data['syntax']) { - $arrow = ''; + $arrow = t3lib_iconWorks::getSpriteIcon('actions-view-go-forward'); } // add description text if ($data['description'] || $arrow) { Index: t3lib/class.t3lib_tceforms_inline.php =================================================================== --- t3lib/class.t3lib_tceforms_inline.php (Revision 7665) +++ t3lib/class.t3lib_tceforms_inline.php (Arbeitskopie) @@ -608,16 +608,16 @@ $cells['required'] = ''; if (isset($rec['__create'])) { - $cells['localize.isLocalizable'] = 'backPath,'gfx/localize_green.gif','width="16" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localize.isLocalizable', 1).'" alt="" />'; + $cells['localize.isLocalizable'] = t3lib_iconWorks::getSpriteIcon('actions-edit-localize-status-low', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localize.isLocalizable', TRUE))); } elseif (isset($rec['__remove'])) { - $cells['localize.wasRemovedInOriginal'] = 'backPath,'gfx/localize_red.gif','width="16" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localize.wasRemovedInOriginal', 1).'" alt="" />'; + $cells['localize.wasRemovedInOriginal'] = t3lib_iconWorks::getSpriteIcon('actions-edit-localize-status-high', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localize.wasRemovedInOriginal', 1))); } // "Info": (All records) if ($enabledControls['info'] && !$isNewItem) { $cells['info']=''. - 'backPath,'gfx/zoom2.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:showInfo',1).'" alt="" />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-system-search', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:showInfo', TRUE))). + ''; } // If the table is NOT a read-only table, then show these links: if (!$tcaTableCtrl['readOnly'] && !$isVirtualRecord) { @@ -641,7 +641,7 @@ // Drag&Drop Sorting: Sortable handler for script.aculo.us if ($enabledControls['dragdrop'] && $permsEdit && $enableManualSorting && $config['appearance']['useSortable']) { - $cells['dragdrop'] = 'backPath,'gfx/move.gif','width="16" height="16" hspace="2"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.move',1).'" alt="" style="cursor: move;" class="sortableHandle" />'; + $cells['dragdrop'] = t3lib_iconWorks::getSpriteIcon('actions-move-move', array('class' => 'sortableHandle', 'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.move', TRUE))); } // "Up/Down" links @@ -649,13 +649,13 @@ $onClick = "return inline.changeSorting('".$nameObjectFtId."', '1')"; // Up $style = $config['inline']['first'] == $rec['uid'] ? 'style="visibility: hidden;"' : ''; $cells['sort.up']=''. - 'backPath,'gfx/button_up.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:moveUp',1).'" alt="" />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-move-up', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:moveUp', TRUE))). + ''; $onClick = "return inline.changeSorting('".$nameObjectFtId."', '-1')"; // Down $style = $config['inline']['last'] == $rec['uid'] ? 'style="visibility: hidden;"' : ''; $cells['sort.down']=''. - 'backPath,'gfx/button_down.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:moveDown',1).'" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-move-down', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:moveDown', TRUE))). ''; } @@ -678,23 +678,23 @@ if ($enabledControls['delete'] && ($isPagesTable && $localCalcPerms&4 || !$isPagesTable && $calcPerms&16)) { $onClick = "inline.deleteRecord('".$nameObjectFtId."');"; $cells['delete']=''. - 'backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:delete',1).'" alt="" />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:delete', TRUE))) . + ''; } // If this is a virtual record offer a minimized set of icons for user interaction: } elseif ($isVirtualRecord) { if ($enabledControls['localize'] && isset($rec['__create'])) { $onClick = "inline.synchronizeLocalizeRecords('".$nameObjectFt."', ".$rec['uid'].");"; $cells['localize'] = '' . - 'backPath,'gfx/localize_el.gif','width="16" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localize', 1).'" alt="" />' . - ''; + t3lib_iconWorks::getSpriteIcon('actions-localize', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localize', TRUE))) . + ''; } } // If the record is edit-locked by another user, we will show a little warning sign: if ($lockInfo=t3lib_BEfunc::isRecordLocked($foreign_table,$rec['uid'])) { $cells['locked']=''. - ''. + t3lib_iconWorks::getSpriteIcon('status-record-warning', array('title' => htmlspecialchars($lockInfo['msg']))) . ''; } @@ -851,7 +851,7 @@ $createNewRelationText = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.createNewRelation',1); $item .= ''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' align="absmiddle" '.t3lib_BEfunc::titleAltAttrib($createNewRelationText).' /> '.$createNewRelationText. + t3lib_iconWorks::getSpriteIcon('actions-edit-edit', array('title' => $createNewRelationText)) . $createNewRelationText . ''; // wrap the selector and add a spacer to the bottom $item = '
'.$item.'
'; @@ -880,7 +880,7 @@ $onClick = "setFormValueOpenBrowser('db','".('|||'.$allowed.'|'.$objectPrefix.'|inline.checkUniqueElement||inline.importElement')."'); return false;"; $item = ''. - 'backPath,'gfx/insert3.gif','width="14" height="14"').' align="absmiddle" '.t3lib_BEfunc::titleAltAttrib($createNewRelationText).' /> '.$createNewRelationText. + t3lib_iconWorks::getSpriteIcon('actions-insert-record', array('title' => $createNewRelationText)). $createNewRelationText . ''; return $item; Index: t3lib/class.t3lib_fullsearch.php =================================================================== --- t3lib/class.t3lib_fullsearch.php (Revision 7665) +++ t3lib/class.t3lib_fullsearch.php (Arbeitskopie) @@ -660,13 +660,13 @@ $params = '&edit['.$table.']['.$row['uid'].']=edit'; $out.='
- - - + + + @@ -1313,7 +1316,7 @@ } if ($copyFile && @is_file($copyFile)) { - $p_field .= ''; + $p_field .= '' . t3lib_iconWorks::getSpriteIcon('actions-edit-copy') . ' border="0" alt="" />'; } // Upload? @@ -1360,8 +1363,8 @@ } - $deleteIconHTML = 'Revert to default Constant'; - $editIconHTML = 'Edit this Constant'; + $deleteIconHTML = t3lib_iconWorks::getSpriteIcon('actions-edit-undo',array('class'=>"typo3-tstemplate-ceditor-control undoIcon",'alt'=>"Revert to default Constant",'title'=>"Revert to default Constant",'rel'=>$params['name'])); + $editIconHTML = t3lib_iconWorks::getSpriteIcon('actions-document-open',array('class'=>"typo3-tstemplate-ceditor-control editIcon",'alt'=>"Edit this Constant",'title'=>"Edit this Constant",'rel'=>$params['name'])); $constantCheckbox = ''; // If there's no default value for the field, use a static label. Index: typo3/class.filelistfoldertree.php =================================================================== --- typo3/class.filelistfoldertree.php (Revision 7665) +++ typo3/class.filelistfoldertree.php (Arbeitskopie) @@ -304,26 +304,26 @@ // Set PM icon: $cmd = $this->bank.'_'.($isOpen ? '0_' : '1_').$specUID.'_'.$this->treeName; - $icon='backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif').' alt="" />'; + $icon='backPath,'gfx/ol/'.($isOpen? 'minus':'plus').'only.gif').' alt="" />'; $firstHtml= $this->PM_ATagWrap($icon,$cmd); switch ($val['type']) { case 'user': - $icon = 'gfx/i/_icon_ftp_user.gif'; + $icon = 'apps-filetree-folder-user'; break; case 'group': - $icon = 'gfx/i/_icon_ftp_group.gif'; + $icon = 'apps-filetree-folder-user'; break; case 'readonly': - $icon = 'gfx/i/_icon_ftp_readonly.gif'; + $icon = 'apps-filetree-folder-locked'; break; default: - $icon = 'gfx/i/_icon_ftp.gif'; + $icon = 'apps-filetree-mount'; break; } // Preparing rootRec for the mount - $firstHtml.=$this->wrapIcon('backPath,$icon,'width="18" height="16"').' alt="" />',$val); + $firstHtml.=$this->wrapIcon(t3lib_iconWorks::getSpriteIcon($icon),$val); $row=array(); $row['uid'] = $specUID; $row['path'] = $val['path']; @@ -415,22 +415,29 @@ if (is_writable($path)) { $type = ''; + $overlays = array(); } else { $type = 'readonly'; + $overlays= array('status-overlay-locked'=>array()); + } - $icon = 'gfx/i/_icon_' .$webpath . 'folders' . ($type == 'readonly' ? '_ro' : '') . '.gif'; + if($webpath == 'web') { + $icon = 'apps-filetree-folder-default';; + } else { + $icon = 'apps-filetree-folder-default'; + } if ($val == '_temp_') { - $icon = 'gfx/i/sysf.gif'; + $icon = 'apps-filetree-folder-temp'; $row['title'] = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:temp', true); $row['_title'] = '' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:temp', true) . ''; } if ($val == '_recycler_') { - $icon = 'gfx/i/recycler.gif'; + $icon = 'apps-filetree-recycler'; $row['title'] = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:recycler', true); $row['_title'] = '' .$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:recycler', true) . ''; } - $HTML .= $this->wrapIcon('backPath, $icon, 'width="18" height="16"').' alt="" />',$row); + $HTML .= $this->wrapIcon(t3lib_iconWorks::getSpriteIcon($icon,array('title'=>$row['title']),$overlays),$row); } // Finally, add the row/HTML content to the ->tree array in the reserved key. Index: typo3/class.webpagetree.php =================================================================== --- typo3/class.webpagetree.php (Revision 7665) +++ typo3/class.webpagetree.php (Arbeitskopie) @@ -95,7 +95,7 @@ if ($lockInfo=t3lib_BEfunc::isRecordLocked('pages',$row['uid'])) { $aOnClick = 'alert('.$GLOBALS['LANG']->JScharCode($lockInfo['msg']).');return false;'; $lockIcon=''. - ''. + t3lib_iconWorks::getSpriteIcon('status-warning-in-use',array('title'=>htmlspecialchars($lockInfo['msg']))). ''; } else $lockIcon = ''; @@ -357,7 +357,7 @@ // Set PM icon for root of mount: $cmd = $this->bank.'_'.($isOpen? "0_" : "1_").$uid.'_'.$this->treeName; - $icon='backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif').' alt="" />'; + $icon='backPath,'gfx/ol/'.($isOpen? 'minus' :'plus' ) . 'only.gif').' alt="" />'; $firstHtml = $this->PMiconATagWrap($icon,$cmd,!$isOpen); // Preparing rootRec for the mount Index: typo3/class.show_rechis.inc =================================================================== --- typo3/class.show_rechis.inc (Revision 7665) +++ typo3/class.show_rechis.inc (Arbeitskopie) @@ -405,7 +405,7 @@ $singleLine = array(); // diff link - $image = ''; + $image = t3lib_iconWorks::getSpriteIcon('actions-go-forward', array('title' => $LANG->getLL('sumUpChanges', TRUE))); $singleLine[] = ''.$this->linkPage($image,array('diff' => $sysLogUid)).''; // remove first link $singleLine[] = htmlspecialchars(t3lib_BEfunc::datetime($entry['tstamp'])); // add time @@ -461,7 +461,7 @@
'. ''. - 'backPath,'gfx/closedok_2.gif','width="21" height="16"').' vspace="2" border="0" title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:buttons.clear',1).'" alt="" />'. - '
'. - 'backPath,'gfx/ol/'.($this->current=='normal'?'minus':'plus').'bullet.gif','width="18" height="16"').' border="0" align="top" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-view-table-' . (($this->current == 'normal') ? 'collapse' : 'expand')) . $this->padTitleWrap('Normal','normal'). '
'. - 'backPath,'gfx/ol/'.($this->current=='tab_'.$a?'minus':'plus').'bullet.gif','width="18" height="16"').' border="0" align="top" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-view-table-' . (($this->current == 'tab_' . $a) ? 'collapse' : 'expand')) . $this->padTitleWrap($this->clLabel('cliptabs').$a,'tab_'.$a). '
'; if (!$row['deleted']) { - $out .= ''; - $out .= ''; + $out .= '' . t3lib_iconWorks::getSpriteIcon('actions-system-search') . ''; + $out .= '' . t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } else { $out.= ''; - $out.= 'undelete'; + $out.= t3lib_iconWorks::getSpriteIcon('action-undelete-button', array('title' => 'undelete only')) . ''; $out.= ''; - $out.= 'undelete and edit'; + $out.= t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => 'undelete and edit')) . ''; } $_params = array($table=>$row); if (is_array($this->hookArray['additionalButtons'])) { Index: t3lib/class.t3lib_bedisplaylog.php =================================================================== --- t3lib/class.t3lib_bedisplaylog.php (Revision 7665) +++ t3lib/class.t3lib_bedisplaylog.php (Arbeitskopie) @@ -212,7 +212,7 @@ $text .= ' ' . sprintf($GLOBALS['LANG']->getLL('changesInFields'), '' . $newRow['fieldlist'] . ''); $text .= ' ' . - '' . ''; } Index: t3lib/class.t3lib_tsparser_ext.php =================================================================== --- t3lib/class.t3lib_tsparser_ext.php (Revision 7665) +++ t3lib/class.t3lib_tsparser_ext.php (Arbeitskopie) @@ -595,10 +595,13 @@ $PM = 'join'; $HTML .= $depthData; - $icon = substr($row['templateID'],0,3) == 'sys' ? t3lib_iconWorks::getIcon('sys_template', array('root' => $row['root'])) : - (substr($row['templateID'], 0, 6) == 'static' ? t3lib_iconWorks::getIcon('static_template', array()) : 'gfx/i/default.gif'); + $alttext = '[' . $row['templateID'] . ']'; $alttext .= $row['pid'] ? ' - ' . t3lib_BEfunc::getRecordPath($row['pid'], $GLOBALS['SOBE']->perms_clause, 20) : ''; + + $icon = substr($row['templateID'],0,3) == 'sys' ? t3lib_iconWorks::getSpriteIconForRecord('sys_template', $row['root'],array('title'=>$alttext)) : + (substr($row['templateID'], 0, 6) == 'static' ? t3lib_iconWorks::getSpriteIconForRecord('static_template', array(),array('title'=>$alttext)) : + t3lib_iconWorks::getSpriteIcon('mimetypes-default',array('title'=>$alttext))); if (in_array($row['templateID'], $this->clearList_const) || in_array($row['templateID'], $this->clearList_setup)) { $A_B = ''; $A_E = ''; @@ -611,14 +614,14 @@ $A_E = ''; } $HTML .= ($first ? '' : '') . - ' ' . + $icon . $A_B . t3lib_div::fixed_lgd_cs($row['title'], $GLOBALS['BE_USER']->uc['titleLen']) . $A_E . '  '; $RL = $this->ext_getRootlineNumber($row['pid']); $keyArray[] = '
' . $HTML . '' . ($row['root'] ? '' : '') . '  ' . ($row['clConf'] ? '' :'') . '  ' . '' . ($row['clConst'] ? '' : '') . '  ' . '' . ($row['root'] ? t3lib_iconWorks::getSpriteIcon('status-status-checked') : '') . '  ' . ($row['clConf'] ? t3lib_iconWorks::getSpriteIcon('status-status-checked') :'') . '  ' . '' . ($row['clConst'] ? t3lib_iconWorks::getSpriteIcon('status-staus-checked') : '') . '  ' . ' ' . ($row['pid'] ? $row['pid'] : '') . ' ' . (strcmp($RL, '') ? $RL : '') . ' ' . ($row['next'] ? ' ' . $row['next'] . '  ' : '') . '
'; if ($this->lastSyslogId) { - $theCode .= '
' . $this->linkPage('',array('diff' => '')); + $theCode .= '
' . $this->linkPage(t3lib_iconWorks::getSpriteIcon('actions-move-to-bottom', array('title' => $LANG->getLL('fullView', TRUE))), array('diff' => '')); } // Add message about the difference view. Index: typo3/file_list.php =================================================================== --- typo3/file_list.php (Revision 7665) +++ typo3/file_list.php (Arbeitskopie) @@ -411,11 +411,13 @@ $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'filelist_module', $GLOBALS['BACK_PATH'], '', TRUE); // upload button - $theIcon = 'backPath,'gfx/upload.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.upload',1)).'" alt="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.upload',1)).'" />'; - $buttons['upload'] = '' . $theIcon . ''; + $buttons['upload'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-upload') . + ''; - $theIcon = 'backPath,'gfx/new_file.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.new',1)).'" alt="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.new',1)).'" />'; - $buttons['new'] = '' . $theIcon . ''; + $buttons['new'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . + ''; return $buttons; } Index: typo3/alt_palette.php =================================================================== --- typo3/alt_palette.php (Revision 7665) +++ typo3/alt_palette.php (Arbeitskopie) @@ -115,7 +115,7 @@ '. implode('',$iRow).' Index: typo3/class.file_list.inc =================================================================== --- typo3/class.file_list.inc (Revision 7665) +++ typo3/class.file_list.inc (Arbeitskopie) @@ -179,20 +179,20 @@ $otherMarkers['PAGE_ICON'] = 'backPath,$icon,'width="18" height="16"').' title="'.htmlspecialchars($theFile['file']).'" alt="'.htmlspecialchars($theFile['file']).'" />'; if ($this->clickMenus) $otherMarkers['PAGE_ICON'] = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($otherMarkers['PAGE_ICON'],$path); - $buttons['level_up'] .= $this->linkWrapDir('backPath,'gfx/i/folder_up.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.upOneLevel',1).'" alt="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.upOneLevel',1).'" />',$theFile['path']); + $buttons['level_up'] .= $this->linkWrapDir(t3lib_iconWorks::getSpriteIcon('actions-view-go-up', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.upOneLevel', 1))), $theFile['path']); $otherMarkers['TITLE'] .= t3lib_div::removeXSS(t3lib_div::fixed_lgd_cs($title,-($this->fixedL+20))); // No HTML specialchars here - HTML like is allowed // this is the root page } else { - $otherMarkers['PAGE_ICON'] = 'backPath,'gfx/i/_icon_ftp.gif','width="18" height="16"').' alt="" />'; + $otherMarkers['PAGE_ICON'] = t3lib_iconWorks::getSpriteIcon('apps-filetree-root'); if ($this->clickMenus) $otherMarkers['PAGE_ICON'] = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($otherMarkers['PAGE_ICON'],$path); $otherMarkers['TITLE'] .= htmlspecialchars(t3lib_div::fixed_lgd_cs($title,-($this->fixedL+20))); } } - $buttons['refresh'] = ''. - 'backPath,'gfx/refresh_n.gif','width="14" height="14"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.reload',1).'" alt="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.reload',1).'" />'. - ''; + $buttons['refresh'] = ''. + t3lib_iconWorks::getSpriteIcon('actions-system-refresh') . + ''; return array($buttons, $otherMarkers); } @@ -225,7 +225,7 @@ $out=''; $titleCol = 'file'; $upLevelDir = dirname(substr($files['files'][0]['path'], 0, -1)) . '/'; - $levelUp = $GLOBALS['SOBE']->basicFF->checkPathAgainstMounts($upLevelDir) ? $this->linkWrapDir('backPath, 'gfx/i/folder_up.gif', 'width="18" height="16"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel',1) . '" alt="" />', $upLevelDir) : ''; + $levelUp = $GLOBALS['SOBE']->basicFF->checkPathAgainstMounts($upLevelDir) ? $this->linkWrapDir(t3lib_iconWorks::getSpriteIcon('actions-view-go-up', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel', TRUE))), $upLevelDir) : ''; // Cleaning rowlist for duplicates and place the $titleCol as the first column always! $rowlist = t3lib_div::rmFromList($titleCol,$rowlist); @@ -260,16 +260,17 @@ $table='_FILE'; $elFromTable = $this->clipObj->elFromTable($table); if (count($elFromTable)) { - $cells[]=''. - ''; + $cells[]='' . + t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') . + ''; } if ($this->clipObj->current!='normal' && $iOut) { - $cells[]=$this->linkClipboardHeaderIcon('',$table,'setCB'); - $cells[]=$this->linkClipboardHeaderIcon('',$table,'delete',$GLOBALS['LANG']->getLL('clip_deleteMarkedWarning')); + $cells[]=$this->linkClipboardHeaderIcon(t3lib_iconWorks::getSpriteIcon('actions-edit-copy', array('title' => $GLOBALS['LANG']->getLL('clip_selectMarked', 1))), $table,'setCB'); + $cells[]=$this->linkClipboardHeaderIcon(t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => $GLOBALS['LANG']->getLL('clip_deleteMarked'))), $table,'delete',$GLOBALS['LANG']->getLL('clip_deleteMarkedWarning')); $onClick = 'checkOffCB(\'' . implode(',', $this->CBnames) . '\', this); return false;'; - $cells[] = ''. - ''. - ''; + $cells[] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-select'). + ''; } $theData[$v] = implode('',$cells); } else { // Normal row: @@ -330,7 +331,7 @@ list($title,$icon,$path) = $this->dirData($theFile); // The icon with link - $theIcon = 'backPath,$icon,'width="18" height="16"').' title="'.htmlspecialchars($theFile['file']).'" alt="'.htmlspecialchars($theFile['file']).'" />'; + $theIcon = t3lib_iconWorks::getSpriteIconForFile($theFile['fileext'], array('title' => htmlspecialchars($theFile['file']))); if ($this->clickMenus) $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($theIcon,$path); // Preparing and getting the data-array @@ -471,9 +472,10 @@ $this->totalbytes+=$theFile['size']; $ext = $items['files'][$key][fileext]; $icon = t3lib_BEfunc::getFileIcon($ext); - + // The icon with link - $theIcon = 'backPath,'gfx/fileicons/'.$icon,'width="18" height="16"').' title="'.htmlspecialchars($theFile['file']).'" alt="'.htmlspecialchars($theFile['file']).'" />'; + $theIcon = t3lib_iconWorks::getSpriteIconForFile($theFile['fileext'], array('title' => htmlspecialchars($theFile['file']))); + if ($this->clickMenus) $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($theIcon,$theFile['path'].$theFile['file']); // Preparing and getting the data-array @@ -637,10 +639,10 @@ if ($this->clipObj->current=='normal') { $isSel = $this->clipObj->isSelected('_FILE',$md5); $cells[]=''. - ''. + t3lib_iconWorks::getSpriteIcon('actions-edit-copy'.($isSel=='copy'?'-release':''),array('title'=>$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.copy',1))). ''; $cells[]=''. - ''. + t3lib_iconWorks::getSpriteIcon('actions-edit-cut'.($isSel=='cut'?'-release':''),array('title'=>$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.cut',1))). ''; } else { // For numeric pads, add select checkboxes: $n='_FILE|'.$md5; @@ -654,9 +656,9 @@ // Display PASTE button, if directory: $elFromTable = $this->clipObj->elFromTable('_FILE'); if (@is_dir($fullIdent) && count($elFromTable)) { - $cells[]=''. - ''. - ''; + $cells[]=''. + t3lib_iconWorks::getSpriteIcon('document-paste-into') . + ''; } // Compile items into a DIV-element: @@ -691,17 +693,17 @@ $editOnClick = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'file_edit.php?target=' . rawurlencode($fullIdent) . '&returnUrl=\'+top.rawurlencode(top.content.list_frame.document.location);return false;'; - $cells['edit'] = ''; + $cells['edit'] = '' . t3lib_iconWorks::getSpriteIcon('actions-page-open') . ''; } //rename $renameOnClick = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'file_rename.php?target=' . rawurlencode($fullIdent) . '&returnUrl=\'+top.rawurlencode(top.content.list_frame.document.location);return false;'; - $cells['rename'] = ''; + $cells['rename'] = '' . t3lib_iconWorks::getSpriteIcon('actions-edit-rename') . ''; //info $infoOnClick = 'top.launchView(\'' . $fullIdent . '\', \'\');return false;'; - $cells['info'] = ''; + $cells['info'] = '' . t3lib_iconWorks::getSpriteIcon('status-dialog-information') . ''; // Hook for manipulating edit icons. if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['fileList']['editIconsHook'])) { Index: typo3/classes/class.clearcachemenu.php =================================================================== --- typo3/classes/class.clearcachemenu.php (Revision 7665) +++ typo3/classes/class.clearcachemenu.php (Arbeitskopie) @@ -64,7 +64,7 @@ 'id' => 'all', 'title' => $title, 'href' => $this->backPath.'tce_db.php?vC='.$GLOBALS['BE_USER']->veriCode().'&cacheCmd=all', - 'icon' => 'backPath, 'gfx/lightning_red.png', 'width="16" height="16"').' title="'.$title.'" alt="'.$title.'" />' + 'icon' => t3lib_iconWorks::getSpriteIcon('actions-system-cache-clear-impact-high') ); } @@ -75,7 +75,7 @@ 'id' => 'pages', 'title' => $title, 'href' => $this->backPath.'tce_db.php?vC='.$GLOBALS['BE_USER']->veriCode().'&cacheCmd=pages', - 'icon' => 'backPath, 'gfx/lightning.png', 'width="16" height="16"').' title="'.$title.'" alt="'.$title.'" />' + 'icon' => t3lib_iconWorks::getSpriteIcon('actions-system-cache-clear-impact-medium') ); } @@ -86,7 +86,7 @@ 'id' => 'temp_CACHED', 'title' => $title, 'href' => $this->backPath.'tce_db.php?vC='.$GLOBALS['BE_USER']->veriCode().'&cacheCmd=temp_CACHED', - 'icon' => 'backPath, 'gfx/lightning_green.png', 'width="16" height="16"').' title="'.$title.'" alt="'.$title.'" />' + 'icon' => t3lib_iconWorks::getSpriteIcon('actions-system-cache-clear-impact-low') ); } Index: typo3/classes/class.workspaceselector.php =================================================================== --- typo3/classes/class.workspaceselector.php (Revision 7665) +++ typo3/classes/class.workspaceselector.php (Arbeitskopie) @@ -183,17 +183,11 @@ $availableWorkspaces = $this->getAvailableWorkspaces(); $workspaceMenu = array(); - $stateCheckedIcon = 'backPath, - 'gfx/state_checked.png', - 'width="16" height="16"') . - ' title="' . $GLOBALS['LANG']->getLL('shortcut_active') . - '" alt="' . $GLOBALS['LANG']->getLL('shortcut_active') . '" class="state-active" />'; - $stateUncheckedIcon = '' . $GLOBALS['LANG']->getLL('shortcut_inactive') . ''; + $stateCheckedIcon = t3lib_iconWorks::getSpriteIcon('status-status-checked'); + + $stateUncheckedIcon = '' . $GLOBALS['LANG']->getLL('shortcut_inactive') . ''; - $workspaceMenu[] = 'backPath, Index: typo3/template.php =================================================================== --- typo3/template.php (Revision 7665) +++ typo3/template.php (Arbeitskopie) @@ -448,7 +448,7 @@ $viewPage = $noViewPageIcon ? '' : $this->viewPageIcon($row['uid'],$this->backPath,''); if ($table=='pages') $path.=' - '.t3lib_BEfunc::titleAttribForPages($row,'',0); } else { - $iconImgTag='backPath,'gfx/i/_icon_website.gif',$wHattribs='width="18" height="16"').' title="'.htmlspecialchars($path).'" alt="" />'; + $iconImgTag = t3lib_iconWorks::getSpriteIcon('apps-pagetree-page-domain', array('title' => htmlspecialchars($path))); $title=$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']; } @@ -504,7 +504,8 @@ .'\''.rawurlencode($pathInfo['path']."?".$storeUrl).$mMN.'\'' .');return false;'; - $sIcon = ''; + $sIcon = '' + . t3lib_iconworks::getSpriteIcon('actions-system-shortcut-new') . ''; return $sIcon; } @@ -1206,22 +1207,22 @@ function icons($type, $styleAttribValue='') { switch($type) { case '3': - $icon = 'gfx/icon_fatalerror.gif'; + $icon = 'status-dialog-error'; break; case '2': - $icon = 'gfx/icon_warning.gif'; + $icon = 'status-dialog-warning'; break; case '1': - $icon = 'gfx/icon_note.gif'; + $icon = 'status-dialog-notification'; break; case '-1': - $icon = 'gfx/icon_ok.gif'; + $icon = 'status-dialog-ok'; break; default: break; } if ($icon) { - return 'backPath,$icon,'width="18" height="16"').' class="absmiddle"'.($styleAttribValue ? ' style="'.htmlspecialchars($styleAttribValue).'"' : '').' alt="" />'; + return t3lib_iconWorks::getSpriteIcon($icon); } } @@ -2120,13 +2121,13 @@ // 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'=>$alttext)); // Make Icon: $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', $pageRecord['uid']); $pid = $pageRecord['uid']; } else { // On root-level of page tree // Make Icon - $iconImg = 'backPath, 'gfx/i/_icon_website.gif') . ' alt="' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '" />'; + $iconImg = t3lib_iconWorks::getSpriteIcon('apps-pagetree-root', array('title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'])); if($BE_USER->user['admin']) { $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', 0); } else { Index: typo3/backend.php =================================================================== --- typo3/backend.php (Revision 7665) +++ typo3/backend.php (Arbeitskopie) @@ -300,14 +300,7 @@ protected function getLoggedInUserLabel() { global $BE_USER, $BACK_PATH; - $icon = 'isAdmin() ? - 'gfx/i/be_users_admin.gif' : - 'gfx/i/be_users.gif', - 'width="18" height="16"' - ) - .' title="" alt="" />'; + $icon = t3lib_iconWorks::getSpriteIcon('status-user-'. ($BE_USER->isAdmin() ? 'admin' : 'backend')); $label = $GLOBALS['BE_USER']->user['realName'] ? $BE_USER->user['realName'].' ['.$BE_USER->user['username'].']' : Index: typo3/wizard_tsconfig.php =================================================================== --- typo3/wizard_tsconfig.php (Revision 7665) +++ typo3/wizard_tsconfig.php (Arbeitskopie) @@ -347,7 +347,7 @@ // Title and description: $out.=''. - 'doc->backPath,'gfx/goback.gif','width="14" height="14"').' alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-go-back') . htmlspecialchars($obj_string). '
'; if ($rec['title']) $out.= ''.htmlspecialchars($rec['title']).': '; @@ -615,8 +615,8 @@ if(!$this->onlyProperty) { $aOnClick = 'document.editform.mixer.value=unescape(\' '.rawurlencode($propertyName.'='.$propertyVal).'\')+\'\n\'+document.editform.mixer.value; return false;'; $out.= ''. - 'doc->backPath,'gfx/plusbullet2.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->getLL('tsprop_addToList',1).'" align="top" alt="" />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-edit-add', array('title' => $GLOBALS['LANG']->getLL('tsprop_addToList', TRUE))) . + ''; $propertyName = $prefix.'.'.$propertyName; } Index: typo3/alt_db_navframe.php =================================================================== --- typo3/alt_db_navframe.php (Revision 7665) +++ typo3/alt_db_navframe.php (Arbeitskopie) @@ -242,9 +242,11 @@ // Setting up the buttons and markers for docheader $docHeaderButtons = $this->getButtons(); $markers = array( - 'IMG_RESET' => '', + 'IMG_RESET' => t3lib_iconWorks::getSpriteIcon('actions-document-close', array( + 'id' =>'treeFilterReset', + 'alt'=> $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.resetFilter'), + 'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.resetFilter') + )), 'WORKSPACEINFO' => $this->getWorkspaceInfo(), 'CONTENT' => $this->content ); @@ -286,10 +288,14 @@ // New Page $onclickNewPageWizard = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'db_new.php?pagesOnly=1&id=\'+Tree.pageID;'; - $buttons['new_page'] = ''; + $buttons['new_page'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-page-new') . + ''; // Refresh - $buttons['refresh'] = ''; + $buttons['refresh'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-refresh') . + ''; // CSH $buttons['csh'] = str_replace('typo3-csh-inline','typo3-csh-inline show-right',t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'pagetree', $GLOBALS['BACK_PATH'], '', TRUE)); @@ -321,7 +327,7 @@ $workspaceInfo = ' '; Index: typo3/alt_doc.php =================================================================== --- typo3/alt_doc.php (Revision 7665) +++ typo3/alt_doc.php (Arbeitskopie) @@ -838,20 +838,20 @@ if (!$this->errorC && !$TCA[$this->firstEl['table']]['ctrl']['readOnly']) { // SAVE button: - $buttons['save'] = ''; + $buttons['save'] = t3lib_iconWorks::getSpriteIcon('actions-document-save', array( 'html' => '' )); // SAVE / VIEW button: if ($this->viewId && !$this->noView && t3lib_extMgm::isLoaded('cms') && $this->getNewIconMode($this->firstEl['table'], 'saveDocView')) { - $buttons['save_view'] = ''; + $buttons['save_view'] = t3lib_iconWorks::getSpriteIcon('actions-document-save-view',array('html'=>'')); } // SAVE / NEW button: if (count($this->elementsData)==1 && $this->getNewIconMode($this->firstEl['table'])) { - $buttons['save_new'] = ''; + $buttons['save_new'] = t3lib_iconWorks::getSpriteIcon('actions-document-save-new',array('html'=>'')); } // SAVE / CLOSE - $buttons['save_close'] = ''; + $buttons['save_close'] = t3lib_iconWorks::getSpriteIcon('actions-document-save-close',array('html'=>'')); // FINISH TRANSLATION / SAVE / CLOSE if ($GLOBALS['TYPO3_CONF_VARS']['BE']['explicitConfirmationOfTranslation']) { @@ -861,8 +861,8 @@ } // CLOSE button: - $buttons['close'] = ''. - 'doc->backPath,'gfx/closedok.gif','width="21" height="16"').' class="c-inputButton" title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc',1).'" alt="" />'. + $buttons['close'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-close') . ''; @@ -873,8 +873,8 @@ // Delete: if ($this->firstEl['deleteAccess'] && !$TCA[$this->firstEl['table']]['ctrl']['readOnly'] && !$this->getNewIconMode($this->firstEl['table'],'disableDelete')) { $aOnClick = 'return deleteRecord(\''.$this->firstEl['table'].'\',\''.$this->firstEl['uid'].'\',unescape(\''.rawurlencode($this->retUrl).'\'));'; - $buttons['delete'] = ''. - 'doc->backPath,'gfx/deletedok.gif','width="21" height="16"').' class="c-inputButton" title="'.$LANG->getLL('deleteItem',1).'" alt="" />'. + $buttons['delete'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; } @@ -882,26 +882,23 @@ $undoRes = $GLOBALS['TYPO3_DB']->exec_SELECTquery('tstamp', 'sys_history', 'tablename='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->firstEl['table'], 'sys_history').' AND recuid='.intval($this->firstEl['uid']), '', 'tstamp DESC', '1'); if ($undoButtonR = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($undoRes)) { $aOnClick = 'window.location.href=\'show_rechis.php?element='.rawurlencode($this->firstEl['table'].':'.$this->firstEl['uid']).'&revert=ALL_FIELDS&sumUp=-1&returnUrl='.rawurlencode($this->R_URI).'\'; return false;'; - $buttons['undo'] = ''. - 'doc->backPath, 'gfx/undo.gif', 'width="21" height="16"') . - ' class="c-inputButton"' . - ' title="' . htmlspecialchars(sprintf($LANG->getLL('undoLastChange'), t3lib_BEfunc::calcAge($GLOBALS['EXEC_TIME'] - $undoButtonR['tstamp'], $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.minutesHoursDaysYears')))) . - '" alt="" />' . + $buttons['undo'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-undo') . ''; } if ($this->getNewIconMode($this->firstEl['table'],'showHistory')) { $aOnClick = 'window.location.href=\'show_rechis.php?element='.rawurlencode($this->firstEl['table'].':'.$this->firstEl['uid']).'&returnUrl='.rawurlencode($this->R_URI).'\'; return false;'; $buttons['history'] = ''. - 'doc->backPath,'gfx/history2.gif','width="13" height="12"').' class="c-inputButton" alt="" />'. - ''; + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . + ''; } // If only SOME fields are shown in the form, this will link the user to the FULL form: if ($this->columnsOnly) { - $buttons['columns_only'] = ''. - 'doc->backPath,'gfx/edit2.gif','width="11" height="12"').' class="c-inputButton" title="'.$LANG->getLL('editWholeRecord',1).'" alt="" />'. - ''; + $buttons['columns_only'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-edit') . + ''; } } } @@ -1017,8 +1014,9 @@ return ''; } $aOnClick = 'vHWin=window.open(\''.t3lib_div::linkThisScript(array('returnUrl'=>'close.html')).'\',\''.md5($this->R_URI).'\',\'width=670,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;'; - return ''. - 'doc->backPath,'gfx/open_in_new_window.gif','width="19" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.openInNewWindow',1).'" alt="" />'; + return '' . + t3lib_iconWorks::getSpriteIcon('actions-window-open') . + ''; } Index: typo3/wizard_forms.php =================================================================== --- typo3/wizard_forms.php (Revision 7665) +++ typo3/wizard_forms.php (Arbeitskopie) @@ -291,8 +291,8 @@ // Close $buttons['close'] = '' . - 'doc->backPath, 'gfx/closedok.gif') . ' class="c-inputButton" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', 1) . '" alt="" />' . - ''; + t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE))) . + ''; // Save $buttons['save'] = 'doc->backPath, 'gfx/savedok.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', 1) . '" />'; Index: typo3/wizard_table.php =================================================================== --- typo3/wizard_table.php (Revision 7665) +++ typo3/wizard_table.php (Arbeitskopie) @@ -210,8 +210,8 @@ // Close $buttons['close'] = '' . - 'doc->backPath, 'gfx/closedok.gif') . ' class="c-inputButton" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', 1) . '" alt="" />' . - ''; + t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE))) . + ''; // Save $buttons['save'] = 'doc->backPath, 'gfx/savedok.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', 1) . '" />'; Index: typo3/class.alt_menu_functions.inc =================================================================== --- typo3/class.alt_menu_functions.inc (Revision 7665) +++ typo3/class.alt_menu_functions.inc (Arbeitskopie) @@ -212,7 +212,7 @@ // make menu collapsable if($collapsable == 1 && is_array($moduleInfo['sub'])) { $collapseJS = 'onclick="window.location.href=\'alt_menu.php?collapsedOverride['.$moduleName.']='.($config[$moduleName] ? '0' : '1').'\'"'; - $collapseIcon = ''; + $collapseIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-' . ($config[$moduleName]) ? 'expand' : 'collapse', array('class' => 'c-iconCollapse')); } else { $collapseJS = $collapseIcon = ''; } Index: typo3/file_edit.php =================================================================== --- typo3/file_edit.php (Revision 7665) +++ typo3/file_edit.php (Arbeitskopie) @@ -230,16 +230,16 @@ $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_edit', $GLOBALS['BACK_PATH'], '', TRUE); // Save button - $theIcon = 'backPath,'gfx/savedok.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:file_edit.php.submit',1)).'" alt="" />'; - $buttons['SAVE'] = ''.$theIcon.''; + $theIcon = t3lib_iconWorks::getSpriteIcon('actions-document-save'); + $buttons['SAVE'] = '' . $theIcon . ''; // Save and Close button - $theIcon = 'backPath,'gfx/saveandclosedok.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:file_edit.php.saveAndClose',1)).'" alt="" />'; - $buttons['SAVE_CLOSE'] = ''.$theIcon.''; + $theIcon = t3lib_iconWorks::getSpriteIcon('actions-document-save-close'); + $buttons['SAVE_CLOSE'] = '' . $theIcon . ''; // Cancel button - $theIcon = 'backPath,'gfx/closedok.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.cancel',1)).'" alt="" />'; - $buttons['CANCEL'] = ''.$theIcon.''; + $theIcon = t3lib_iconWorks::getSpriteIcon('actions-document-close'); + $buttons['CANCEL'] = '' . $theIcon . ''; return $buttons; } Index: typo3/mod/tools/em/class.em_index.php =================================================================== --- typo3/mod/tools/em/class.em_index.php (Revision 7665) +++ typo3/mod/tools/em/class.em_index.php (Arbeitskopie) @@ -709,7 +709,9 @@ } // Back if(($this->CMD['showExt'] && (!$this->CMD['standAlone'] && !t3lib_div::_GP('standAlone'))) || ($this->CMD['importExt'] || $this->CMD['uploadExt'] && (!$this->CMD['standAlone'])) || $this->CMD['importExtInfo']) { - $buttons['back'] = 'doc->backPath, 'gfx/goback.gif') . ' title="' . $GLOBALS['LANG']->getLL('go_back') . '" class="absmiddle" alt="" />'; + $buttons['back'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . + ''; } return $buttons; @@ -764,7 +766,7 @@ } if(count($extensions)) { $lines[]='
'; - $lines[]=''; + $lines[]=''; $lines[] = implode(LF,$extensions); } } @@ -824,7 +826,7 @@ } if(count($extensions)) { $lines[]=''; - $lines[]=''; + $lines[]=''; $lines[] = implode(LF,$extensions); } } @@ -899,7 +901,7 @@ foreach($cat[$this->MOD_SETTINGS['listOrder']] as $catName => $extEkeys) { if (count($extEkeys)) { $lines[]=''; - $lines[]=''; + $lines[]=''; natcasesort($extEkeys); foreach ($extEkeys as $extKey => $value) { @@ -915,15 +917,17 @@ if ($inst_list[$extKey]['EM_CONF']['state'] != 'excludeFromUpdates') { $loc= ($inst_list[$extKey]['type']=='G'?'G':'L'); $aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]='.$loc; - $loadUnloadLink .= ''; + $loadUnloadLink .= '' . + t3lib_iconWorks::getSpriteIcon('actions-system-extension-update') . + ''; } else { // extension is marked as "excludeFromUpdates" - $loadUnloadLink .= ''; + $loadUnloadLink .= t3lib_iconWorks::getSpriteIcon('status-dialog-warning', $GLOBALS['LANG']->getLL('excluded_from_updates') ); } } else { // import $aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]=L'; - $loadUnloadLink .= ''; + $loadUnloadLink .= '' . t3lib_iconWorks::getSpriteIcon('actions-system-extension-import') . ''; } } else { $loadUnloadLink = ' '; @@ -3462,15 +3466,16 @@ $cells[] = ''; if (!$import) { // Listing extension on LOCAL server: // Extension Download: - $cells[] = ''; + $cells[] = ''; // Manual download $fileP = PATH_site.$this->typePaths[$extInfo['type']].$extKey.'/doc/manual.sxw'; $cells[] = ''; // Double installation (inclusion of an extension in more than one of system, global or local scopes) @@ -3610,8 +3615,7 @@ * @return string tag */ function removeButton() { - return ''; + return t3lib_iconWorks::getSpriteIcon('actions-system-extension-uninstall', array('title' => $GLOBALS['LANG']->getLL('ext_details_remove_ext'))); } /** @@ -3620,8 +3624,7 @@ * @return string tag */ function installButton() { - return ''; + return t3lib_iconWorks::getSpriteIcon('actions-system-extension-install', array('title' => $GLOBALS['LANG']->getLL('helperFunction_install_extension'))); } /** @@ -3630,8 +3633,8 @@ * @return string + text string. */ function noImportMsg() { - return ' - ' . $GLOBALS['LANG']->getLL('helperFunction_import_not_possible') . ''; + return t3lib_iconWorks::getSpriteIcon('status-dialog-warning') . + '' . $GLOBALS['LANG']->getLL('helperFunction_import_not_possible') . ''; } /** @@ -4969,8 +4972,7 @@ if(!isset($instExtInfo[$depK])) { $msg[] = '
' . sprintf($GLOBALS['LANG']->getLL('checkDependencies_ext_not_available'), $depK); - $msg[] = '      + $msg[] = '    ' . t3lib_iconWorks::getSpriteIcon('actions-system-extension-import', array('title' => $GLOBALS['LANG']->getLL('checkDependencies_import_ext'))) . '  ' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . ''; $msg[] = '    '; @@ -5067,8 +5069,7 @@ if (!isset($instExtInfo[$suggestK])) { $msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_suggest_import'), $suggestK); - $msg[] = '      + $msg[] = '    ' . t3lib_iconWorks::getSpriteIcon('actions-system-extension-import', array('title' => $GLOBALS['LANG']->getLL('checkDependencies_import_ext'))) . '  ' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . ''; $msg[] = '    '; @@ -5429,8 +5430,7 @@ Index: typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php =================================================================== --- typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php (Revision 7665) +++ typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php (Arbeitskopie) @@ -260,8 +260,8 @@ $elementId = 'o_'.$page; $options = ''.$options; $selector = ''; - $saveButton = 'backPath, 'gfx/savedok.gif', 'width="21" height="16"').' border="0" title="Change owner" align="top" alt="" />'; - $cancelButton = 'backPath, 'gfx/closedok.gif', 'width="21" height="16"').' border="0" title="Cancel" align="top" alt="" />'; + $saveButton = '' . t3lib_iconWorks::getSpriteIcon('actions-document-save') . ''; + $cancelButton = '' . t3lib_iconWorks::getSpriteIcon('actions-document-close') . ''; $ret = $selector.$saveButton.$cancelButton; return $ret; } @@ -309,8 +309,8 @@ $elementId = 'g_'.$page; $options = ''.$options; $selector = ''; - $saveButton = 'backPath, 'gfx/savedok.gif', 'width="21" height="16"').' border="0" title="Change group" align="top" alt="" />'; - $cancelButton = 'backPath, 'gfx/closedok.gif', 'width="21" height="16"').' border="0" title="Cancel" align="top" alt="" />'; + $saveButton = '' . t3lib_iconWorks::getSpriteIcon('actions-document-save') . ''; + $cancelButton = '' . t3lib_iconWorks::getSpriteIcon('actions-document-close') . ''; $ret = $selector.$saveButton.$cancelButton; return $ret; } @@ -357,7 +357,7 @@ */ protected function renderToggleEditLock($page, $editLockState) { if ($editLockState === 1) { - $ret = 'backPath,'gfx/recordlock_warning2.gif','width="22" height="16"').' title="The page and all content is locked for editing by all non-Admin users." alt="" />'; + $ret = '' . t3lib_iconWorks::getSpriteIcon('status-warning-lock') . ''; } else { $ret = '[+]'; } @@ -380,9 +380,9 @@ $permissions = array(1,16,2,4,8); foreach ($permissions as $permission) { if ($int&$permission) { - $str .= '*'; + $str .= t3lib_iconWorks::getSpriteIcon('status-status-permission-granted',array('tag'=>'a','title'=>$LANG->getLL($permission,1), 'onclick'=> 'WebPermissions.setPermissions('.$pageId.', '.$permission.', \'delete\', \''.$who.'\', '.$int.');')); } else { - $str .= 'x'; + $str .= t3lib_iconWorks::getSpriteIcon('status-status-permission-denied',array('tag'=>'a','title'=>$LANG->getLL($permission,1),'onclick'=>'WebPermissions.setPermissions('.$pageId.', '.$permission.', \'add\', \''.$who.'\', '.$int.');')); } } return ''.$str.''; Index: typo3/mod/web/perm/index.php =================================================================== --- typo3/mod/web/perm/index.php (Revision 7665) +++ typo3/mod/web/perm/index.php (Arbeitskopie) @@ -348,8 +348,8 @@ $buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_info', '', $GLOBALS['BACK_PATH'], '', TRUE); // View page - $buttons['view'] = '' . - '' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // Shortcut @@ -360,8 +360,8 @@ // If access to Web>List for user, then link to that module. if ($GLOBALS['BE_USER']->check('modules','web_list')) { $href = $GLOBALS['BACK_PATH'] . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - '' . + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; } return $buttons; @@ -582,7 +582,7 @@ $tree->addField('editlock'); // Creating top icon; the current page - $HTML=t3lib_iconWorks::getIconImage('pages',$this->pageinfo,$BACK_PATH,'align="top"'); + $HTML=t3lib_iconWorks::getSpriteIconForRecord('pages',$this->pageinfo); $tree->tree[] = array('row'=>$this->pageinfo,'HTML'=>$HTML); // Create the tree from $this->id: @@ -652,7 +652,7 @@ if ($editPermsAllowed && $pageId) { $aHref = 'index.php?mode='.$this->MOD_SETTINGS['mode'].'&depth='.$this->MOD_SETTINGS['depth'].'&id='.($data['row']['_ORIG_uid'] ? $data['row']['_ORIG_uid'] : $pageId).'&return_id='.$this->id.'&edit=1'; $cells[]=' - '; + ' . t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } else { $cells[]=' '; @@ -671,7 +671,8 @@ '.($pageId ? ' '.SC_mod_web_perm_ajax::renderPermissions($data['row']['perms_everybody'], $pageId, 'everybody') : '').' - '.($data['row']['editlock']?'' : ( $pageId === 0 ? '' : '[+]')).' + '.($data['row']['editlock']?'' . + t3lib_iconWorks::getSpriteIcon('status-warning-lock') . '' : ( $pageId === 0 ? '' : '[+]')).' '; } else { $cells[]=' @@ -684,7 +685,7 @@ '.($pageId ? $owner.SC_mod_web_perm_ajax::renderPermissions($BE_USER->calcPerms($data['row']), $pageId, 'user') : '').' '.(!$BE_USER->isAdmin()?' - '.($data['row']['editlock']?'' : '').' + '.($data['row']['editlock'] ? t3lib_iconWorks::getSpriteIcon('status-warning-lock', array('title' => $LANG->getLL('EditLock_descr', TRUE))) : '').' ':''); $bgCol = $lE_bgCol; } @@ -720,8 +721,8 @@
'. - ''. + '' . t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.close', TRUE))) . ''. '

'.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'
' . t3lib_iconWorks::getSpriteIcon('apps-filetree-folder-default') . ''.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'

'.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'
' . t3lib_iconWorks::getSpriteIcon('apps-filetree-folder-default') . ''. htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'

'.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'
' . t3lib_iconWorks::getSpriteIcon('apps-filetree-folder-default') . ''.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'
'.($verDiff ? ''.$GLOBALS['TBE_TEMPLATE']->rfw(htmlspecialchars($extInfo['EM_CONF']['version'])).'' : $extInfo['EM_CONF']['version']).' - ' . + t3lib_iconWorks::getSpriteIcon('actions-system-extension-download') . + ''. ($this->typePaths[$extInfo['type']] && @is_file($fileP) ? - ' - ' : ''). + '' . + t3lib_iconWorks::getSpriteIcon('actions-system-extension-documentation') . '' : '') . ' ' . ($exist ? - '' . + t3lib_iconWorks::getSpriteIcon('status-dialog-warning') . $GLOBALS['LANG']->getLL('checkDBupdates_table_exists') : '') . '
'; $code.='
'.$LANG->getLL('def',1); - $code.='

*: '.$LANG->getLL('A_Granted', 1); - $code.='
x: '.$LANG->getLL('A_Denied', 1); + $code.='

'.t3lib_iconWorks::getSpriteIcon('status-status-permission-granted').': '.$LANG->getLL('A_Granted', 1); + $code.='
'.t3lib_iconWorks::getSpriteIcon('status-status-permission-denied').': '.$LANG->getLL('A_Denied', 1); $code.='
'; // Adding section with legend code: Index: typo3/mod/web/func/index.php =================================================================== --- typo3/mod/web/func/index.php (Revision 7665) +++ typo3/mod/web/func/index.php (Arbeitskopie) @@ -192,9 +192,10 @@ if($this->id && is_array($this->pageinfo)) { // View page - $buttons['view'] = '' . - '' . - ''; + $buttons['view'] = 'sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . ' + ">' . t3lib_iconWorks::getSpriteIcon('actions-page-view') . ''; // Shortcut if ($BE_USER->mayMakeShortcut()) { @@ -204,9 +205,8 @@ // If access to Web>List for user, then link to that module. if ($BE_USER->check('modules','web_list')) { $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - '' . - ''; + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; } } Index: typo3/mod/web/info/index.php =================================================================== --- typo3/mod/web/info/index.php (Revision 7665) +++ typo3/mod/web/info/index.php (Arbeitskopie) @@ -191,8 +191,8 @@ $buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_info', '', $GLOBALS['BACK_PATH'], '', TRUE); // View page - $buttons['view'] = '' . - '' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // Shortcut @@ -203,8 +203,8 @@ // If access to Web>List for user, then link to that module. if ($BE_USER->check('modules','web_list')) { $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - '' . + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; } return $buttons; Index: typo3/mod/user/ws/workspaceforms.php =================================================================== --- typo3/mod/user/ws/workspaceforms.php (Revision 7665) +++ typo3/mod/user/ws/workspaceforms.php (Arbeitskopie) @@ -179,8 +179,8 @@ $this->content .= $LANG->getLL($this->isEditAction ? 'edit_workspace_no_permission' : 'create_workspace_no_permission'); $this->content .= $this->doc->spacer(5); $goBack = $GLOBALS['LANG']->getLL('edit_workspace_go_back'); - $this->content .= '' . $goBack . '' . - '' . + $this->content .= t3lib_iconWorks::getSpriteIcon('actions-go-back') . + '' . $goBack . ''; $this->content .= $this->doc->endPage(); @@ -248,7 +248,7 @@ ); // Close, `n` below is simply to prevent caching - $buttons['close'] = 'doc->backPath, 'gfx/closedok.gif') . ' class="c-inputButton" title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', 1) . '" alt="" />'; + $buttons['close'] = '' . t3lib_iconWorks::getSpriteIcon('actions-document-close') . ''; // Save $buttons['save'] = 'doc->backPath, 'gfx/savedok.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', 1) . '" value="_savedok" />'; // Save & Close Index: typo3/mod/user/ws/index.php =================================================================== --- typo3/mod/user/ws/index.php (Revision 7665) +++ typo3/mod/user/ws/index.php (Arbeitskopie) @@ -251,8 +251,8 @@ $this->doc->setModuleTemplate('templates/ws.html'); // JavaScript - $plusIcon = t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/ol/plusbullet.gif', 'width="18" height="16"', 1); - $minusIcon = t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/ol/minusbullet.gif', 'width="18" height="16"', 1); + $plusIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-expand'); + $minusIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-collapse'); $this->doc->JScode = $this->doc->wrapScriptTags(' script_ended = 0; function jumpToUrl(URL) { // @@ -599,7 +599,7 @@ // row #1, column #1: expand icon $content .= '' . '' . - '' . $LANG->getLL('img_title_show_more') . '' . + t3lib_iconWorks::getSpriteIcon('actions-view-tables-expand', array('title' => $LANG->getLL('img_title_show_more'))) . ''; // row #1, column #2: icon panel @@ -747,8 +747,7 @@ if (!$isAdmin && !in_array($mp['uid'], $userMPs)) { // Show warning icon $title = $GLOBALS['LANG']->getLL('workspace_list_mount_point_inaccessible'); - $str = '' . $title . ''; + $str = t3lib_iconWorks::getSpriteIcon('status-warning'); $classAttr = 'class="ver-wl-mp-inacessible" '; } else { @@ -800,8 +799,7 @@ if (!$isAdmin && !in_array($mp['uid'], $userMPs)) { // Show warning icon $title = $GLOBALS['LANG']->getLL('workspace_list_mount_point_inaccessible'); - $str = '' . $title . ''; + $str = t3lib_iconWorks::getSpriteIcon('status-warning'); $classAttr = 'class="ver-wl-mp-inacessible" '; } else { @@ -982,9 +980,9 @@ // User can modify workspace parameters, display corresponding link and icon $editUrl = 'workspaceforms.php?action=edit&wkspId=' . $wksp['uid']; - $content .= '' . - '' . $LANG->getLL('workspace_list_icon_title_edit_workspace') . '' . - ''; + $content .= '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''; } else { // User can NOT modify workspace parameters, display space // Get only withdth and height from skinning API @@ -997,8 +995,8 @@ // Workspace switching button $content .= '' . - '' . $LANG->getLL('workspace_list_icon_title_switch_workspace') . '' . + '?changeWorkspace=' . $wksp['uid'] . '" title="'. $LANG->getLL('workspace_list_icon_title_switch_workspace') . '"/>' . + t3lib_iconWorks::getSpriteIcon('actions-version-swap-workspace') . ''; } else { // Current workspace: empty space instead of workspace switching button Index: typo3/mod/user/ws/class.wslib_gui.php =================================================================== --- typo3/mod/user/ws/class.wslib_gui.php (Revision 7665) +++ typo3/mod/user/ws/class.wslib_gui.php (Arbeitskopie) @@ -873,8 +873,8 @@ ''. - 'doc->backPath,'gfx/insert1.gif','width="14" height="14"').' alt="" align="top" title="' . $LANG->getLL('img_title_publish') . '" />'. + )).' " title="' . $LANG->getLL('img_title_publish') . '">'. + t3lib_iconWorks::getSpriteIcon('apps-version-swap-versions') . ''; if ($GLOBALS['BE_USER']->workspaceSwapAccess()) { $actionLinks.= @@ -882,8 +882,8 @@ '&cmd['.$table.']['.$rec_on['uid'].'][version][action]=swap'. '&cmd['.$table.']['.$rec_on['uid'].'][version][swapWith]='.$rec_off['uid']. '&cmd['.$table.']['.$rec_on['uid'].'][version][swapIntoWS]=1' - )).'">'. - 'doc->backPath,'gfx/swap.png','width="14" height="14"').' alt="" align="top" title="' . $LANG->getLL('img_title_swap') . '" />'. + )).'" title="' . $LANG->getLL('img_title_swap') . '">'. + t3lib_iconWorks::getSpriteIcon('apps-version-swap-workspace') . ''; } } @@ -893,8 +893,8 @@ // Release $confirm = $LANG->JScharCode($LANG->getLL('remove_from_ws_confirmation')); $actionLinks.= - ''. - 'doc->backPath,'gfx/group_clear.gif','width="14" height="14"').' alt="" align="top" title="' . $LANG->getLL('img_title_remove_from_ws') . '" />'. + ''. + t3lib_iconWorks::getSpriteIcon('apps-version-document-remove') . ''; } @@ -902,22 +902,22 @@ if ($table==='pages' && $vType!=='element') { $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']); $actionLinks.= - ''. - 'doc->backPath,t3lib_extMgm::extRelPath('cms').'layout/layout.gif','width="14" height="12"').' title="' . $LANG->getLL('img_title_edit_page') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . ''; } else { $params = '&edit['.$table.']['.$rec_off['uid'].']=edit'; $actionLinks.= - ''. - 'doc->backPath,'gfx/edit2.gif','width="12" height="12"').' title="' . $LANG->getLL('img_title_edit_element') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } } // History/Log $actionLinks.= - ''. - 'doc->backPath,'gfx/history2.gif','width="13" height="12"').' title="' . $LANG->getLL('img_title_show_log') . '" alt="" />'. + '' . + t3lib_iconWorks::skinImg('actions-document-history-open') . ''; // View @@ -925,7 +925,7 @@ $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']); $actionLinks.= ''. - 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } @@ -1183,22 +1183,22 @@ // Edit if ($table==='pages') { $actionLinks.= - ''. - 'doc->backPath,t3lib_extMgm::extRelPath('cms').'layout/layout.gif','width="14" height="12"').' title="' . $LANG->getLL('img_title_edit_page') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . ''; } else { $params = '&edit['.$table.']['.$uid.']=edit'; $actionLinks.= - ''. - 'doc->backPath,'gfx/edit2.gif','width="12" height="12"').' title="' . $LANG->getLL('img_title_edit_element') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } } // History/Log $actionLinks.= - ''. - 'doc->backPath,'gfx/history2.gif','width="13" height="12"').' title="' . $LANG->getLL('img_title_show_log') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . ''; } @@ -1206,7 +1206,7 @@ if ($table==='pages') { $actionLinks.= ''. - 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } @@ -1269,8 +1269,8 @@ ' return false;'; // Reject: $actionLinks.= - ''. - 'doc->backPath,'gfx/down.gif','width="14" height="14"').' alt="" align="top" title="'.$LANG->getLL('label_reject').'" />'. + ' '. + t3lib_iconWorks::getSpriteIcon('actions-move-down') . ''; } else { // Reject: @@ -1291,8 +1291,8 @@ ' return false;'; if ($rec_off['t3ver_stage']!=10) { $actionLinks.= - ''. - 'doc->backPath,'gfx/up.gif','width="14" height="14"').' alt="" align="top" title="'.htmlspecialchars($titleAttrib).'" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-move-up') . ''; $this->stageIndex[$sId][$table][] = $rec_off['uid']; Index: typo3/db_new.php =================================================================== --- typo3/db_new.php (Revision 7665) +++ typo3/db_new.php (Arbeitskopie) @@ -302,8 +302,8 @@ if (!$this->pagesOnly) { // Regular new element: // New page if ($this->showNewRecLink('pages')) { - $buttons['new_page'] = '' . - 'doc->backPath, 'gfx/new_page.gif') . ' alt="" />' . + $buttons['new_page'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-page-new') . ''; } // CSH @@ -315,22 +315,22 @@ // Back if ($this->R_URI) { - $buttons['back'] = '' . - 'doc->backPath, 'gfx/goback.gif') . ' alt="" />' . + $buttons['back'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-go-back') . ''; } if (is_array($this->pageinfo) && $this->pageinfo['uid']) { // View - $buttons['view'] = '' . - 'backPath, 'gfx/zoom.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '" alt="" />' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // Record list if ($GLOBALS['BE_USER']->check('modules', 'web_list')) { $href = $this->backPath . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - 'backPath, 'gfx/list.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1) . '" alt="" />' . + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; } } @@ -381,7 +381,7 @@ $table = 'pages'; $v = $GLOBALS['TCA'][$table]; $pageIcon = t3lib_iconWorks::getIconImage($table, array(), $this->doc->backPath, ''); - $newPageIcon = 'doc->backPath, 'gfx/new_page.gif', 'width="13" height="12"') . ' alt="" />'; + $newPageIcon = t3lib_iconWorks::getSpriteIcon('actions-page-new'); $rowContent = $firstLevel . $newPageIcon . ' ' . $GLOBALS['LANG']->getLL('createNewPage') . ''; // New pages INSIDE this pages @@ -441,7 +441,7 @@ // New tables (but not pages) INSIDE this pages $isAdmin = $GLOBALS['BE_USER']->isAdmin(); - $newContentIcon = 'doc->backPath, 'gfx/new_record.gif', 'width="16" height="12"') . ' alt="" />'; + $newContentIcon = t3lib_iconWorks::getSpriteIcon('actions-document-new'); if ($this->newContentInto) { if (is_array($GLOBALS['TCA'])) { $groupName = ''; Index: typo3/alt_file_navframe.php =================================================================== --- typo3/alt_file_navframe.php (Revision 7665) +++ typo3/alt_file_navframe.php (Arbeitskopie) @@ -274,7 +274,8 @@ // Refresh $buttons['refresh'] = '' . - ''; + t3lib_iconWorks::getSpriteIcon('actions-system-refresh') . + ''; // CSH $buttons['csh'] = str_replace('typo3-csh-inline','typo3-csh-inline show-right',t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'filetree', $GLOBALS['BACK_PATH'])); Index: typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php =================================================================== --- typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php (Revision 7665) +++ typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php (Arbeitskopie) @@ -118,8 +118,8 @@ $editIdList = substr($k,4); $params = '&edit[pages]['.$editIdList.']=edit&columnsOnly=TSconfig'; $onclickUrl = t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'],''); - $editIcon = ''. - ''. + $editIcon = ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } @@ -140,9 +140,9 @@ if (count($pUids)) { $params = '&edit[pages]['.implode(',',$pUids).']=edit&columnsOnly=TSconfig'; $onclickUrl = t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'],''); - $editIcon = ''. - ''. - ''.$GLOBALS['LANG']->getLL('editTSconfig_all',1).''. + $editIcon = ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''.$GLOBALS['LANG']->getLL('editTSconfig_all',1).''. ''; } else $editIcon = ''; Index: typo3/sysext/tsconfig_help/mod1/index.php =================================================================== --- typo3/sysext/tsconfig_help/mod1/index.php (Revision 7665) +++ typo3/sysext/tsconfig_help/mod1/index.php (Arbeitskopie) @@ -185,9 +185,9 @@ $content = '
'.$LANG->getLL('referenceExplanation').'
'; $content .= '

'.$LANG->getLL('referenceExplanationDetailed').'


'; $this->content .= $this->doc->section($LANG->getLL('displayReferences'),$content,0,1); - $this->content .= 'TSref reference TSREF
'; - $this->content .= 'TSref reference USER TSCONFIG
'; - $this->content .= 'TSref reference PAGE TSCONFIG
'; + $this->content .= ''.t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open').'TSREF
'; + $this->content .= ''.t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open').'USER TSCONFIG
'; + $this->content .= ''.t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open').'PAGE TSCONFIG
'; break; case 2: Index: typo3/sysext/beuser/mod/index.php =================================================================== --- typo3/sysext/beuser/mod/index.php (Revision 7665) +++ typo3/sysext/beuser/mod/index.php (Arbeitskopie) @@ -315,7 +315,7 @@ '.$be_group_Array[$row['perms_groupid']]['title'].'   '.$this->ext_printPerms($row['perms_group']).'   '.$this->ext_printPerms($row['perms_everybody']).'   - ' . ($row['editlock'] ? 'backPath,'gfx/recordlock_warning2.gif') . ' title="' . $GLOBALS['LANG']->getLL('editLock', true) . '" alt="" />' : $this->ext_printPerms($this->BE_USER->calcPerms($row))) . '   + ' . ($row['editlock'] ? t3lib_iconWorks::getSpriteIcon('status-warning-lock', array('title' => $GLOBALS['LANG']->getLL('editLock', true))) : $this->ext_printPerms($this->BE_USER->calcPerms($row))) . '   '.$this->ext_printPerms($this->ext_groupPerms($row,$be_group_Array[$this->BE_USER->firstMainGroup])).'   '; } @@ -649,7 +649,7 @@ $tables = explode(',',$v); foreach ($tables as &$vv) { if ($vv) { - $vv = ''.t3lib_iconWorks::getIconImage($vv,array(),$GLOBALS['BACK_PATH'],'align="top"').$GLOBALS['LANG']->sL($GLOBALS['TCA'][$vv]['ctrl']['title']).''; + $vv = ''.t3lib_iconWorks::getSpriteIconForRecord($vv,array()).$GLOBALS['LANG']->sL($GLOBALS['TCA'][$vv]['ctrl']['title']).''; } } $out[$k] = implode('
',$tables); @@ -664,7 +664,7 @@ if ($thisTable!=$table) { $table=$thisTable; t3lib_div::loadTCA($table); - $pout[]=''.t3lib_iconWorks::getIconImage($table,array(),$GLOBALS['BACK_PATH'],'align="top"').$GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title']).''; + $pout[]=''.t3lib_iconWorks::getSpriteIconForRecord($table,array()).$GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title']).''; } if ($GLOBALS['TCA'][$table]['columns'][$field]) { $pout[]=' - '.rtrim($GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['columns'][$field]['label']), ':').''; @@ -681,7 +681,7 @@ foreach ($uGroups as $vv) { if ($vv) { $uGRow = t3lib_BEfunc::getRecord('be_groups',$vv); - $pout[]=''.t3lib_iconWorks::getIconImage('be_groups',$uGRow,$GLOBALS['BACK_PATH'],'align="top"').' '.htmlspecialchars($uGRow['title']).'  '.$GLOBALS['SOBE']->elementLinks('be_groups',$uGRow).''; + $pout[]=''.t3lib_iconWorks::getSpriteIconForRecord('be_groups',$uGRow).' '.htmlspecialchars($uGRow['title']).'  '.$GLOBALS['SOBE']->elementLinks('be_groups',$uGRow).''; } } $out[$k] = ''.implode('',$pout).'
'; @@ -731,8 +731,8 @@ // Icons: $icons = array( - 'ALLOW' => '', - 'DENY' => '', + 'ALLOW' => t3lib_iconWorks::getSpriteIcon('status-dialog-ok'), + 'DENY' => t3lib_iconWorks::getSpriteIcon('status-dialog-error'), ); // Traverse types: @@ -860,7 +860,7 @@ while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { $dat[] = array( 'row'=>$row, - 'HTML'=>t3lib_iconWorks::getIconImage('pages',$row,$GLOBALS['BACK_PATH'],'align="top" title="['.$row['uid'].']"') // .htmlspecialchars($row['title']) + 'HTML'=>t3lib_iconWorks::getSpriteIconForRecord('pages',$row,array('title'=>'['.$row['uid'].']')) ); } $pp = t3lib_div::makeInstance('printAllPageTree_perms', $this); @@ -1295,7 +1295,7 @@ $email = htmlspecialchars($tempBE_USER->user['email']); $realname = htmlspecialchars($tempBE_USER->user['realName']); - $outTable = ''; + $outTable = '
'.t3lib_iconWorks::getIconImage('be_users',$tempBE_USER->user,$GLOBALS['BACK_PATH'],'class="absmiddle" title="'.$tempBE_USER->user['uid'].'"').htmlspecialchars($tempBE_USER->user['username']).'
'; $outTable.= ''; $outTable.= '
'.t3lib_iconWorks::getSpriteIconForRecord('be_users',$tempBE_USER->user,array('title'=>$tempBE_USER->user['uid'])).htmlspecialchars($tempBE_USER->user['username']).''.($realname?$realname.', ':'').($email ? ''.$email.'' : '').''.$this->elementLinks('be_users',$tempBE_USER->user).'
'; $outTable.= '' . $GLOBALS['LANG']->getLL('backToOverview', true) . '
'; @@ -1375,8 +1375,8 @@ // Header: $allCells = array(); - $link_createNewUser=''. - 'doc->backPath,'gfx/new_el.gif') . ' title="' . $GLOBALS['LANG']->getLL('newUser', true) . '" alt="" />'. + $link_createNewUser=''. + t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; $allCells['USERS'] = '
' . $GLOBALS['LANG']->getLL('usernames', TRUE) . '' . $link_createNewUser . '
'; @@ -1395,12 +1395,16 @@ $uListArr=array(); foreach ($dat['users'] as $uDat) { - $uItem = '' . t3lib_iconWorks::getIconImage('be_users',$uDat,$GLOBALS['BACK_PATH'],'align="top" title="' . $uDat['uid'] . '"') . $this->linkUser($uDat['username'],$uDat) . '  ' . $this->elementLinks('be_users',$uDat); + $uItem = '' . t3lib_iconWorks::getSpriteIconForRecord('be_users',$uDat,array('title'=> $uDat['uid'] )) . $this->linkUser($uDat['username'],$uDat) . '  ' . $this->elementLinks('be_users',$uDat); if ($curUid != $uDat['uid'] && !$uDat['disable'] && ($uDat['starttime'] == 0 || $uDat['starttime'] < $GLOBALS['EXEC_TIME']) && ($uDat['endtime'] == 0 || $uDat['endtime'] > $GLOBALS['EXEC_TIME'])) { - $uItem .= ''. - ''; + $uItem .= '' . + t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-switch') . + ''. + '' . + t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-emulate') . + ''; } $uItem .= ''; $uListArr[] = $uItem; @@ -1454,25 +1458,35 @@ */ function elementLinks($table,$row) { // Info: - $cells[]=''; + $cells[]='' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . + ''; // Edit: $params='&edit[' . $table . '][' . $row['uid'] . ']=edit'; - $cells[]=''; + $cells[]='' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''; // Hide: $hiddenField = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']; if ($row[$hiddenField]) { $params='&data[' . $table . '][' . $row['uid'] . '][' . $hiddenField . ']=0'; - $cells[]=''; + $cells[]='' . + t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') . + ''; } else { $params='&data[' . $table . '][' . $row['uid'] . '][' . $hiddenField . ']=1'; - $cells[]=''; + $cells[]='' . + t3lib_iconWorks::getSpriteIcon('actions-edit-hide') . + ''; } // Delete $params='&cmd[' . $table . '][' . $row['uid'] . '][delete]=1'; - $cells[]=''; + $cells[]='' . + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . + ''; return implode('',$cells); } @@ -1578,7 +1592,7 @@ ''.$ip.'' . '' . '' . - t3lib_iconWorks::getIconImage('be_users',$session,$GLOBALS['BACK_PATH'],'align="top" title="'.$session['uid'].'"').htmlspecialchars($session['username']).' ' . + t3lib_iconWorks::getSpriteIconForRecord('be_users',$session,array('title'=>$session['uid'])).htmlspecialchars($session['username']).' ' . '' . ''.htmlspecialchars($session['realName']).'  ' . ''.$this->elementLinks('be_users',$session).'' . Index: typo3/sysext/beuser/class.tx_beuser.php =================================================================== --- typo3/sysext/beuser/class.tx_beuser.php (Revision 7665) +++ typo3/sysext/beuser/class.tx_beuser.php (Arbeitskopie) @@ -78,7 +78,7 @@ $url = 'mod.php?M=tools_beuser&SwitchUser='.rawurlencode($uid).'&switchBackUser=1'; $localItems[] = $backRef->linkItem( 'Switch To User', - $backRef->excludeIcon(''), + $backRef->excludeIcon(t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-emulate')), $backRef->urlRefForCM($url,'',1,'top'), 1 ); Index: typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php =================================================================== --- typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php (Revision 7665) +++ typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php (Arbeitskopie) @@ -92,7 +92,7 @@ if ($existTemplate) { $theOutput.=$this->pObj->doc->divider(5); $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('currentTemplate', true) , - ' ' . + t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow) . '' . $this->pObj->linkWrapTemplateTitle($tplRow["title"]) . '' . htmlspecialchars(trim($tplRow["sitetitle"]) ? ' - (' . $tplRow["sitetitle"] . ')' : '')); } Index: typo3/sysext/reports/reports/class.tx_reports_reports_status.php =================================================================== --- typo3/sysext/reports/reports/class.tx_reports_reports_status.php (Revision 7665) +++ typo3/sysext/reports/reports/class.tx_reports_reports_status.php (Arbeitskopie) @@ -126,8 +126,8 @@ tx_reports_reports_status_Status::ERROR => 'error', ); - $icon[tx_reports_reports_status_Status::WARNING] = 'doc->backPath, 'gfx/warning.png', 'width="16" height="16"') . ' alt="" />'; - $icon[tx_reports_reports_status_Status::ERROR] = 'doc->backPath, 'gfx/error.png', 'width="16" height="16"') . ' alt="" />'; + $icon[tx_reports_reports_status_Status::WARNING] = t3lib_iconWorks::getSpriteIcon('status-warning'); + $icon[tx_reports_reports_status_Status::ERROR] = t3lib_iconWorks::getSpriteIcon('status-dialog-error'); $messages = ''; $headerIcon = ''; $sectionSeverity = 0; Index: typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php =================================================================== --- typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php (Revision 7665) +++ typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php (Arbeitskopie) @@ -118,7 +118,7 @@ $tree->addField('l18n_cfg'); // Creating top icon; the current page - $HTML = t3lib_iconWorks::getIconImage('pages', $treeStartingRecord, $GLOBALS['BACK_PATH'],'align="top"'); + $HTML = t3lib_iconWorks::getSpriteIconForRecord('pages', $treeStartingRecord); $tree->tree[] = array( 'row' => $treeStartingRecord, 'HTML'=>$HTML @@ -185,8 +185,8 @@ // DEFAULT language: // "View page" link is created: $viewPageLink= ''. - ''. + htmlspecialchars(t3lib_BEfunc::viewOnClick($data['row']['uid'],$GLOBALS['BACK_PATH'],'','','','&L=###LANG_UID###')).'" title="' . $LANG->getLL('lang_renderl10n_viewPage', TRUE) . '">' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; $status = $data['row']['l18n_cfg']&1 ? 'c-blocked' : 'c-ok'; @@ -194,11 +194,11 @@ $info = ''; $editUid = $data['row']['uid']; $params = '&edit[pages]['.$editUid.']=edit'; - $info.= ''. - ''. + $info.= ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; - $info.= ''. - ''. + $info.= '' . + t3lib_iconWorks::getSpriteIcon('actions-page-open') . ''; $info.= str_replace('###LANG_UID###','0',$viewPageLink); @@ -222,11 +222,10 @@ if (is_array($row)) { $langRecUids[$langRow['uid']][] = $row['uid']; $status = $row['_HIDDEN'] ? (t3lib_div::hideIfNotTranslated($data['row']['l18n_cfg']) || $data['row']['l18n_cfg']&1 ? 'c-blocked' : 'c-fallback') : 'c-ok'; - $icon = t3lib_iconWorks::getIconImage( + $icon = t3lib_iconWorks::getSpriteIconForRecord( 'pages_language_overlay', $row, - $GLOBALS['BACK_PATH'], - 'align="top" class="c-recIcon"' + array('class' => 'c-recIcon') ); $info = $icon. @@ -241,12 +240,12 @@ $info = ''; $editUid = $row['uid']; $params = '&edit[pages_language_overlay]['.$editUid.']=edit'; - $info.= ''. - ''. + $info.= '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; - $info.= ''. - ''. + $info.= '' . + t3lib_iconWorks::getSpriteIcon('actions-page-open') . ''; $info.= str_replace('###LANG_UID###',$langRow['uid'],$viewPageLink); @@ -285,9 +284,9 @@ if (is_array($langRecUids[0])) { $params = '&edit[pages]['.implode(',',$langRecUids[0]).']=edit&columnsOnly=title,nav_title,l18n_cfg,hidden'; - $editIco = ' - - '; + $editIco = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . + ''; } else $editIco = ''; $tCells[] = ''. $LANG->getLL('lang_renderl10n_default','1').':'. @@ -302,18 +301,18 @@ // Edit language overlay records: if (is_array($langRecUids[$langRow['uid']])) { $params = '&edit[pages_language_overlay]['.implode(',',$langRecUids[$langRow['uid']]).']=edit&columnsOnly=title,nav_title,hidden'; - $tCells[] = ' - - '; + $tCells[] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''; } else { $tCells[] = ' '; } // Create new overlay records: $params = "'".$newOL_js[$langRow['uid']]."+'&columnsOnly=title,hidden,sys_language_uid&defVals[pages_language_overlay][sys_language_uid]=".$langRow['uid']; - $tCells[] = ' - - '; + $tCells[] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . + ''; } } Index: typo3/sysext/cms/layout/class.tx_cms_layout.php =================================================================== --- typo3/sysext/cms/layout/class.tx_cms_layout.php (Revision 7665) +++ typo3/sysext/cms/layout/class.tx_cms_layout.php (Arbeitskopie) @@ -33,6 +33,7 @@ * * @author Kasper Skaarhoj */ + /** * [CLASS/FUNCTION INDEX of SCRIPT] * @@ -341,8 +342,8 @@ if ($editIdList && isset($TCA['pages']['columns'][$field]) && $field!='uid' && !$this->pages_noEditColumns) { $params='&edit[pages]['.$editIdList.']=edit&columnsOnly='.$field.'&disHelp=1'; $iTitle = sprintf($GLOBALS['LANG']->getLL('editThisColumn'),rtrim(trim($GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel('pages',$field))), ':')); - $eI= ''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.htmlspecialchars($iTitle).'" alt="" />'. + $eI= ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } else $eI=''; switch($field) { @@ -356,7 +357,7 @@ if (substr($field,0,6)=='table_') { $f2 = substr($field,6); if ($TCA[$f2]) { - $theData[$field] = ' '.t3lib_iconWorks::getIconImage($f2,array(),$this->backPath,'title="'.$GLOBALS['LANG']->sL($TCA[$f2]['ctrl']['title'],1).'"'); + $theData[$field] = ' '.t3lib_iconWorks::getSpriteIconForRecord($f2,array(),array('title'=>$GLOBALS['LANG']->sL($TCA[$f2]['ctrl']['title'],1))); } } elseif (substr($field,0,5)=='HITS_') { $fParts = explode(':',substr($field,5)); @@ -548,7 +549,7 @@ // "View page" icon is added: $viewLink = ''. - 'backPath,'gfx/zoom.gif','width="12" height="12"').' class="absmiddle" title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // Language overlay page header: @@ -557,10 +558,10 @@ list($lpRecord) = t3lib_BEfunc::getRecordsByField('pages_language_overlay','pid',$id,'AND sys_language_uid='.intval($lP)); t3lib_BEfunc::workspaceOL('pages_language_overlay',$lpRecord); $params='&edit[pages_language_overlay]['.$lpRecord['uid'].']=edit&overrideVals[pages_language_overlay][sys_language_uid]='.$lP; - $lPLabel = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getIconImage('pages_language_overlay',$lpRecord,$this->backPath,' class="absmiddle"'),'pages_language_overlay',$lpRecord['uid']). + $lPLabel = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon(t3lib_iconWorks::getSpriteIconForRecord('pages_language_overlay',$lpRecord)). $viewLink. - ($GLOBALS['BE_USER']->check('tables_modify','pages_language_overlay') ? ''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('edit',1).'" class="absmiddle" alt="" />'. + ($GLOBALS['BE_USER']->check('tables_modify','pages_language_overlay') ? '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . '' : ''). htmlspecialchars(t3lib_div::fixed_lgd_cs($lpRecord['title'],20)); } else { @@ -1188,8 +1189,8 @@ $theData = array(); $theData = $this->headerFields($this->fieldArray,$table,$theData); if ($this->doEdit) { - $theData['__cmds__'] = ''. - 'backPath,'gfx/new_el.gif').' title="'.$GLOBALS['LANG']->getLL('new',1).'" alt="" />'. + $theData['__cmds__'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; } $out.= $this->addelement(1,'',$theData,' class="c-headLine"',15); @@ -1211,9 +1212,9 @@ $Nrow['__cmds__']= $this->getIcon($table,$row); } if ($this->doEdit) { - $Nrow['__cmds__'].= ''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('edit',1).'" alt="" />'. - ''; + $Nrow['__cmds__'].= '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''; } else { $Nrow['__cmds__'].= $this->noEditIcon(); } @@ -1402,8 +1403,8 @@ case 'uid': if ($GLOBALS['BE_USER']->doesUserHaveAccess($row,2)) { $params='&edit[pages]['.$row['uid'].']=edit'; - $eI= ''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('editThisPage',1).'" alt="" />'. + $eI= '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } else $eI=''; $theData[$field] = ''.$row['uid'].$eI.''; @@ -1504,14 +1505,14 @@ // Edit whole of column: if ($editParams) { - $out.=''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('editColumn',1).'" alt="" />'. - ''; + $out.='' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''; } // New record: if ($newParams) { - $out.=''. - 'backPath,'gfx/new_record.gif','width="16" height="12"').' title="'.$GLOBALS['LANG']->getLL('newInColumn',1).'" alt="" />'. + $out.='' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; } // End cell: @@ -1547,9 +1548,9 @@ // Get record locking status: if ($lockInfo=t3lib_BEfunc::isRecordLocked('tt_content',$row['uid'])) { - $lockIcon=''. - 'backPath,'gfx/recordlock_warning3.gif','width="17" height="12"').' title="'.htmlspecialchars($lockInfo['msg']).'" alt="" />'. - ''; + $lockIcon=''. + t3lib_iconWorks::getSpriteIcon('status-warning-in-use') . + ''; } else $lockIcon=''; // Call stats information hook @@ -1590,8 +1591,8 @@ // Edit content element: $params='&edit[tt_content]['.$this->tt_contentData['nextThree'][$row['uid']].']=edit'; - $out.=''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.htmlspecialchars($this->nextThree>1?sprintf($GLOBALS['LANG']->getLL('nextThree'),$this->nextThree):$GLOBALS['LANG']->getLL('edit')).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; if (!$disableMoveAndNewButtons) { @@ -1602,27 +1603,27 @@ $params='&edit[tt_content]['.(-$row['uid']).']=new'; $onClick = t3lib_BEfunc::editOnClick($params,$this->backPath); } - $out.=''. - 'backPath,'gfx/new_record.gif','width="16" height="12"').' title="'.$GLOBALS['LANG']->getLL('newAfter',1).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; // Move element up: if ($this->tt_contentData['prev'][$row['uid']]) { $params='&cmd[tt_content]['.$row['uid'].'][move]='.$this->tt_contentData['prev'][$row['uid']]; - $out.=''. - 'backPath,'gfx/button_up.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->getLL('moveUp',1).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-move-up') . ''; } else { - $out.='backPath,'gfx/button_up.gif','width="11" height="10"',2).' alt="" />'; + $out.=t3lib_iconWorks::getSpriteIcon('empty-empty'); } // Move element down: if ($this->tt_contentData['next'][$row['uid']]) { $params='&cmd[tt_content]['.$row['uid'].'][move]='.$this->tt_contentData['next'][$row['uid']]; - $out.=''. - 'backPath,'gfx/button_down.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->getLL('moveDown',1).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-move-down') . ''; } else { - $out.='backPath,'gfx/button_down.gif','width="11" height="10"',2).' alt="" />'; + $out.= t3lib_iconWorks::getSpriteIcon('empty-empty'); } } @@ -1631,13 +1632,13 @@ if ($hiddenField && $TCA['tt_content']['columns'][$hiddenField] && (!$TCA['tt_content']['columns'][$hiddenField]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields','tt_content:'.$hiddenField))) { if ($row[$hiddenField]) { $params='&data[tt_content]['.($row['_ORIG_uid'] ? $row['_ORIG_uid'] : $row['uid']).']['.$hiddenField.']=0'; - $out.=''. - 'backPath,'gfx/button_unhide.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->getLL('unHide',1).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') . ''; } else { $params='&data[tt_content]['.($row['_ORIG_uid'] ? $row['_ORIG_uid'] : $row['uid']).']['.$hiddenField.']=1'; - $out.=''. - 'backPath,'gfx/button_hide.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->getLL('hide',1).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-edit-hide') . ''; } } @@ -1646,8 +1647,8 @@ $params='&cmd[tt_content]['.$row['uid'].'][delete]=1'; $confirm = $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('deleteWarning') . t3lib_BEfunc::translationCount('tt_content', $row['uid'], ' ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.translationsOfRecord'))); - $out.=''. - 'backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('deleteItem',1).'" alt="" />'. + $out.=''. + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; // End cell: @@ -1937,8 +1938,7 @@ */ function infoGif($infoArr) { if (count($infoArr) && $this->tt_contentConfig['showInfo']) { - $out='backPath,'gfx/zoom2.gif','width="12" height="12"').' title="'.htmlspecialchars(implode(LF,$infoArr)).'" alt="" /> '; - return $out; + return t3lib_iconWorks::getSpriteIcon('actions-document-view', array('title' => htmlspecialchars(implode(LF, $infoArr)))); } } @@ -2264,7 +2264,7 @@ // Initialization $alttext = t3lib_BEfunc::getRecordIconAltText($row,$table); - $iconImg = t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.$alttext.'"'); + $iconImg = t3lib_iconWorks::getSpriteIconForRecord($table,$row,array('title'=>$alttext)); $this->counter++; // The icon with link @@ -2339,7 +2339,7 @@ * @return string IMG tag for icon. */ function noEditIcon($label='noEditItems') { - return 'backPath,'gfx/edit2_d.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL($label,1).'" alt="" />'; + return t3lib_iconWorks::getSpriteIcon('status-edit-deny', array('title' => $GLOBALS['LANG']->getLL($label, TRUE))); } /** @@ -2456,15 +2456,15 @@ // If editing of the page properties is allowed: if ($edit) { $params='&edit[pages]['.$rec['uid'].']=edit'; - $editIcon=''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('edit',1).'" alt="" />'. + $editIcon='' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } else { $editIcon=$this->noEditIcon('noEditPage'); } // Setting page icon, link, title: - $outPutContent = t3lib_iconWorks::getIconImage('pages',$rec,$this->backPath,'title="'.htmlspecialchars(t3lib_BEfunc::titleAttribForPages($rec)).'"'). + $outPutContent = t3lib_iconWorks::getSpriteIconForRecord('pages',$rec,array('title'=>t3lib_BEfunc::titleAttribForPages($rec))). $editIcon. ' '. htmlspecialchars($rec['title']); @@ -2660,12 +2660,12 @@ // Add row to menu: $out.=' '. - t3lib_iconWorks::getIconImage($tName,Array(),$this->backPath,'title="'.$GLOBALS['LANG']->sL($TCA[$tName]['ctrl']['title'],1).'"'). + t3lib_iconWorks::getSpriteIconForRecord($tName,Array(),array('title'=>$GLOBALS['LANG']->sL($TCA[$tName]['ctrl']['title'],1))). ''; // ... and to the internal array, activeTables we also add table icon and title (for use elsewhere) $this->activeTables[$tName]= - t3lib_iconWorks::getIconImage($tName,Array(),$this->backPath,'title="'.$GLOBALS['LANG']->sL($TCA[$tName]['ctrl']['title'],1).': '.$c.' '.$GLOBALS['LANG']->getLL('records',1).'" class="absmiddle"'). + t3lib_iconWorks::getSpriteIconForRecord($tName,Array(),array('title'=>$GLOBALS['LANG']->sL($TCA[$tName]['ctrl']['title'],1).': '.$c.' '.$GLOBALS['LANG']->getLL('records',1))). ' '. $GLOBALS['LANG']->sL($TCA[$tName]['ctrl']['title'],1); } Index: typo3/sysext/cms/layout/db_layout.php =================================================================== --- typo3/sysext/cms/layout/db_layout.php (Revision 7665) +++ typo3/sysext/cms/layout/db_layout.php (Arbeitskopie) @@ -548,7 +548,7 @@ if ($this->pageinfo['content_from_pid']) { - $contentPage = t3lib_BEfunc::getRecord('pages', intval($this->pageinfo['content_from_pid'])); + //$contentPage = t3lib_BEfunc::getRecord('pages', intval($this->pageinfo['content_from_pid'])); $title = t3lib_BEfunc::getRecordTitle('pages', $contentPage); $linkToPid = $this->local_linkThisScript(array('id' => $this->pageinfo['content_from_pid'])); $link = '' . htmlspecialchars($title) . ' (PID ' . intval($this->pageinfo['content_from_pid']) . ')'; @@ -1180,8 +1180,8 @@ ); // View page - $buttons['view'] = '' . - '' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // Shortcut @@ -1191,49 +1191,49 @@ // Cache if (!$this->modTSconfig['properties']['disableAdvanced']) { - $buttons['cache'] = '' . - '' . - ''; + $buttons['cache'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-cache-clear') . + ''; } // If access to Web>List for user, then link to that module. if ($BE_USER->check('modules','web_list')) { $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - '' . - ''; + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . + ''; } if (!$this->modTSconfig['properties']['disableIconToolbar']) { // Page history - $buttons['history_page'] = '' . - '' . - ''; + $buttons['history_page'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . + ''; // New content element - $buttons['new_content'] = '' . - '' . - ''; + $buttons['new_content'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . + ''; // Move page - $buttons['move_page'] = '' . - '' . - ''; + $buttons['move_page'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-move-move') . + ''; // Move record if (t3lib_div::testInt($this->eRParts[1])) { $buttons['move_record'] = '' . - 'eRParts[0] == 'tt_content' ? 'record' : 'page') . '.gif', 'width="11" height="12"') . ' class="c-inputButton" title="' . $LANG->getLL('move_' . ($this->eRParts[0] == 'tt_content' ? 'record' : 'page'), 1) . '" alt="" />' . + t3lib_iconWorks::getSpriteIcon('actions-' . ($this->eRParts[0] == 'tt_content' ? 'document' : 'page') . '-move',array('class'=>'c-inputButton','title' => $LANG->getLL('move_' . ($this->eRParts[0] == 'tt_content' ? 'record' : 'page'), 1))) . ''; } // Create new page (wizard) - $buttons['new_page'] = '' . - '' . - ''; + $buttons['new_page'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-page-new') . + ''; // Edit page properties if ($this->CALC_PERMS&2) { $params='&edit[pages][' . $this->id . ']=edit'; - $buttons['edit_page'] = '' . - '' . - ''; + $buttons['edit_page'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + ''; } // Add CSH (Context Sensitive Help) icon to tool bar @@ -1248,35 +1248,33 @@ $buttons['savedok'] = ''; // Save record and show page - $buttons['savedokshow'] = '' . - '' . + $buttons['savedokshow'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-save-view') . ''; // Close record - $buttons['closedok'] = '' . - '' . + $buttons['closedok'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-close') . ''; // Delete record if($this->deleteButton) { - $buttons['deletedok'] = '' . - '' . + $buttons['deletedok'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-delete') . ''; } if($this->undoButton) { // Undo button - $buttons['undo'] = '' . - '' . + $buttons['undo'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-undo') . ''; // History button - $buttons['history_record'] = '' . - '' . + $buttons['history_record'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . ''; } } Index: typo3/sysext/cms/layout/db_new_content_el.php =================================================================== --- typo3/sysext/cms/layout/db_new_content_el.php (Revision 7665) +++ typo3/sysext/cms/layout/db_new_content_el.php (Arbeitskopie) @@ -430,8 +430,8 @@ // Back if ($this->R_URI) { - $buttons['back'] = '' . - 'doc->backPath, 'gfx/goback.gif') . ' alt="" title="' . $LANG->getLL('goBack', 1) . '" />' . + $buttons['back'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-go-back') . ''; } } Index: typo3/sysext/tstemplate/ts/index.php =================================================================== --- typo3/sysext/tstemplate/ts/index.php (Revision 7665) +++ typo3/sysext/tstemplate/ts/index.php (Arbeitskopie) @@ -248,15 +248,15 @@ if ($this->id && $this->access) { // View page - $buttons['view'] = '' . - '' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // If access to Web>List for user, then link to that module. if ($GLOBALS['BE_USER']->check('modules', 'web_list')) { $href = $GLOBALS['BACK_PATH'] . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - '' . + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; } @@ -269,24 +269,24 @@ $buttons['new'] = ''; // SAVE button - $buttons['save'] = ''; + $buttons['save'] = t3lib_iconWorks::getSpriteIcon('actions-document-save',array('html'=>'')); // SAVE AND CLOSE button - $buttons['save_close'] = ''; + $buttons['save_close'] = t3lib_iconWorks::getSpriteIcon('actions-document-save-close',array('html'=>'')); // CLOSE button - $buttons['close'] = ''; + $buttons['close'] = t3lib_iconWorks::getSpriteIcon('actions-document-close',array('html'=>'')); } } elseif($this->extClassConf['name'] == 'tx_tstemplateceditor' && count($this->MOD_MENU['constant_editor_cat'])) { // SAVE button - $buttons['save'] = ''; + $buttons['save'] = t3lib_iconWorks::getSpriteIcon('actions-document-save',array('html'=>'')); } elseif($this->extClassConf['name'] == 'tx_tstemplateobjbrowser') { if(!empty($this->sObj)) { // BACK - $buttons['back'] = '' . - '' . - ''; + $buttons['back'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-go-back') . + ''; } } @@ -377,13 +377,15 @@ $theOutput .= $this->doc->spacer(10); $theOutput .= $this->doc->section($GLOBALS['LANG']->getLL('newWebsite') . $staticsText, $GLOBALS['LANG']->getLL('newWebsiteDescription') . '

' . - $selector . '
- - ', 0, 1); + $selector . '
' . + t3lib_iconWorks::getSpriteIcon('status-dialog-warning') . + '', 0, 1); } // Extension? $theOutput .= $this->doc->spacer(10); - $theOutput .= $this->doc->section($GLOBALS['LANG']->getLL('extTemplate'), $GLOBALS['LANG']->getLL('extTemplateDescription') . '

', 0, 1); + $theOutput .= $this->doc->section($GLOBALS['LANG']->getLL('extTemplate'), $GLOBALS['LANG']->getLL('extTemplateDescription') . '

' . + t3lib_iconWorks::getSpriteIcon('status-dialog-warning') . + '', 0, 1); // Go to first appearing... $first = $tmpl->ext_prevPageWithTemplate($this->id, $this->perms_clause); @@ -501,20 +503,18 @@ $lines[] = ' ' . '' . - t3lib_iconWorks::getIconImage('pages', t3lib_BEfunc::getRecordWSOL('pages', $k), $GLOBALS['BACK_PATH'], ' align="top" title="ID: ' . $k . '"') . + t3lib_iconWorks::getSpriteIconForRecord('pages', t3lib_BEfunc::getRecordWSOL('pages', $k), array("title"=>'ID: ' . $k )) . t3lib_div::fixed_lgd_cs($pArray[$k], 30) . ' ' . $pArray[$k . '_']['count'] . ' - ' . ($pArray[$k . '_']['root_max_val'] > 0 ? '' : " ") . + ' . ($pArray[$k . '_']['root_max_val'] > 0 ? t3lib_iconWorks::getSpriteIcon('status-status-checked') : " ") . ' - ' . ($pArray[$k . '_']['root_min_val'] == 0 ? '' : " ") . + ' . ($pArray[$k . '_']['root_min_val'] == 0 ? t3lib_iconWorks::getSpriteIcon('status-status-checked') : " ") . ' '; } else { $lines[] = ' ' . - t3lib_iconWorks::getIconImage('pages', t3lib_BEfunc::getRecordWSOL('pages', $k), $GLOBALS['BACK_PATH'], ' align="top"') . + t3lib_iconWorks::getSpriteIconForRecord('pages', t3lib_BEfunc::getRecordWSOL('pages', $k)) . t3lib_div::fixed_lgd_cs($pArray[$k], 30) . ' Index: typo3/sysext/version/cm1/index.php =================================================================== --- typo3/sysext/version/cm1/index.php (Revision 7665) +++ typo3/sysext/version/cm1/index.php (Arbeitskopie) @@ -335,8 +335,8 @@ if ($this->recordFound && $TCA[$this->table]['ctrl']['versioningWS']) { // View page - $buttons['view'] = '' . - '' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; // Shortcut @@ -347,8 +347,8 @@ // If access to Web>List for user, then link to that module. if ($BE_USER->check('modules','web_list')) { $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - '' . + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; } } @@ -460,8 +460,8 @@ $content.=' - '.($row['uid']!=$this->uid ? ''. - 'doc->backPath,'gfx/insert1.gif','width="14" height="14"').' alt="" title="' . $GLOBALS['LANG']->getLL('swapWithCurrent') . '" />'. + '.($row['uid']!=$this->uid ? ''. + t3lib_iconWorks::getSpriteIcon('apps-version-swap-versions') . '' /* ( $this->table == 'pages' ? ''. @@ -469,7 +469,7 @@ ''. ''. 'doc->backPath,'gfx/insert4.gif','width="14" height="14"').' alt="" title="Publish page AND content! - AND ALL SUBPAGES!" />'. - '' : '') */ : 'doc->backPath,'gfx/blinkarrow_left.gif','width="5" height="9"').' alt="" title="' . $GLOBALS['LANG']->getLL('currentOnlineVersion') . '"/>').' + '' : '') */ : t3lib_iconWorks::getSpriteIcon('status-status-current', array('title' => $GLOBALS['LANG']->getLL('currentOnlineVersion', TRUE)))) . ' '.$adminLinks.' '.t3lib_BEfunc::getRecordTitle($this->table,$row,TRUE).' '.$row['uid'].' @@ -480,7 +480,9 @@ '.$row['t3ver_stage'].' '.$row['t3ver_count'].' '.$row['pid'].' - doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.edit'). '"/>' . htmlspecialchars($row['t3ver_label']).' + ' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . + '' . htmlspecialchars($row['t3ver_label']) . ' '; @@ -611,13 +613,13 @@ global $BE_USER; // Edit link: - $adminLink = ''. - 'doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.edit'). '"/>'. + $adminLink = ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; // Delete link: - $adminLink.= ''. - 'doc->backPath,'gfx/garbage.gif','width="11" height="12"').' alt="" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.delete'). '"/>'. + $adminLink.= '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; @@ -633,15 +635,15 @@ $a_wp = t3lib_extMgm::isLoaded('cms') && $BE_USER->check('modules',$pageModule); $adminLink.=''. - 'doc->backPath,t3lib_extMgm::extRelPath('cms').'layout/layout.gif','width="14" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . ''; $adminLink.=''. - 'doc->backPath,'mod/web/list/list.gif','width="14" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . ''; // "View page" icon is added: $adminLink.=''. - 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } else { if ($row['pid']==-1) { @@ -649,7 +651,7 @@ // "View page" icon is added: $adminLink.=''. - 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } } @@ -806,7 +808,9 @@ $table = ''.implode('',$tableRows).'
'; } else $table = ''; - $linkBack = t3lib_div::_GP('returnUrl') ? 'doc->backPath, 'gfx/goback.gif', 'width="14" height="14"') . ' alt="" />' . $GLOBALS['LANG']->getLL('goBack') . '

' : ''; + $linkBack = t3lib_div::_GP('returnUrl') ? '' . + t3lib_iconWorks::getSpriteIcon('actions-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) . + '

' : ''; $resetDiffOnly = $this->diffOnly ? '' . $GLOBALS['LANG']->getLL('showAllInformation') . '

' : ''; $versionSelector = $GLOBALS['BE_USER']->workspace ? $this->doc->getVersionSelector($this->id) : ''; @@ -1628,8 +1632,8 @@ ' return false;'; // Reject: $actionLinks.= - ''. - 'doc->backPath,'gfx/down.gif','width="14" height="14"').' alt="" align="top" title="' . $GLOBALS['LANG']->getLL('reject') . '" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-move-down') . ''; } else { // Reject: @@ -1649,8 +1653,8 @@ ' return false;'; if ($rec_off['t3ver_stage']!=10) { $actionLinks.= - ''. - 'doc->backPath,'gfx/up.gif','width="14" height="14"').' alt="" align="top" title="'.htmlspecialchars($titleAttrib).'" />'. + '' . + t3lib_iconWorks::getSpriteIcon('actions-move-up') . ''; $this->stageIndex[$sId][$table][] = $rec_off['uid']; @@ -1675,8 +1679,8 @@ ''. - 'doc->backPath,'gfx/insert1.gif','width="14" height="14"').' alt="" align="top" title="' . $GLOBALS['LANG']->getLL('publish') . '" />'. + )).'" title="' . $GLOBALS['LANG']->getLL('publish', TRUE) . '">'. + t3lib_iconWorks::getSpriteIcon('apps-version-swap-versions') . ''; if ($GLOBALS['BE_USER']->workspaceSwapAccess()) { $actionLinks.= @@ -1684,8 +1688,8 @@ '&cmd['.$table.']['.$rec_on['uid'].'][version][action]=swap'. '&cmd['.$table.']['.$rec_on['uid'].'][version][swapWith]='.$rec_off['uid']. '&cmd['.$table.']['.$rec_on['uid'].'][version][swapIntoWS]=1' - )).'">'. - 'doc->backPath,'gfx/swap.png','width="14" height="14"').' alt="" align="top" title="' . $GLOBALS['LANG']->getLL('swap') . '" />'. + )).'" title="' . $GLOBALS['LANG']->getLL('swap', TRUE) . '">'. + t3lib_iconWorks::getSpriteIcon('apps-version-swap-workspace') . ''; } } @@ -1693,30 +1697,30 @@ if (!$GLOBALS['BE_USER']->workspaceCannotEditOfflineVersion($table,$rec_off)) { // Release $actionLinks.= - ''. - 'doc->backPath,'gfx/group_clear.gif','width="14" height="14"').' alt="" align="top" title="' . $GLOBALS['LANG']->getLL('removeFromWorkspace') . '" />'. + ''. + t3lib_iconWorks::getSpriteIcon('apps-version-document-remove') . ''; // Edit if ($table==='pages' && $vType!=='element') { $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']); $actionLinks.= - ''. - 'doc->backPath,t3lib_extMgm::extRelPath('cms').'layout/layout.gif','width="14" height="12"').' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:img_title_edit_page'). '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . ''; } else { $params = '&edit['.$table.']['.$rec_off['uid'].']=edit'; $actionLinks.= - ''. - 'doc->backPath,'gfx/edit2.gif','width="12" height="12"').' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:img_title_edit_element'). '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } } // History/Log $actionLinks.= - ''. - 'doc->backPath,'gfx/history2.gif','width="13" height="12"').' title="' . $GLOBALS['LANG']->getLL('showLog') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . ''; // View @@ -1724,7 +1728,7 @@ $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']); $actionLinks.= ''. - 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } @@ -1746,22 +1750,22 @@ // Edit if ($table==='pages') { $actionLinks.= - ''. - 'doc->backPath,t3lib_extMgm::extRelPath('cms').'layout/layout.gif','width="14" height="12"').' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:img_title_edit_page'). '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . ''; } else { $params = '&edit['.$table.']['.$uid.']=edit'; $actionLinks.= - ''. - 'doc->backPath,'gfx/edit2.gif','width="12" height="12"').' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:img_title_edit_element'). '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } } // History/Log $actionLinks.= - ''. - 'doc->backPath,'gfx/history2.gif','width="13" height="12"').' title="' . $GLOBALS['LANG']->getLL('showLog') . '" alt="" />'. + ''. + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . ''; } @@ -1769,7 +1773,7 @@ if ($table==='pages') { $actionLinks.= ''. - 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="" alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } Index: typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php =================================================================== --- typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php (Revision 7665) +++ typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php (Arbeitskopie) @@ -118,7 +118,7 @@ foreach ($menuItems as $rec) { $m_perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(2); // edit permissions for that page! $pRec = t3lib_BEfunc::getRecord ('pages',$rec['uid'],'uid',' AND '.$m_perms_clause); - $lines[]= ''.t3lib_iconWorks::getIconImage('pages',$rec,$GLOBALS['BACK_PATH'],'align="top" '.t3lib_BEfunc::titleAttribForPages($rec)). + $lines[]= ''.t3lib_iconWorks::getSpriteIconForRecord('pages',$rec). (!is_array($pRec)?$GLOBALS['TBE_TEMPLATE']->rfw(''.$LANG->getLL('wiz_W',1).' '):''). htmlspecialchars(t3lib_div::fixed_lgd_cs($rec['title'],$GLOBALS['BE_USER']->uc['titleLen'])).'  '.(t3lib_extMgm::isLoaded('cms')?''.htmlspecialchars(t3lib_div::fixed_lgd_cs($rec['subtitle'],$GLOBALS['BE_USER']->uc['titleLen'])).' ':'').' Index: typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php =================================================================== --- typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php (Revision 7665) +++ typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php (Arbeitskopie) @@ -146,7 +146,7 @@ // Resetting the menu (stop) $theOutput.=$this->pObj->doc->spacer(5); - $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('editConstants', true),' '.$this->pObj->linkWrapTemplateTitle($tplRow["title"],"constants").''.htmlspecialchars(trim($tplRow["sitetitle"])?' - ('.$tplRow["sitetitle"].')':''),0,1); + $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('editConstants', true),t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow).''.$this->pObj->linkWrapTemplateTitle($tplRow["title"],"constants").''.htmlspecialchars(trim($tplRow["sitetitle"])?' - ('.$tplRow["sitetitle"].')':''),0,1); if ($manyTemplatesMenu) { $theOutput.=$this->pObj->doc->section("",$manyTemplatesMenu); Index: typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php =================================================================== --- typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php (Revision 7665) +++ typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php (Arbeitskopie) @@ -64,7 +64,7 @@ */ function tableRow($label, $data, $field) { $ret = ''; - $ret.= ''; + $ret.= ''.t3lib_iconWorks::getSpriteIcon('actions-document-open',array("title"=> $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:editField', true))) . ''; $ret.= ''.$label.'  '.$data.' '; return $ret; } @@ -89,7 +89,7 @@ $functions.= ''; $fI = t3lib_div::split_fileref($v); if (t3lib_div::inList($this->pObj->textExtensions,$fI['fileext'])) { - $functions.= ''; + $functions.= ''.t3lib_iconWorks::getSpriteIcon('actions-document-open',array('title'=> $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:editFile', true))) . ''; } $functions.= ''; } @@ -339,7 +339,7 @@ } $theOutput.= $this->pObj->doc->spacer(5); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), ' '.htmlspecialchars($tplRow['title']).''.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow).''.htmlspecialchars($tplRow['title']).''.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1); if ($manyTemplatesMenu) { $theOutput.= $this->pObj->doc->section('', $manyTemplatesMenu); $theOutput.= $this->pObj->doc->divider(5); @@ -451,7 +451,7 @@ 'formName' => 'editForm', 'itemName' => 'data[config]', ); - $outCode.= ''; + $outCode.= ''.t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open', array('title'=> $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:tsRef', true))) . ''; } $outCode.= ''; @@ -500,9 +500,9 @@ // Edit all icon: $outCode.= '
' . $GLOBALS['LANG']->getLL('editTemplateRecord') . ''; + '&edit[sys_template][' . $tplRow['uid'] . ']=edit', $BACK_PATH, '') . '">' . + t3lib_iconWorks::getSpriteIcon('actions-document-open', array('title'=> + $GLOBALS['LANG']->getLL('editTemplateRecord') )) . $GLOBALS['LANG']->getLL('editTemplateRecord') . ''; $theOutput.= $this->pObj->doc->spacer(25); $theOutput.= $this->pObj->doc->section('', $outCode); Index: typo3/sysext/impexp/app/index.php =================================================================== --- typo3/sysext/impexp/app/index.php (Revision 7665) +++ typo3/sysext/impexp/app/index.php (Arbeitskopie) @@ -387,16 +387,16 @@ if (($this->id && is_array($this->pageinfo)) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) { if (is_array($this->pageinfo) && $this->pageinfo['uid']) { // View - $buttons['view'] = '' . - 'doc->backPath, 'gfx/zoom.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '" alt="" />' . - ''; + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . + ''; // Record list if ($GLOBALS['BE_USER']->check('modules', 'web_list')) { $href = $this->doc->backPath . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); - $buttons['record_list'] = '' . - 'doc->backPath, 'gfx/list.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1) . '" alt="" />' . - ''; + $buttons['record_list'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . + ''; } } } Index: typo3/sysext/impexp/class.tx_impexp_clickmenu.php =================================================================== --- typo3/sysext/impexp/class.tx_impexp_clickmenu.php (Revision 7665) +++ typo3/sysext/impexp/class.tx_impexp_clickmenu.php (Arbeitskopie) @@ -96,7 +96,7 @@ } $localItems[] = $backRef->linkItem( $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('export',$LL)), - $backRef->excludeIcon('backPath,t3lib_extMgm::extRelPath('impexp').'export.gif','width="18" height="16"').' alt="" />'), + $backRef->excludeIcon(t3lib_iconWorks::getSpriteIcon('actions-document-export')), $backRef->urlRefForCM($url), 1 // Disables the item in the top-bar ); @@ -105,7 +105,7 @@ $url = $modUrl . '?id='. $uid . '&table=' . $table . '&tx_impexp[action]=import'; $localItems[] = $backRef->linkItem( $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('import',$LL)), - $backRef->excludeIcon('backPath,t3lib_extMgm::extRelPath('impexp').'import.gif','width="18" height="16"').' alt="" />'), + $backRef->excludeIcon(t3lib_iconWorks::getSpriteIcon('actions-document-export')), $backRef->urlRefForCM($url), 1 // Disables the item in the top-bar ); Index: typo3/sysext/impexp/class.tx_impexp.php =================================================================== --- typo3/sysext/impexp/class.tx_impexp.php (Revision 7665) +++ typo3/sysext/impexp/class.tx_impexp.php (Arbeitskopie) @@ -2707,7 +2707,7 @@ $preCode_B = $preCode.'        '; foreach($record['softrefs'] as $info) { $pInfo = array(); - $pInfo['preCode'] = $preCode_A.''; + $pInfo['preCode'] = $preCode_A. t3lib_iconWorks::getSpriteIcon('status-reference-soft'); $pInfo['title'] = ''.$info['field'].', "'.$info['spKey'].'" : '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['matchString'],60)).''; if ($info['subst']['type']) { if (strlen($info['subst']['title'])) { @@ -2839,7 +2839,7 @@ return; } } - $pInfo['preCode'] = $preCode.'    '; + $pInfo['preCode'] = $preCode.'    '.t3lib_iconWorks::getSpriteIcon('status-reference-file'); $pInfo['title'] = htmlspecialchars($fI['filename']); $pInfo['ref'] = 'FILE'; $pInfo['size'] = $fI['filesize']; @@ -2898,7 +2898,7 @@ $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site)); - $pInfo['preCode'] = $preCode.'        '; + $pInfo['preCode'] = $preCode.'        '.t3lib_iconWorks::getSpriteIcon('actions-reference-file'); $pInfo['title'] = htmlspecialchars($fI['filename']).' (Original)'; $pInfo['ref'] = 'FILE'; $pInfo['size'] = $fI['filesize']; @@ -2922,7 +2922,7 @@ $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site)); - $pInfo['preCode'] = $preCode.'        '; + $pInfo['preCode'] = $preCode.'        '.t3lib_iconWorks::getSpriteIcon('actions-reference-file'); $pInfo['title'] = htmlspecialchars($fI['filename']).' (Resource)'; $pInfo['ref'] = 'FILE'; $pInfo['size'] = $fI['filesize']; Index: typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php =================================================================== --- typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php (Revision 7665) +++ typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php (Arbeitskopie) @@ -1008,9 +1008,9 @@ * @return string HTML img-tag with link around. */ function printRemoveIndexed($phash,$alt) { - return ''. - ''. - ''; + return '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . + ''; } /** Index: typo3/sysext/opendocs/class.tx_opendocs.php =================================================================== --- typo3/sysext/opendocs/class.tx_opendocs.php (Revision 7665) +++ typo3/sysext/opendocs/class.tx_opendocs.php (Arbeitskopie) @@ -171,7 +171,7 @@ $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.closeDoc', true); // open document - $closeIcon = ''; + $closeIcon = t3lib_iconWorks::getSpriteIcon('actions-document-close'); $entry = ' Index: typo3/sysext/scheduler/mod1/index.php =================================================================== --- typo3/sysext/scheduler/mod1/index.php (Revision 7665) +++ typo3/sysext/scheduler/mod1/index.php (Arbeitskopie) @@ -497,7 +497,7 @@ $table[$tr][] = $classInfo['extension']; $table[$tr][] = $classInfo['description']; $link = $GLOBALS['MCONF']['_'] . '&SET[function]=list&CMD=add&tx_scheduler[class]=' . $class; - $table[$tr][] = 'backPath, 'gfx/new_el.gif') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE) . '" />'; + $table[$tr][] = '' . t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; $tr++; } @@ -1000,7 +1000,7 @@ $tr = 0; // Header row - $table[$tr][] = 'backPath, 'gfx/clip_select.gif') . ' alt="' . htmlspecialchars($GLOBALS['LANG']->getLL('label.checkAll')) . '" />'; + $table[$tr][] = '' . t3lib_iconWorks::getSpriteIcon('actions-clip-select') . ''; $table[$tr][] = ' '; $table[$tr][] = $GLOBALS['LANG']->getLL('label.id'); $table[$tr][] = $GLOBALS['LANG']->getLL('task'); @@ -1014,9 +1014,9 @@ // Loop on all tasks while (($schedulerRecord = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) { // Define action icons - $editAction = 'backPath, 'gfx/edit2.gif') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:edit', TRUE) . '" /> '; - $deleteAction = 'backPath, 'gfx/garbage.gif') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:delete', TRUE) . '" />'; - $stopAction = 'backPath, t3lib_extMgm::extRelPath('scheduler') . 'res/gfx/stop.png') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:stop', TRUE) . '" />'; + $editAction = '' . t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; + $deleteAction = '' . t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; + $stopAction = 'backPath, t3lib_extMgm::extRelPath('scheduler') . '/res/gfx/stop.png') . ' alt="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:stop') . '" />'; // Define some default values $lastExecution = '-'; $isRunning = false; @@ -1541,9 +1541,9 @@ ); if (empty($this->CMD) || $this->CMD == 'list') { - $buttons['reload'] = '' . - 'backPath, 'gfx/refresh_n.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload', TRUE) . '" alt="" />' . - ''; + $buttons['reload'] = '' . - 'backPath, 'gfx/zoom.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '" alt="" />' . + $buttons['view'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } // New record if (!$GLOBALS['SOBE']->modTSconfig['properties']['noCreateRecordsLink']) { - $buttons['new_record'] = '' . - 'backPath, 'gfx/new_el.gif') . ' title="' . $LANG->getLL('newRecordGeneral', 1) . '" alt="" />' . + $buttons['new_record'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; } @@ -206,31 +206,31 @@ // Edit $params = '&edit[pages][' . $this->pageRow['uid'] . ']=edit'; - $buttons['edit'] = '' . - 'backPath, 'gfx/edit2.gif') . ' title="' . $LANG->getLL('editPage', 1) . '" alt="" />' . + $buttons['edit'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; // Unhide if ($this->pageRow['hidden']) { $params = '&data[pages][' . $this->pageRow['uid'] . '][hidden]=0'; - $buttons['hide_unhide'] = '' . - 'backPath, 'gfx/button_unhide.gif') . ' title="' . $LANG->getLL('unHidePage', 1) . '" alt="" />' . + $buttons['hide_unhide'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') . ''; // Hide } else { $params = '&data[pages][' . $this->pageRow['uid'] . '][hidden]=1'; - $buttons['hide_unhide'] = ''. - 'backPath, 'gfx/button_hide.gif') . ' title="' . $LANG->getLL('hidePage', 1) . '" alt="" />' . + $buttons['hide_unhide'] = ''. + t3lib_iconWorks::getSpriteIcon('actions-edit-hide') . ''; } // Move - $buttons['move'] = '' . - 'backPath, 'gfx/move_' . ($this->table == 'tt_content' ? 'record' : 'page') . '.gif') . ' title="' . $LANG->getLL('move_page', 1) . '" alt="" />' . + $buttons['move'] = '' . + (($this->table == 'tt_content') ? t3lib_iconWorks::getSpriteIcon('actions-document-move') : t3lib_iconWorks::getSpriteIcon('actions-page-move')) . ''; // Up one level - $buttons['level_up'] = '' . - 'backPath, 'gfx/i/pages_up.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel', 1) . '" alt="" />' . + $buttons['level_up'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-view-go-up') . ''; } @@ -240,36 +240,37 @@ if (($localCalcPerms&8) || ($localCalcPerms&16)) { $elFromTable = $this->clipObj->elFromTable(''); if (count($elFromTable)) { - $buttons['paste'] = '' . - 'backPath, 'gfx/clip_pasteafter.gif') . ' title="' . $LANG->getLL('clip_paste', 1) . '" alt="" />' . + $buttons['paste'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') . ''; } } // Cache - $buttons['cache'] = '' . - 'backPath, 'gfx/clear_cache.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.clear_cache', 1) . '" alt="" />' . + $buttons['cache'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-cache-clear') . ''; if ($this->table) { // CSV - $buttons['csv'] = '' . - 'backPath, 'gfx/csv.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.csv', 1) . '" alt="" />' . + $buttons['csv'] = '' . + t3lib_iconWorks::getSpriteIcon('mimetypes-text-csv') . ''; // Export if (t3lib_extMgm::isLoaded('impexp')) { $url = $this->backPath . t3lib_extMgm::extRelPath('impexp') . 'app/index.php?tx_impexp[action]=export'; - $buttons['export'] = '' . 'backPath, t3lib_extMgm::extRelPath('impexp') . 'export.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.export', 1) . '" alt="" />' . - ''; + $buttons['export'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-export-t3d') . + ''; } } // Reload - $buttons['reload'] = '' . - 'backPath, 'gfx/refresh_n.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.reload', 1) . '" alt="" />' . + $buttons['reload'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-system-refresh') . ''; // Shortcut @@ -279,8 +280,8 @@ // Back if ($this->returnUrl) { - $buttons['back'] = '' . - 'backPath, 'gfx/goback.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.goBack', 1) . '" alt="" />' . + $buttons['back'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-go-back') . ''; } } @@ -309,10 +310,8 @@ $l10nEnabled = $TCA[$table]['ctrl']['languageField'] && $TCA[$table]['ctrl']['transOrigPointerField'] && !$TCA[$table]['ctrl']['transOrigPointerTable']; $tableCollapsed = (!$this->tablesCollapsed[$table]) ? false : true; - // prepare space icon - $iconWidth = $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeWidth'] ? $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeWidth'] : 12; - $iconHeight = $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeHeight'] ? $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeHeight'] : 12; - $this->spaceIcon = ''; + // prepare space icon + $this->spaceIcon = t3lib_iconWorks::getSpriteIcon('empty-empty', array('style' => 'background-position: 0 10px;')); // Cleaning rowlist for duplicates and place the $titleCol as the first column always! $this->fieldArray=array(); @@ -470,7 +469,9 @@ if ($this->disableSingleTableView) { $theData[$titleCol] = ''.$GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'],1).' ('.$this->totalItems.')'; } else { - $theData[$titleCol] = $this->linkWrapTable($table,''.$GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'],1).' ('.$this->totalItems.') backPath,'gfx/'.($this->table?'minus':'plus').'bullet_list.gif','width="18" height="12"').' hspace="10" class="absmiddle" title="'.$GLOBALS['LANG']->getLL(!$this->table?'expandView':'contractView',1).'" alt="" />'); + $theData[$titleCol] = $this->linkWrapTable($table, '' . $GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'], TRUE) . ' (' . $this->totalItems . ') ' . + ($this->table ? t3lib_iconWorks::getSpriteIcon('actions-view-table-collapse', array('title' => $GLOBALS['LANG']->getLL('contractView', TRUE))) : t3lib_iconWorks::getSpriteIcon('actions-view-table-expand', array('title' => $GLOBALS['LANG']->getLL('expandView', TRUE)))) + ); } // CSH: @@ -496,7 +497,9 @@ // Render collapse button if in multi table mode $collapseIcon = ''; if (!$this->table) { - $collapseIcon = 'backPath, 'gfx/arrow' . ($tableCollapsed ? 'right' : 'down') . '.png') . ' class="collapseIcon" alt="" title="' . ($tableCollapsed ? $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.expandTable',1) : $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.collapseTable',1)) . '" />'; + $collapseIcon = '' . + ($tableCollapsed ? t3lib_iconWorks::getSpriteIcon('actions-view-list-expand', array('class' => 'collapseIcon')) : t3lib_iconWorks::getSpriteIcon('actions-view-list-collapse', array('class' => 'collapseIcon'))) . + ''; } $out .= $this->addelement(1, $collapseIcon, $theData, ' class="c-headLineTable"', ''); } @@ -677,7 +680,10 @@ // The icon with link $alttext = t3lib_BEfunc::getRecordIconAltText($row,$table); - $iconImg = t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.htmlspecialchars($alttext).'"'.($indent ? ' style="margin-left: '.$indent.'px;"' : '')); + //$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;' : ''))); + + $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg,$table,$row['uid']) : $iconImg; // Preparing and getting the data-array @@ -687,8 +693,8 @@ $recTitle = t3lib_BEfunc::getRecordTitle($table,$row,FALSE,TRUE); // If the record is edit-locked by another user, we will show a little warning sign: if (($lockInfo = t3lib_BEfunc::isRecordLocked($table, $row['uid']))) { - $warning = '' . - 'backPath, 'gfx/recordlock_warning3.gif', 'width="17" height="12"') . ' title="' . htmlspecialchars($lockInfo['msg']) . '" alt="" />' . + $warning = '' . + t3lib_iconWorks::getSpriteIcon('status-warning-record') . ''; } $theData[$fCol] = $warning . $this->linkWrapItems($table, $row['uid'], $recTitle, $row); @@ -849,8 +855,8 @@ // If there are elements on the clipboard for this table, then display the "paste into" icon: $elFromTable = $this->clipObj->elFromTable($table); if (count($elFromTable)) { - $cells['pasteAfter']=''. - 'backPath,'gfx/clip_pasteafter.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_paste',1).'" alt="" />'. + $cells['pasteAfter']='' . + t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') . ''; } @@ -858,22 +864,22 @@ if ($this->clipObj->current!='normal') { // The "select" link: - $cells['copyMarked']=$this->linkClipboardHeaderIcon('backPath,'gfx/clip_copy.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_selectMarked',1).'" alt="" />',$table,'setCB'); + $cells['copyMarked']=$this->linkClipboardHeaderIcon(t3lib_iconWorks::getSpriteIcon('actions-edit-copy', array('title' => $LANG->getLL('clip_selectMarked', TRUE))), $table, 'setCB'); // The "edit marked" link: $editIdList = implode(',',$currentIdList); $editIdList = "'+editList('".$table."','".$editIdList."')+'"; $params='&edit['.$table.']['.$editIdList.']=edit&disHelp=1'; - $cells['edit']=''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('clip_editMarked',1).'" alt="" />'. + $cells['edit']='' . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; // The "Delete marked" link: - $cells['delete']=$this->linkClipboardHeaderIcon('backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$LANG->getLL('clip_deleteMarked',1).'" alt="" />',$table,'delete',sprintf($LANG->getLL('clip_deleteMarkedWarning'),$LANG->sL($TCA[$table]['ctrl']['title']))); + $cells['delete']=$this->linkClipboardHeaderIcon(t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => $LANG->getLL('clip_deleteMarked', TRUE))), $table,'delete',sprintf($LANG->getLL('clip_deleteMarkedWarning'), $LANG->sL($TCA[$table]['ctrl']['title']))); // The "Select all" link: - $cells['markAll'] = '' . - 'backPath,'gfx/clip_select.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_markRecords',1).'" alt="" />'. + $cells['markAll'] = '' . + t3lib_iconWorks::getSpriteIcon('actions-document-select') . ''; } else { $cells['empty']=''; @@ -906,12 +912,12 @@ $tmpTSc = $tmpTSc ['properties']['newContentWiz.']['overrideWithExtension']; $newContentWizScriptPath = $this->backPath.t3lib_extMgm::isLoaded($tmpTSc) ? (t3lib_extMgm::extRelPath($tmpTSc).'mod1/db_new_content_el.php') : 'sysext/cms/layout/db_new_content_el.php'; - $icon = ''. - 'backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new',1).'" alt="" />'. + $icon = ''. + ($table == 'pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) . ''; } elseif ($table=='pages' && $this->newWizards) { - $icon = ''. - 'backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new',1).'" alt="" />'. + $icon = ''. + ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) . ''; } else { @@ -919,8 +925,8 @@ if ($table == 'pages_language_overlay') { $params .= '&overrideVals[pages_language_overlay][doktype]=' . (int) $this->pageRow['doktype']; } - $icon = ''. - 'backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new',1).'" alt="" />'. + $icon = ''. + ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) . ''; } } @@ -930,8 +936,8 @@ $editIdList = implode(',',$currentIdList); if ($this->clipNumPane()) $editIdList = "'+editList('".$table."','".$editIdList."')+'"; $params = '&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.implode(',',$this->fieldArray).'&disHelp=1'; - $icon .= ''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('editShownColumns',1).'" alt="" />'. + $icon .= ''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } // add an empty entry, so column count fits again after moving this into $icon @@ -948,8 +954,8 @@ // If the numeric clipboard pads are selected, show duplicate sorting link: if ($this->clipNumPane()) { - $theData[$fCol].=''. - 'backPath,'gfx/select_duplicates.gif','width="11" height="11"').' title="'.$LANG->getLL('clip_duplicates',1).'" alt="" />'. + $theData[$fCol].=''. + t3lib_iconWorks::getSpriteIcon('actions-list-dublicates-select') . ''; } @@ -959,8 +965,8 @@ if ($this->clipNumPane()) $editIdList = "'+editList('".$table."','".$editIdList."')+'"; $params='&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.$fCol.'&disHelp=1'; $iTitle = sprintf($LANG->getLL('editThisColumn'),rtrim(trim($LANG->sL(t3lib_BEfunc::getItemLabel($table,$fCol))),':')); - $theData[$fCol].=''. - 'backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.htmlspecialchars($iTitle).'" alt="" />'. + $theData[$fCol].=''. + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } } @@ -1057,11 +1063,9 @@ } $reload = ' - backPath, 'gfx/refresh_n.gif') - . 'alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:reload') - . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:reload') - . '" />'; + . $listURL . '&pointer=\'+calculatePointer(); document.dblistForm.submit(); return true;" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:reload', TRUE) . '">' . + t3lib_iconWorks::getSpriteIcon('actions-system-refresh') . + ''; // Add js to traverse a page select input to a pointer value $content = ' @@ -1160,8 +1164,8 @@ // "Show" link (only pages and tt_content elements) if ($table=='pages' || $table=='tt_content') { $params='&edit['.$table.']['.$row['uid'].']=edit'; - $cells['view']=''. - 'backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPage',1).'" alt="" />'. + $cells['view']=''. + t3lib_iconWorks::getSpriteIcon('actions-document-view') . ''; } elseif(!$this->table) { $cells['view'] = $this->spaceIcon; @@ -1170,8 +1174,8 @@ // "Edit" link: ( Only if permissions to edit the page-record of the content of the parent page ($this->id) if ($permsEdit) { $params='&edit['.$table.']['.$row['uid'].']=edit'; - $cells['edit']=''. - 'backPath,'gfx/edit2'.(!$TCA[$table]['ctrl']['readOnly']?'':'_d').'.gif','width="11" height="12"').' title="'.$LANG->getLL('edit',1).'" alt="" />'. + $cells['edit']=''. + ( $TCA[$table]['ctrl']['readOnly'] ? t3lib_iconWorks::getSpriteIcon('actions-document-open-read-only') : t3lib_iconWorks::getSpriteIcon('actions-document-open') ). ''; } elseif(!$this->table) { $cells['edit'] = $this->spaceIcon; @@ -1179,8 +1183,8 @@ // "Move" wizard link for pages/tt_content elements: if (($table=="tt_content" && $permsEdit) || ($table=='pages')) { - $cells['move']=''. - 'backPath,'gfx/move_'.($table=='tt_content'?'record':'page').'.gif','width="11" height="12"').' title="'.$LANG->getLL('move_'.($table=='tt_content'?'record':'page'),1).'" alt="" />'. + $cells['move']='' . + ($table == 'tt_content' ? t3lib_iconWorks::getSpriteIcon('actions-document-move') : t3lib_iconWorks::getSpriteIcon('actions-page-move')) . ''; } elseif(!$this->table) { $cells['move'] = $this->spaceIcon; @@ -1190,42 +1194,39 @@ if ($SOBE->MOD_SETTINGS['bigControlPanel'] || $this->table) { // "Info": (All records) - $cells['viewBig']=''. - 'backPath,'gfx/zoom2.gif','width="12" height="12"').' title="'.$LANG->getLL('showInfo',1).'" alt="" />'. + $cells['viewBig']=''. + t3lib_iconWorks::getSpriteIcon('actions-document-info') . ''; // If the table is NOT a read-only table, then show these links: if (!$TCA[$table]['ctrl']['readOnly']) { // "Revert" link (history/undo) - $cells['history']=''. - 'backPath,'gfx/history2.gif','width="13" height="12"').' title="'.$LANG->getLL('history',1).'" alt="" />'. + $cells['history']=''. + t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . ''; // Versioning: if (t3lib_extMgm::isLoaded('version')) { $vers = t3lib_BEfunc::selectVersionsOfRecord($table, $row['uid'], 'uid', $GLOBALS['BE_USER']->workspace, FALSE, $row); if (is_array($vers)) { // If table can be versionized. - if (count($vers)>1) { - $class = 'typo3-ctrl-versioning-multipleVersions'; - $lab = count($vers)-1; - } else { - $class = 'typo3-ctrl-versioning-oneVersion'; - $lab = 'V'; + $versionIcon = 'no-version'; + if (count($vers) > 1) { + $versionIcon = count($vers) - 1; } - $cells['version']=''. - $lab. + $cells['version']='' . + t3lib_iconWorks::getSpriteIcon('status-version-' . $versionIcon) . ''; } elseif(!$this->table) { - $cells['version'] = 'V'; + $cells['version'] = $this->spaceIcon; } } // "Edit Perms" link: if ($table=='pages' && $GLOBALS['BE_USER']->check('modules','web_perm')) { - $cells['perms']=''. - 'backPath,'gfx/perm.gif','width="7" height="12"').' title="'.$LANG->getLL('permissions',1).'" alt="" />'. + $cells['perms']=''. + t3lib_iconWorks::getSpriteIcon('status-status-locked') . ''; } elseif(!$this->table && $GLOBALS['BE_USER']->check('modules','web_perm')) { $cells['perms'] = $this->spaceIcon; @@ -1239,8 +1240,8 @@ ) { if ($this->showNewRecLink($table)) { $params='&edit['.$table.']['.(-($row['_MOVE_PLH']?$row['_MOVE_PLH_uid']:$row['uid'])).']=new'; - $cells['new']=''. - 'backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new'.($table=='pages'?'Page':'Record'),1).'" alt="" />'. + $cells['new']=''. + ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) . ''; } } @@ -1252,16 +1253,16 @@ if ($permsEdit && $TCA[$table]['ctrl']['sortby'] && !$this->sortField && !$this->searchLevels) { if (isset($this->currentTable['prev'][$row['uid']])) { // Up $params='&cmd['.$table.']['.$row['uid'].'][move]='.$this->currentTable['prev'][$row['uid']]; - $cells['moveUp']=''. - 'backPath,'gfx/button_up.gif','width="11" height="10"').' title="'.$LANG->getLL('moveUp',1).'" alt="" />'. + $cells['moveUp']='' . + t3lib_iconWorks::getSpriteIcon('actions-move-up') . ''; } else { $cells['moveUp'] = $this->spaceIcon; } if ($this->currentTable['next'][$row['uid']]) { // Down $params='&cmd['.$table.']['.$row['uid'].'][move]='.$this->currentTable['next'][$row['uid']]; - $cells['moveDown']=''. - 'backPath,'gfx/button_down.gif','width="11" height="10"').' title="'.$LANG->getLL('moveDown',1).'" alt="" />'. + $cells['moveDown']='' . + t3lib_iconWorks::getSpriteIcon('actions-move-down') . ''; } else { $cells['moveDown'] = $this->spaceIcon; @@ -1276,13 +1277,13 @@ if ($permsEdit && $hiddenField && $TCA[$table]['columns'][$hiddenField] && (!$TCA[$table]['columns'][$hiddenField]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields',$table.':'.$hiddenField))) { if ($row[$hiddenField]) { $params='&data['.$table.']['.$row['uid'].']['.$hiddenField.']=0'; - $cells['hide']=''. - 'backPath,'gfx/button_unhide.gif','width="11" height="10"').' title="'.$LANG->getLL('unHide'.($table=='pages'?'Page':''),1).'" alt="" />'. + $cells['hide']='' . + t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') . ''; } else { $params='&data['.$table.']['.$row['uid'].']['.$hiddenField.']=1'; - $cells['hide']=''. - 'backPath,'gfx/button_hide.gif','width="11" height="10"').' title="'.$LANG->getLL('hide'.($table=='pages'?'Page':''),1).'" alt="" />'. + $cells['hide']='' . + t3lib_iconWorks::getSpriteIcon('actions-edit-hide') . ''; } } elseif(!$this->table) { @@ -1304,8 +1305,8 @@ $this->getReferenceCount($table, $row['uid']) ) . t3lib_BEfunc::translationCount($table, $row['uid'], ' ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.translationsOfRecord')); - $cells['delete']='doc->issueCommand($params,-1).'\');} return false;').'">'. - 'backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$LANG->getLL('delete',1).'" alt="" />'. + $cells['delete']='doc->issueCommand($params,-1).'\');} return false;').'" title="' . $LANG->getLL('delete', TRUE) . '">' . + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; } elseif(!$this->table) { $cells['delete'] = $this->spaceIcon; @@ -1317,8 +1318,8 @@ // Up (Paste as the page right after the current parent page) if ($this->calcPerms&8) { $params='&cmd['.$table.']['.$row['uid'].'][move]='.-$this->id; - $cells['moveLeft']=''. - 'backPath,'gfx/button_left.gif','width="11" height="10"').' title="'.$LANG->getLL('prevLevel',1).'" alt="" />'. + $cells['moveLeft']=''. + t3lib_iconWorks::getSpriteIcon('actions-move-left') . ''; } // Down (Paste as subpage to the page right above) @@ -1326,8 +1327,8 @@ $localCalcPerms = $GLOBALS['BE_USER']->calcPerms(t3lib_BEfunc::getRecord('pages',$this->currentTable['prevUid'][$row['uid']])); if ($localCalcPerms&8) { $params='&cmd['.$table.']['.$row['uid'].'][move]='.$this->currentTable['prevUid'][$row['uid']]; - $cells['moveRight']=''. - 'backPath,'gfx/button_right.gif','width="11" height="10"').' title="'.$LANG->getLL('nextLevel',1).'" alt="" />'. + $cells['moveRight']=''. + t3lib_iconWorks::getSpriteIcon('actions-move-right') . ''; } else { $cells['moveRight'] = $this->spaceIcon; @@ -1401,11 +1402,11 @@ // Show copy/cut icons: $isSel = (string)$this->clipObj->isSelected($table,$row['uid']); - $cells['copy'] = $isL10nOverlay ? $this->spaceIcon : ''. - 'backPath,'gfx/clip_copy'.($isSel=='copy'?'_h':'').'.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:cm.copy',1).'" alt="" />'. + $cells['copy'] = $isL10nOverlay ? $this->spaceIcon : ''. + ((!$isSel=='copy') ? t3lib_iconWorks::getSpriteIcon('actions-edit-copy') : t3lib_iconWorks::getSpriteIcon('actions-edit-copy-release')) . ''; - $cells['cut'] = $isL10nOverlay ? $this->spaceIcon : ''. - 'backPath,'gfx/clip_cut'.($isSel=='cut'?'_h':'').'.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:cm.cut',1).'" alt="" />'. + $cells['cut'] = $isL10nOverlay ? $this->spaceIcon : ''. + ((!$isSel=='cut') ? t3lib_iconWorks::getSpriteIcon('actions-edit-cut') : t3lib_iconWorks::getSpriteIcon('actions-edit-cut-release')) . ''; } else { // For the numeric clipboard pads (showing checkboxes where one can select elements on/off) @@ -1433,16 +1434,16 @@ // Now, looking for selected elements from the current table: $elFromTable = $this->clipObj->elFromTable($table); if (count($elFromTable) && $TCA[$table]['ctrl']['sortby']) { // IF elements are found and they can be individually ordered, then add a "paste after" icon: - $cells['pasteAfter'] = $isL10nOverlay ? $this->spaceIcon : ''. - 'backPath,'gfx/clip_pasteafter.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_pasteAfter',1).'" alt="" />'. + $cells['pasteAfter'] = $isL10nOverlay ? $this->spaceIcon : ''. + t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') . ''; } // Now, looking for elements in general: $elFromTable = $this->clipObj->elFromTable(''); if ($table=='pages' && count($elFromTable)) { - $cells['pasteInto']=''. - 'backPath,'gfx/clip_pasteinto.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_pasteInto',1).'" alt="" />'. + $cells['pasteInto']=''. + t3lib_iconWorks::getSpriteIcon('actions-document-paste-into') . ''; } Index: typo3/show_rechis.php =================================================================== --- typo3/show_rechis.php (Revision 7665) +++ typo3/show_rechis.php (Arbeitskopie) @@ -155,7 +155,7 @@ $historyObj = t3lib_div::makeInstance('recordHistory'); if ($historyObj->returnUrl) { - $buttons['back']= ''; + $buttons['back']= '' . t3lib_iconWorks::getSpriteIcon('actions-go-back') . ''; } return $buttons; Index: typo3/move_el.php =================================================================== --- typo3/move_el.php (Revision 7665) +++ typo3/move_el.php (Arbeitskopie) @@ -320,7 +320,7 @@ if (is_array($pidPageInfo)) { if ($BE_USER->isInWebMount($pidPageInfo['pid'],$this->perms_clause)) { $code.= ''. - 'doc->backPath,'gfx/i/pages_up.gif','width="18" height="16"').' alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-view-go-up') . t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE). '
'; } else { @@ -375,7 +375,7 @@ if (is_array($pidPageInfo)) { if ($BE_USER->isInWebMount($pidPageInfo['pid'],$this->perms_clause)) { $code.= ''. - 'doc->backPath,'gfx/i/pages_up.gif','width="18" height="16"').' alt="" />'. + t3lib_iconWorks::getSpriteIcon('actions-view-go-up') . t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE). '
'; } else { @@ -440,7 +440,9 @@ if ($this->R_URI) { // Back - $buttons['back'] ='doc->backPath, 'gfx/goback.gif') . ' alt="" title="' . $LANG->getLL('goBack', 1) .'" />'; + $buttons['back'] ='' . + t3lib_iconWorks::getSpriteIcon('actions-go-back') . + ''; } }