Index: t3lib/stddb/tables.php
===================================================================
--- t3lib/stddb/tables.php (Revision 7895)
+++ t3lib/stddb/tables.php (Arbeitskopie)
@@ -166,10 +166,18 @@
'7-hideinmenu' => 'apps-pagetree-page-mountpoint-hideinmenu',
'7-root' => 'apps-pagetree-page-mountpoint-root',
'199' => 'apps-pagetree-spacer',
- '199-hideinmenu' => 'apps-pagetree-spacer-hideinmenu',
+ '199-hideinmenu' => 'apps-pagetree-spacer',
+ '199-root' => 'apps-pagetree-page-domain',
'254' => 'apps-pagetree-folder-default',
- '254-hideinmenu' => 'apps-pagetree-folder-default-hideinmenu',
+ '254-hideinmenu' => 'apps-pagetree-folder-default',
+ '254-root' => 'apps-pagetree-page-domain',
'255' => 'apps-pagetree-page-recycler',
+ '255-hideinmenu' => 'apps-pagetree-page-recycler',
+ 'contains-shop' => 'apps-agetree-folder-contains-shop',
+ 'contains-approve' => 'apps-agetree-folder-contains-approve',
+ 'contains-fe_users' => 'apps-agetree-folder-contains-fe_users',
+ 'contains-board' => 'apps-agetree-folder-contains-board',
+ 'contains-news' => 'apps-agetree-folder-contains-news',
'default' => 'apps-pagetree-page-default',
),
Index: t3lib/class.t3lib_recordlist.php
===================================================================
--- t3lib/class.t3lib_recordlist.php (Revision 7895)
+++ t3lib/class.t3lib_recordlist.php (Arbeitskopie)
@@ -147,15 +147,12 @@
';
if (!$h) {
-# $out.='backPath,'gfx/ol/halfline.gif','width="18" height="8"').' alt="" />';
$out.='';
} else {
for ($a=0;$a<$h;$a++) {
if (!$a) {
-# $out.= $altLine ? $altLine : 'backPath,'gfx/ol/line.gif','width="18" height="16"').' alt="" />';
if ($icon) $out.= $icon;
} else {
-# $out.= $altLine ? $altLine :' backPath,'gfx/ol/line.gif','width="18" height="16"').' alt="" />';
}
}
}
Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php (Revision 7895)
+++ t3lib/class.t3lib_tceforms.php (Arbeitskopie)
@@ -1078,18 +1078,24 @@
if (in_array('date', $evalList)) {
$inputId = uniqid('tceforms-datefield-');
$cssClasses[] = 'tceforms-textfield tceforms-datefield';
- $fieldAppendix = 'backPath, 'gfx/datepicker.gif', '', 0)
- . ' style="cursor:pointer; vertical-align:middle;" alt=""'
- . ' id="picker-' . $inputId . '" />';
+ $fieldAppendix = t3lib_iconWorks::getSpriteIcon(
+ 'actions-edit-pick-date',
+ array(
+ 'style' => 'cursor:pointer;',
+ 'id' => 'picker-' . $inputId
+ )
+ );
} elseif (in_array('datetime', $evalList)) {
$inputId = uniqid('tceforms-datetimefield-');
$cssClasses[] = 'tceforms-textfield tceforms-datetimefield';
- $fieldAppendix = 'backPath, 'gfx/datepicker.gif', '', 0)
- . ' style="cursor:pointer; vertical-align:middle;" alt=""'
- . ' id="picker-' . $inputId . '" />';
+ $fieldAppendix = t3lib_iconWorks::getSpriteIcon(
+ 'actions-edit-pick-date',
+ array(
+ 'style' => 'cursor:pointer;',
+ 'id' => 'picker-' . $inputId
+ )
+ );
} elseif (in_array('timesec', $evalList)) {
$inputId = uniqid('tceforms-timesecfield-');
@@ -2181,8 +2187,18 @@
$absFilePath = t3lib_div::getFileAbsFileName($config['uploadfolder'] ? $config['uploadfolder'] . '/' . $imgPath : $imgPath);
$fI = pathinfo($imgPath);
- $fileIcon = t3lib_BEfunc::getFileIcon(strtolower($fI['extension']));
- $fileIcon = 'backPath,'gfx/fileicons/'.$fileIcon,'width="18" height="16"').' class="absmiddle" title="'.htmlspecialchars($fI['basename'].($absFilePath && @is_file($absFilePath) ? ' ('.t3lib_div::formatSize(filesize($absFilePath)).'bytes)' : ' - FILE NOT FOUND!')).'" alt="" />';
+ $fileIcon = t3lib_iconWorks::getSpritIconForFile(
+ strtolower($fI['extension']),
+ array(
+ 'title' => htmlspecialchars(
+ $fI['basename'] .
+ ($absFilePath && @is_file($absFilePath)
+ ? ' (' . t3lib_div::formatSize(filesize($absFilePath)) . 'bytes)' :
+ ' - FILE NOT FOUND!'
+ )
+ )
+ )
+ );
$imgs[] = ''.t3lib_BEfunc::thumbCode($rowCopy,$table,$field,$this->backPath,'thumbs.php',$config['uploadfolder'],0,' align="middle"').
($absFilePath ? $this->getClickMenu($fileIcon, $absFilePath) : $fileIcon).
@@ -2279,7 +2295,18 @@
if (!$disabled && $show_thumbs) {
$rr = t3lib_BEfunc::getRecordWSOL($this_table,$this_uid);
$imgs[] = ''.
- $this->getClickMenu(t3lib_iconWorks::getIconImage($this_table,$rr,$this->backPath,'align="top" title="'.htmlspecialchars(t3lib_BEfunc::getRecordPath($rr['pid'],$perms_clause,15)).' [UID: '.$rr['uid'].']"'),$this_table, $this_uid).
+ $this->getClickMenu(
+ t3lib_iconWorks::getSpriteIconForRecord(
+ $this_table,
+ $rr,
+ array(
+ 'style' => 'vertical-align:top',
+ 'title' => htmlspecialchars(t3lib_BEfunc::getRecordPath($rr['pid'], $perms_clause, 15) . ' [UID: ' . $rr['uid'] . ']"')
+ )
+ ),
+ $this_table,
+ $this_uid
+ ) .
' '.
t3lib_BEfunc::getRecordTitle($this_table,$rr,TRUE).' ['.$rr['uid'].']'.
'';
@@ -2754,7 +2781,6 @@
|
'.
($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 ? ''.t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => 'Delete')) : '').
' |
@@ -3653,7 +3679,7 @@
}
$aOnClick.= 'return false;';
$icons['R'][]=''.
- t3lib_iconWorks::getSpriteIcon('actions-edit-paste', array('title' => htmlspecialchars(sprintf($this->getLL('l_clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))))) .
+ t3lib_iconWorks::getSpriteIcon('actions-document-paste-into', array('title' => htmlspecialchars(sprintf($this->getLL('l_clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))))) .
'';
}
$rOnClick = $rOnClickInline.'setFormValueManipulate(\''.$fName.'\',\'Remove\'); return false';
Index: t3lib/class.t3lib_tceforms_inline.php
===================================================================
--- t3lib/class.t3lib_tceforms_inline.php (Revision 7895)
+++ t3lib/class.t3lib_tceforms_inline.php (Arbeitskopie)
@@ -634,8 +634,12 @@
$style = ' style="'.$config['inline']['inlineNewButtonStyle'].'"';
}
$cells['new']=''.
- 'backPath,'gfx/new_'.($isPagesTable?'page':'el').'.gif','width="'.($isPagesTable?13:11).'" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:new'.($isPagesTable?'Page':'Record'),1).'" alt="" />'.
- '';
+ t3lib_iconWorks::getSpriteIcn('actions-' . ($isPagesTable? 'page' :'document') . '-new',
+ array(
+ 'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:new' . ($isPagesTable ? 'Page' : 'Record' ), 1)
+ )
+ ).
+ '';
}
}
@@ -665,12 +669,24 @@
$onClick = "return inline.enableDisableRecord('".$nameObjectFtId."')";
if ($rec[$hiddenField]) {
$cells['hide.unhide']=''.
- 'backPath,'gfx/button_unhide.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHide'.($isPagesTable?'Page':''),1).'" alt="" id="'.$nameObjectFtId.'_disabled" />'.
- '';
+ t3lib_iconWorks::getSpriteIcon(
+ 'actions-edit-unhide',
+ array(
+ 'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHide' . ($isPagesTable ? 'Page' : ''), 1),
+ 'id' => $nameObjectFtId . '_disabled'
+ )
+ ) .
+ '';
} else {
$cells['hide.hide']=''.
- 'backPath,'gfx/button_hide.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hide'.($isPagesTable?'Page':''),1).'" alt="" id="'.$nameObjectFtId.'_disabled" />'.
- '';
+ t3lib_iconWorks::getSpriteIcon(
+ 'actions-edit-hide',
+ array(
+ 'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hide' . ($isPagesTable ? 'Page' : ''), 1),
+ 'id' => $nameObjectFtId . '_disabled'
+ )
+ ) .
+ '';
}
}
@@ -694,7 +710,7 @@
// 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']))) .
+ t3lib_iconWorks::getSpriteIcon('status-warning-in-use', array('title' => htmlspecialchars($lockInfo['msg']))) .
'';
}
@@ -902,8 +918,7 @@
switch($type) {
case 'newRecord':
$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.createnew', 1);
- $iconFile = 'gfx/new_el.gif';
- // $iconAddon = 'width="11" height="12"';
+ $icon = 'actions-document-new';
$className = 'typo3-newRecordLink';
$attributes['class'] = 'inlineNewButton '.$this->inlineData['config'][$nameObject]['md5'];
$attributes['onclick'] = "return inline.createNewRecord('$objectPrefix')";
@@ -916,22 +931,22 @@
break;
case 'localize':
$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localizeAllRecords', 1);
- $iconFile = 'gfx/localize_el.gif';
+ $icon = 'actions-document-localize';
$className = 'typo3-localizationLink';
$attributes['onclick'] = "return inline.synchronizeLocalizeRecords('$objectPrefix', 'localize')";
break;
case 'synchronize':
$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:synchronizeWithOriginalLanguage', 1);
- $iconFile = 'gfx/synchronize_el.gif';
+ $icon = 'actions-document-synchronize';
$className = 'typo3-synchronizationLink';
$attributes['class'] = 'inlineNewButton '.$this->inlineData['config'][$nameObject]['md5'];
$attributes['onclick'] = "return inline.synchronizeLocalizeRecords('$objectPrefix', 'synchronize')";
break;
}
// Create the link:
- $icon = ($iconFile ? 'backPath, $iconFile, $iconAddon).' alt="'.htmlspecialchars($title.$titleAddon).'" />' : '');
- $link = $this->wrapWithAnchor($icon.$title.$titleAddon, '#', $attributes);
- return ''.$link.'
';
+ $icon = ($icon ? t3lib_iconWorks::getSpriteIcon($icon, array('title' => htmlspecialchars($title.$titleAddon))) : '');
+ $link = $this->wrapWithAnchor($icon . $title . $titleAddon, '#', $attributes);
+ return '' . $link . '
';
}
Index: typo3/class.file_list.inc
===================================================================
--- typo3/class.file_list.inc (Revision 7895)
+++ typo3/class.file_list.inc (Arbeitskopie)
@@ -657,7 +657,7 @@
$elFromTable = $this->clipObj->elFromTable('_FILE');
if (@is_dir($fullIdent) && count($elFromTable)) {
$cells[]=''.
- t3lib_iconWorks::getSpriteIcon('document-paste-into') .
+ t3lib_iconWorks::getSpriteIcon('actions-document-paste-into') .
'';
}
Index: typo3/wizard_tsconfig.php
===================================================================
--- typo3/wizard_tsconfig.php (Revision 7895)
+++ typo3/wizard_tsconfig.php (Arbeitskopie)
@@ -347,7 +347,7 @@
// Title and description:
$out.=''.
- t3lib_iconWorks::getSpriteIcon('actions-go-back') .
+ t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
htmlspecialchars($obj_string).
'
';
if ($rec['title']) $out.= ''.htmlspecialchars($rec['title']).': ';
Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php (Revision 7895)
+++ typo3/alt_doc.php (Arbeitskopie)
@@ -897,7 +897,7 @@
// If only SOME fields are shown in the form, this will link the user to the FULL form:
if ($this->columnsOnly) {
$buttons['columns_only'] = '' .
- t3lib_iconWorks::getSpriteIcon('actions-edit-edit') .
+ t3lib_iconWorks::getSpriteIcon('actions-document-open') .
'';
}
}
Index: typo3/class.alt_menu_functions.inc
===================================================================
--- typo3/class.alt_menu_functions.inc (Revision 7895)
+++ 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 = t3lib_iconWorks::getSpriteIcon('actions-view-table-' . ($config[$moduleName]) ? 'expand' : 'collapse', array('class' => 'c-iconCollapse'));
+ $collapseIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-' . ($config[$moduleName] ? 'expand' : 'collapse'), array('class' => 'c-iconCollapse'));
} else {
$collapseJS = $collapseIcon = '';
}
Index: typo3/mod/user/ws/workspaceforms.php
===================================================================
--- typo3/mod/user/ws/workspaceforms.php (Revision 7895)
+++ typo3/mod/user/ws/workspaceforms.php (Arbeitskopie)
@@ -179,7 +179,7 @@
$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 .= t3lib_iconWorks::getSpriteIcon('actions-go-back') .
+ $this->content .= t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
'' .
$goBack .
'';
Index: typo3/mod/user/ws/class.wslib_gui.php
===================================================================
--- typo3/mod/user/ws/class.wslib_gui.php (Revision 7895)
+++ typo3/mod/user/ws/class.wslib_gui.php (Arbeitskopie)
@@ -1184,7 +1184,7 @@
if ($table==='pages') {
$actionLinks.=
''.
- t3lib_iconWorks::getSpriteIcon('apps-version-page-open') .
+ t3lib_iconWorks::getSpriteIcon('actions-page-open') .
'';
} else {
$params = '&edit['.$table.']['.$uid.']=edit';
Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php (Revision 7895)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php (Arbeitskopie)
@@ -2330,7 +2330,7 @@
* @return string IMG tag for icon.
*/
function noEditIcon($label='noEditItems') {
- return t3lib_iconWorks::getSpriteIcon('status-edit-deny', array('title' => $GLOBALS['LANG']->getLL($label, TRUE)));
+ return t3lib_iconWorks::getSpriteIcon('status-edit-read-only', array('title' => $GLOBALS['LANG']->getLL($label, TRUE)));
}
/**
Index: typo3/sysext/tstemplate/ts/index.php
===================================================================
--- typo3/sysext/tstemplate/ts/index.php (Revision 7895)
+++ typo3/sysext/tstemplate/ts/index.php (Arbeitskopie)
@@ -307,7 +307,7 @@
if(!empty($this->sObj)) {
// BACK
$buttons['back'] = '' .
- t3lib_iconWorks::getSpriteIcon('actions-go-back') .
+ t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
'';
}
}
Index: typo3/sysext/version/cm1/index.php
===================================================================
--- typo3/sysext/version/cm1/index.php (Revision 7895)
+++ typo3/sysext/version/cm1/index.php (Arbeitskopie)
@@ -820,7 +820,7 @@
} else $table = '';
$linkBack = t3lib_div::_GP('returnUrl') ? '' .
- t3lib_iconWorks::getSpriteIcon('actions-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) .
+ t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) .
'
' : '';
$resetDiffOnly = $this->diffOnly ? '' . $GLOBALS['LANG']->getLL('showAllInformation') . '
' : '';
Index: typo3/class.db_list_extra.inc
===================================================================
--- typo3/class.db_list_extra.inc (Revision 7895)
+++ typo3/class.db_list_extra.inc (Arbeitskopie)
@@ -281,7 +281,7 @@
// Back
if ($this->returnUrl) {
$buttons['back'] = '' .
- t3lib_iconWorks::getSpriteIcon('actions-go-back') .
+ t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
'';
}
}
@@ -694,7 +694,7 @@
// 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 = '' .
- t3lib_iconWorks::getSpriteIcon('status-warning-record') .
+ t3lib_iconWorks::getSpriteIcon('status-warning-in-use') .
'';
}
$theData[$fCol] = $warning . $this->linkWrapItems($table, $row['uid'], $recTitle, $row);
@@ -1020,45 +1020,41 @@
if ($currentPage > 1) {
$labelFirst = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:first');
- $first = '
- backPath, 'gfx/control_first.gif')
- . 'alt="' . $labelFirst . '" title="' . $labelFirst . '" />
- ';
+ $first = '' .
+ t3lib_iconWorks::getSpriteIcon('actions-view-paging-first', array('title'=> $labelFirst)) .
+ '';
} else {
- $first = 'backPath, 'gfx/control_first_disabled.gif') . 'alt="" title="" />';
+ $first = t3lib_iconWorks::getSpriteIcon('actions-view-paging-first-disabled');
}
if (($currentPage - 1) > 0) {
$labelPrevious = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:previous');
- $previous = '
- backPath, 'gfx/control_previous.gif')
- . 'alt="' . $labelPrevious . '" title="' . $labelPrevious . '" />
- ';
+ $previous = '' .
+ t3lib_iconWorks::getSpriteIcon('actions-view-paging-previous', array('title' => $labelPrevious)) .
+ '';
} else {
- $previous = 'backPath, 'gfx/control_previous_disabled.gif') . 'alt="" title="" />';
+ $previous = t3lib_iconWorks::getSpriteIcon('actions-view-paging-previous-disabled');
}
if (($currentPage + 1) <= $totalPages) {
$labelNext = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:next');
- $next = '
- backPath, 'gfx/control_next.gif')
- . 'alt="' . $labelNext . '" title="' . $labelNext . '" />
- ';
+ $next = '' .
+ t3lib_iconWorks::getSpriteIcon('actions-view-paging-next', array('title' => $labelNext)) .
+ '';
} else {
- $next = 'backPath, 'gfx/control_next_disabled.gif') . 'alt="" title="" />';
+ $next = t3lib_iconWorks::getSpriteIcon('actions-view-paging-next-disabled');
}
if ($currentPage != $totalPages) {
$labelLast = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:last');
- $last = '
- backPath, 'gfx/control_last.gif')
- . 'alt="' . $labelLast . '" title="' . $labelLast . '" />
- ';
+ $last = '' .
+ t3lib_iconWorks::getSpriteIcon('actions-view-paging-last', array('title' => $labelLast)) .
+ '';
} else {
- $last = 'backPath, 'gfx/control_last_disabled.gif') . 'alt="" title="" />';
+ $last = t3lib_iconWorks::getSpriteIcon('actions-view-paging-last-disabled');
}
$reload = '