@@ -1257,7 +1277,7 @@
';
- $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('translation_settings'), $content, 0, 1);
+ $this->content .= $this->doc->section($headline, $content, FALSE, TRUE, FALSE, TRUE);
if(count($selectedLanguages)>0) {
$mirrorURL = $this->getMirrorURL();
@@ -2454,13 +2474,12 @@
}
// Show details:
- $content = t3lib_BEfunc::cshItem('_MOD_tools_em', 'info', $GLOBALS['BACK_PATH'], '|
');
- $content.= $this->extInformationArray($extKey,$list[$extKey]);
+ $headline = $GLOBALS['LANG']->getLL('ext_details_details');
+ $headline = t3lib_BEfunc::wrapInHelp('_MOD_tools_em', 'info', $headline);
+ $content = $this->extInformationArray($extKey,$list[$extKey]);
$this->content.=$this->doc->spacer(10);
- $this->content .= $this->doc->section(
- $GLOBALS['LANG']->getLL('ext_details_details'), $content, 0, 1
- );
+ $this->content .= $this->doc->section($headline, $content, FALSE, TRUE, FALSE, TRUE);
break;
case 'upload':
$em = t3lib_div::_POST('em');
@@ -2472,8 +2491,9 @@
// Must reload this, because EM_CONF information has been updated!
list($list,)=$this->getInstalledExtensions();
} else {
- // CSH:
- $content = t3lib_BEfunc::cshItem('_MOD_tools_em', 'upload', $GLOBALS['BACK_PATH'], '|
');
+ // headline and CSH
+ $headline = $GLOBALS['LANG']->getLL('ext_details_upload_to_ter');
+ $headline = t3lib_BEfunc::wrapInHelp('_MOD_tools_em', 'upload', $headline);
// Upload:
if (substr($extKey,0,5)!='user_') {
@@ -2496,10 +2516,7 @@
}
}
- $this->content .= $this->doc->section(
- $GLOBALS['LANG']->getLL('ext_details_upload_to_ter'),
- $content, 0, 1, $eC
- );
+ $this->content .= $this->doc->section($headline, $content, 0, 1, $eC, TRUE);
break;
case 'backup':
if($this->CMD['doDelete']) {
@@ -2509,12 +2526,12 @@
$content, 0, 1
);
} else {
- $csh = t3lib_BEfunc::cshItem('_MOD_tools_em', 'backup_delete', $GLOBALS['BACK_PATH'], '|
');
+ // headline and CSH
+ $headline = $GLOBALS['LANG']->getLL('ext_details_backup');
+ $headline = t3lib_BEfunc::wrapInHelp('_MOD_tools_em', 'backup_delete', $headline);
+
$content = $this->extBackup($extKey, $list[$extKey]);
- $this->content .= $this->doc->section(
- $GLOBALS['LANG']->getLL('ext_details_backup') . ' ' . $csh,
- $content, 0, 1, 0, 1
- );
+ $this->content .= $this->doc->section($headline, $content, 0, 1, 0, 1);
$content = $this->extDelete($extKey,$list[$extKey]);
$this->content .= $this->doc->section(
@@ -2533,13 +2550,14 @@
$this->extDumpTables($extKey,$list[$extKey]);
break;
case 'edit':
- $content = t3lib_BEfunc::cshItem('_MOD_tools_em', 'editfiles', $GLOBALS['BACK_PATH'], '|
');
- $content.= $this->getFileListOfExtension($extKey,$list[$extKey]);
- $this->content.=$this->doc->section(
- $GLOBALS['LANG']->getLL('ext_details_ext_files'),
- $content, 0, 1
- );
+ // headline and CSH
+ $headline = $GLOBALS['LANG']->getLL('ext_details_ext_files');
+ $headline = t3lib_BEfunc::wrapInHelp('_MOD_tools_em', 'editfiles', $headline);
+
+ $content = $this->getFileListOfExtension($extKey,$list[$extKey]);
+
+ $this->content .= $this->doc->section($headline, $content, FALSE, TRUE, FALSE, TRUE);
break;
case 'updateModule':
$this->content .= $this->doc->section(
@@ -3027,101 +3045,202 @@
* @return string HTML content.
*/
function extInformationArray($extKey,$extInfo,$remote=0) {
- $lines=array();
- $lines[] = '';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_title') . ' |
- ' . $extInfo['EM_CONF']['_icon'] . $extInfo['EM_CONF']['title'] . ' | ' .
- $this->helpCol('title') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_description') . ' |
- ' . nl2br(htmlspecialchars($extInfo['EM_CONF']['description'])) . ' | ' .
- $this->helpCol('description') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_author') . ' |
- ' . $this->wrapEmail($extInfo['EM_CONF']['author'] .
- ($extInfo['EM_CONF']['author_email'] ?
- ' <' . $extInfo['EM_CONF']['author_email'] . '>' : ''),
- $extInfo['EM_CONF']['author_email']) .
- ($extInfo['EM_CONF']['author_company'] ?
- ', ' . $extInfo['EM_CONF']['author_company'] : '') . ' | ' .
- $this->helpCol('author') . '
';
-
-
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_version') . ' |
- ' . $extInfo['EM_CONF']['version'] . ' | ' .
- $this->helpCol('version') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_category') . ' |
- ' . $this->categories[$extInfo['EM_CONF']['category']] . ' | ' .
- $this->helpCol('category') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_state') . ' |
- ' . $this->states[$extInfo['EM_CONF']['state']] . ' | ' .
- $this->helpCol('state') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_shy') . ' |
- ' . ($extInfo['EM_CONF']['shy'] ?
- $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes')
- : $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no')) . ' | ' .
- $this->helpCol('shy') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_internal') . ' |
- ' . ($extInfo['EM_CONF']['internal'] ?
- $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes')
- : $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no')) . ' | ' .
- $this->helpCol('internal') . '
';
-
-
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_depends_on') . ' |
- ' . $this->depToString($extInfo['EM_CONF']['constraints']) . ' | ' .
- $this->helpCol('dependencies') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_conflicts_with') . ' |
- ' . $this->depToString($extInfo['EM_CONF']['constraints'], 'conflicts') . ' | ' .
- $this->helpCol('conflicts') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_suggests') . ' |
- ' . $this->depToString($extInfo['EM_CONF']['constraints'], 'suggests') . ' | ' .
- $this->helpCol('suggests') . '
';
- if (!$remote) {
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_priority') . ' |
- ' . $extInfo['EM_CONF']['priority'] . ' | ' .
- $this->helpCol('priority') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_clear_cache') . ' |
- ' . ($extInfo['EM_CONF']['clearCacheOnLoad'] ?
- $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes')
- : $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no')) . ' | ' .
- $this->helpCol('clearCacheOnLoad') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_incl_modules') . ' |
- ' . $extInfo['EM_CONF']['module'] . ' | ' .
- $this->helpCol('module') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_lock_type') . ' |
- ' . ($extInfo['EM_CONF']['lockType'] ?
- $extInfo['EM_CONF']['lockType'] : '') . ' | ' .
- $this->helpCol('lockType') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_load_in_frontend') . ' |
- ' . ($extInfo['EM_CONF']['doNotLoadInFE'] ?
- $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no')
- : $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes')) . ' | ' .
- $this->helpCol('doNotLoadInFE') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_modifies_tables') . ' |
- ' . $extInfo['EM_CONF']['modify_tables'] . ' | ' .
- $this->helpCol('modify_tables') . '
';
+ $emConf = $extInfo['EM_CONF'];
+
+ $lines = array();
+ $lines[] = '
+ ';
+
+ // row for the extension title
+ $key = 'title';
+ $dataCol = $emConf['_icon'] . $emConf[$key];
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the extension description
+ $key = 'description';
+ $dataCol = nl2br(htmlspecialchars($emConf[$key]));
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the extension author
+ $key = 'author';
+ $dataCol = $this->wrapEmail($emConf['author'] . ($emConf['author_email'] ? ' <' . $emConf['author_email'] . '>' : ''), $emConf['author_email']);
+ if ($emConf['author_company']) {
+ $dataCol = ', ' . $emConf['author_company'];
+ }
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the version
+ $key = 'version';
+ $dataCol = $emConf[$key];
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the category
+ $key = 'category';
+ $dataCol = $this->categories[$emConf[$key]];
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the state
+ $key = 'state';
+ $dataCol = $this->states[$emConf[$key]];
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the shy state
+ $key = 'shy';
+ if ($emConf[$key]) {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes');
+ } else {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no');
+ }
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the internal state
+ $key = 'internal';
+ if ($emConf[$key]) {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes');
+ } else {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no');
+ }
+ $lines[] = array(
+ $this->headerCol($key),
+ $dataCol
+ );
+
+ // row for the dependencies
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_depends_on');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_dependencies', $headerCol);
+ $dataCol = $this->depToString($emConf['constraints']);
+ $lines[] = array(
+ $headerCol,
+ $dataCol
+ );
+
+ // row for the conflicts
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_conflicts_with');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_conflicts', $headerCol);
+ $dataCol = $this->depToString($emConf['constraints'], 'conflicts');
+ $lines[] = array(
+ $headerCol,
+ $dataCol
+ );
+
+ // row for the suggestions
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_suggests');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_conflicts', $headerCol);
+ $dataCol = $this->depToString($emConf['constraints'], 'suggests');
+ $lines[] = array(
+ $this->headerCol('suggests'),
+ $dataCol
+ );
+
+ if (!$remote) {
+
+ $key = 'priority';
+ $lines[] = array(
+ $this->headerCol($key),
+ $emConf[$key]
+ );
+
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_clear_cache');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_clearCacheOnLoad', $headerCol);
+ if ($emConf['clearCacheOnLoad']) {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes');
+ } else {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no');
+ }
+ $lines[] = array(
+ $headerCol,
+ $dataCol
+ );
+
+ $key = 'module';
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_incl_modules');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_module', $headerCol);
+ $lines[] = array(
+ $headerCol,
+ $emConf[$key]
+ );
+
+ $key = 'lockType';
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_lock_type');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_lockType', $headerCol);
+ $lines[] = array(
+ $headerCol,
+ ($emConf[$key] ? $emConf[$key] : '')
+ );
+
+ $key = 'doNotLoadInFE';
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_load_in_frontend');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_doNotLoadInFE', $headerCol);
+ if (!$emConf['doNotLoadInFE']) {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes');
+ } else {
+ $dataCol = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:no');
+ }
+ $lines[] = array(
+ $headerCol,
+ $dataCol
+ );
+
+ $key = 'modify_tables';
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_modifies_tables');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_modify_tables', $headerCol);
+ $lines[] = array(
+ $headerCol,
+ $emConf[$key]
+ );
// Installation status:
- $techInfo = $this->makeDetailedExtensionAnalysis($extKey,$extInfo,1);
- $lines[] = '| | | '.$this->helpCol('').'
';
- $lines[] = '';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_inst_type') . ' |
- ' . $this->typeLabels[$extInfo['type']] . ' - ' . $this->typeDescr[$extInfo['type']] . ' | ' .
- $this->helpCol('type') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_inst_twice') . ' |
- ' . $this->extInformationArray_dbInst($extInfo['doubleInstall'], $extInfo['type']) . ' | ' .
- $this->helpCol('doubleInstall') . '
';
- if (is_array($extInfo['files'])) {
+ $techInfo = $this->makeDetailedExtensionAnalysis($extKey, $extInfo, 1);
+ $lines[] = array('| |
');
+ $lines[] = array('');
+
+
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_inst_type');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_type', $headerCol);
+ $dataCol = $this->typeLabels[$extInfo['type']] . ' - ' . $this->typeDescr[$extInfo['type']] . '';
+ $lines[] = array($headerCol, $dataCol);
+
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_inst_twice');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_doubleInstall', $headerCol);
+ $dataCol = $this->extInformationArray_dbInst($extInfo['doubleInstall'], $extInfo['type']);
+ $lines[] = array($headerCol, $dataCol);
+
+
+ if (is_array($extInfo['files'])) {
sort($extInfo['files']);
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_root_files') . ' |
- ' . implode('
', $extInfo['files']) . ' | ' .
- $this->helpCol('rootfiles') . '
';
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_root_files');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_rootfiles', $headerCol);
+ $dataCol = implode('
', $extInfo['files']);
+ $lines[] = array($headerCol, $dataCol);
}
- if ($techInfo['tables']||$techInfo['static']||$techInfo['fields']) {
- if (!$remote && t3lib_extMgm::isLoaded($extKey)) {
+ if ($techInfo['tables']||$techInfo['static']||$techInfo['fields']) {
+ if (!$remote && t3lib_extMgm::isLoaded($extKey)) {
$tableStatus = $GLOBALS['TBE_TEMPLATE']->rfw(($techInfo['tables_error'] ?
'' . $GLOBALS['LANG']->getLL('extInfoArray_table_error') . '
' .
$GLOBALS['LANG']->getLL('extInfoArray_missing_fields') : '') .
@@ -3134,61 +3253,76 @@
}
}
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_db_requirements') . ' |
- ' . $this->extInformationArray_dbReq($techInfo, 1) . ' | ' .
- $this->helpCol('dbReq') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_db_status') . ' |
- ' . $tableStatus . ' | ' .
- $this->helpCol('dbStatus') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_flags') . ' |
- ' . (is_array($techInfo['flags']) ?
- implode('
', $techInfo['flags']) : '') . ' | ' .
- $this->helpCol('flags') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_config_template') . ' |
- ' . ($techInfo['conf'] ?
- $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes') : '') . ' | ' .
- $this->helpCol('conf') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_typoscript_files') . ' |
- ' . (is_array($techInfo['TSfiles']) ?
- implode('
', $techInfo['TSfiles']) : '') . ' | ' .
- $this->helpCol('TSfiles') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_language_files') . ' |
- ' . (is_array($techInfo['locallang']) ?
- implode('
', $techInfo['locallang']) : '') . ' | ' .
- $this->helpCol('locallang') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_upload_folder') . ' |
- ' . ($techInfo['uploadfolder'] ?
- $techInfo['uploadfolder'] : '') . ' | ' .
- $this->helpCol('uploadfolder') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_create_directories') . ' |
- ' . (is_array($techInfo['createDirs']) ?
- implode('
', $techInfo['createDirs']) : '') . ' | ' .
- $this->helpCol('createDirs') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_module_names') . ' |
- ' . (is_array($techInfo['moduleNames']) ?
- implode('
', $techInfo['moduleNames']) : '') . ' | ' .
- $this->helpCol('moduleNames') . '
';
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_class_names') . ' |
- ' . (is_array($techInfo['classes']) ?
- implode('
', $techInfo['classes']) : '') . ' | ' .
- $this->helpCol('classNames') . '
';
- $lines[] = '' . $GLOBALS['LANG']->getLL('extInfoArray_code_warnings') . '
' .
- $GLOBALS['LANG']->getLL('extInfoArray_dev_relevant') . ' |
- ' . (is_array($techInfo['errors']) ?
- $GLOBALS['TBE_TEMPLATE']->rfw(implode('
', $techInfo['errors'])) : '') . ' | ' .
- $this->helpCol('errors') . '
';
- $lines[] = '' . $GLOBALS['LANG']->getLL('extInfoArray_annoyances') . '
' .
- $GLOBALS['LANG']->getLL('extInfoArray_dev_relevant') . ' |
- ' . (is_array($techInfo['NSerrors']) ?
- (!t3lib_div::inList($this->nameSpaceExceptions, $extKey) ?
- t3lib_utility_Debug::viewArray($techInfo['NSerrors']) :
- $GLOBALS['TBE_TEMPLATE']->dfw($GLOBALS['LANG']->getLL('extInfoArray_exception'))) : '') . ' | ' .
- $this->helpCol('NSerrors') . '
';
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_db_requirements');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_dbReq', $headerCol);
+ $dataCol = $this->extInformationArray_dbReq($techInfo, 1);
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_db_status');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_dbStatus', $headerCol);
+ $lines[] = array($headerCol, $tableStatus);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_flags');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_flags', $headerCol);
+ $dataCol = (is_array($techInfo['flags']) ? implode('
', $techInfo['flags']) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_config_template');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_conf', $headerCol);
+ $dataCol = ($techInfo['conf'] ? $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes') : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_typoscript_files');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_TSfiles', $headerCol);
+ $dataCol = (is_array($techInfo['TSfiles']) ? implode('
', $techInfo['TSfiles']) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_language_files');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_locallang', $headerCol);
+ $dataCol = (is_array($techInfo['locallang']) ? implode('
', $techInfo['locallang']) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_upload_folder');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_uploadfolder', $headerCol);
+ $dataCol = ($techInfo['uploadfolder'] ? $techInfo['uploadfolder'] : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_create_directories');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_createDirs', $headerCol);
+ $dataCol = (is_array($techInfo['createDirs']) ? implode('
', $techInfo['createDirs']) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_module_names');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_moduleNames', $headerCol);
+ $dataCol = (is_array($techInfo['moduleNames']) ? implode('
', $techInfo['moduleNames']) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_class_names');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_classNames', $headerCol);
+ $dataCol = (is_array($techInfo['classes']) ? implode('
', $techInfo['classes']) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_code_warnings') . '
' . $GLOBALS['LANG']->getLL('extInfoArray_dev_relevant');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_errors', $headerCol);
+ $dataCol = (is_array($techInfo['errors']) ? $GLOBALS['TBE_TEMPLATE']->rfw(implode('
', $techInfo['errors'])) : '');
+ $lines[] = array($headerCol, $dataCol);
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_annoyances') . '
' . $GLOBALS['LANG']->getLL('extInfoArray_dev_relevant');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_NSerrors', $headerCol);
+ if (is_array($techInfo['NSerrors'])) {
+ if (!t3lib_div::inList($this->nameSpaceExceptions, $extKey)) {
+ $dataCol = t3lib_utility_Debug::viewArray($techInfo['NSerrors']);
+ } else {
+ $dataCol = $GLOBALS['TBE_TEMPLATE']->dfw($GLOBALS['LANG']->getLL('extInfoArray_exception'));
+ }
+
+ }
+ $lines[] = array($headerCol, $dataCol);
$currentMd5Array = $this->serverExtensionMD5Array($extKey,$extInfo);
$affectedFiles='';
- $msgLines=array();
+ $msgLines = array();
if (strcmp($extInfo['EM_CONF']['_md5_values_when_last_written'],serialize($currentMd5Array))) {
$msgLines[] = $GLOBALS['TBE_TEMPLATE']->rfw('
' . $GLOBALS['LANG']->getLL('extInfoArray_difference_detected') . '');
$affectedFiles = $this->findMD5ArrayDiff($currentMd5Array,unserialize($extInfo['EM_CONF']['_md5_values_when_last_written']));
@@ -3197,14 +3331,31 @@
$GLOBALS['TBE_TEMPLATE']->rfw(implode('
', $affectedFiles));
}
}
- $lines[] = '| ' . $GLOBALS['LANG']->getLL('extInfoArray_files_changed') . ' |
- ' . implode('
', $msgLines) . ' | ' .
- $this->helpCol('filesChanged') . '
';
+
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_files_changed');
+ $headerCol = t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_filesChanged', $headerCol);
+ $dataCol = implode('
', $msgLines);
+ $lines[] = array($headerCol, $dataCol);
}
+ $output = '';
+ foreach ($lines as $cols) {
+ // if it's just one line, we assume it's a headline,
+ // thus no need to wrap it in HTML table tags
+ if (count($cols) == 1) {
+ $output .= $cols[0];
+ } else {
+ $output .= '
+
+ | ' . $cols[0] . ' |
+ ' . $cols[1] . ' |
+
';
+ }
+ }
+
+
return '
- '.implode('
- ',$lines).'
+ ' . $output . '
';
}
@@ -3570,6 +3721,7 @@
*
* @param string Help text key
* @return string HTML table cell
+ * @deprecated since TYPO3 4.5, will be removed in TYPO3 4.7
*/
function helpCol($key) {
global $BE_USER;
@@ -3580,6 +3732,7 @@
else {
return t3lib_BEfunc::cshItem($this->descrTable, 'emconf_'.$key, $GLOBALS['BACK_PATH'], '| | ');
}
+
}
else {
return '';
@@ -3587,6 +3740,18 @@
}
/**
+ * Returns the header column (for the extension details item), and applies help text if available
+ *
+ * @param string field key
+ * @return string HTML ready to go
+ */
+ function headerCol($key) {
+ $headerCol = $GLOBALS['LANG']->getLL('extInfoArray_' . $key);
+ return t3lib_BEfunc::wrapInHelp($this->descrTable, 'emconf_' . $key, $headerCol);
+ }
+
+
+ /**
* Returns title and style attribute for mouseover help text.
*
* @param string Help text.
Index: typo3/class.db_list_extra.inc
===================================================================
--- typo3/class.db_list_extra.inc (Revision 9089)
+++ typo3/class.db_list_extra.inc (Arbeitskopie)
@@ -469,32 +469,18 @@
// Header line is drawn
$theData = Array();
if ($this->disableSingleTableView) {
- $theData[$titleCol] = ''.$GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'],1).' ('.$this->totalItems.')';
+ $theData[$titleCol] = '' . t3lib_BEfunc::wrapInHelp($table, '', $GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'], TRUE)) . ' ('.$this->totalItems.')';
} else {
$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:
- $theData[$titleCol].= t3lib_BEfunc::cshItem($table,'',$this->backPath,'',FALSE,'margin-bottom:0px; white-space: normal;');
-
if ($listOnlyInSingleTableMode) {
$out.='
-
-
';
-
- if ($GLOBALS['BE_USER']->uc["edit_showFieldHelp"]) {
- $GLOBALS['LANG']->loadSingleTableDescription($table);
- if (isset($GLOBALS['TCA_DESCR'][$table]['columns'][''])) {
- $onClick = 'vHWin=window.open(\'view_help.php?tfID='.$table.'.\',\'viewFieldHelp\',\'height=400,width=600,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;';
- $out.='
-
- | '.t3lib_BEfunc::helpTextIcon($table,'',$this->backPath,TRUE).$GLOBALS['TCA_DESCR'][$table]['columns']['']['description'].' |
+
';
- }
- }
} else {
// Render collapse button if in multi table mode
$collapseIcon = '';
';
- }
+ $label = $this->getCSH($config['csh'] ? $config['csh'] : $fieldName, $label);
+
$type = $config['type'];
$eval = $config['eval'];
$class = $config['class'];
@@ -629,14 +620,8 @@
}
- // add another table row with the full text help if needed
- if ($displayFullText) {
- $code[$i++][1] = $csh;
- $csh = '';
- }
-
- $code[$i][1] = $csh . $label;
- $code[$i++][2] = $html;
+ $code[$i][1] = $label;
+ $code[$i++][2] = $html;
@@ -887,13 +872,14 @@
* Returns the CSH Icon for given string
*
* @param string Locallang key
+ * @param string The label to be used, that should be wrapped in help
* @return string HTML output.
*/
- protected function getCSH($str) {
+ protected function getCSH($str, $label) {
if (!t3lib_div::inList('language,simuser', $str)) {
$str = 'option_' . $str;
}
- return t3lib_BEfunc::cshItem('_MOD_user_setup', $str, $this->doc->backPath, '|', false, 'margin-bottom:0px;');
+ return t3lib_BEfunc::wrapInHelp('_MOD_user_setup', $str, $label);
}
/**
Index: typo3/sysext/em/mod1/class.em_index.php
===================================================================
--- typo3/sysext/em/mod1/class.em_index.php (Revision 9089)
+++ typo3/sysext/em/mod1/class.em_index.php (Arbeitskopie)
@@ -701,8 +701,6 @@
'back' => '',
'shortcut' => ''
);
- // CSH
- //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']);
// Shortcut
if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
@@ -773,7 +771,10 @@
}
}
- $content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'loaded', $GLOBALS['BACK_PATH'],'');
+ // headline and CSH
+ $headline = $GLOBALS['LANG']->getLL('loaded_exts');
+ $headline = t3lib_BEfunc::wrapInHelp('_MOD_tools_em', 'loaded', $headline);
+
$content.= '