Commit 68937497 authored by Michael Stucki's avatar Michael Stucki
Browse files

* Unfortunately the resolve-path patch was overwritten, so here it is again


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@598 709f56b5-9817-0410-a4d7-c38de5d9e867
parent fb76da13
2005-04-04 Michael Stucki <michael@typo3.org>
* Unfortunately the resolve-path patch was overwritten, so here it is again
2005-04-04 Robert Lemke <robert@typo3.org>
+ Added a preliminary way for moving containers in a flexform section in TCEforms + TCEmain. Before you could only delete containers.
+ Added Sebastian Kurfürst's collapsable modules feature for the backend's module bar
* Added a preliminary way for moving containers in a flexform section in TCEforms + TCEmain. Before you could only delete containers.
* Added Sebastian Kurfürst's collapsable modules feature for the backend's module bar
2005-04-04 Kasper Skårhøj,,, <kasper@typo3.com>
......@@ -40,7 +45,7 @@
* TYPO3 seems to prefer "mediumblob" instead of "MEDIUMBLOB", thus I changed that in typo3/sysext/cms/ext_tables.sql
* Added hook in tslib_fe
2005-03-28 Michael Stucki <michael@typo3.org>
* Corrected a typo in fe_adminLib.inc (Ingmar watch this!)
......
......@@ -172,6 +172,8 @@ class alt_menu_functions {
$link_sub = 0;
}
$link = t3lib_div::resolveBackPath($link);
$moduleKey = $moduleName.'_tab';
$moduleCSSId = 'ID_'.t3lib_div::md5int($moduleName);
......@@ -248,7 +250,7 @@ class alt_menu_functions {
</tr>';
}
$link = $subInfo['script'];
$link = t3lib_div::resolveBackPath($subInfo['script']);
$prefix=$this->getNavFramePrefix ($moduleInfo, $subInfo);
$subKey = $moduleName.'_'.$subName.'_tab';
......@@ -292,7 +294,8 @@ class alt_menu_functions {
if (!$BE_USER->uc['condensedMode'] && $moduleInfo['navFrameScript']) {
// use special nav script from sub module, otherwise from the main module
$subNavFrameScript = $subInfo['navFrameScript'] ? $subInfo['navFrameScript'] : $moduleInfo['navFrameScript'] ;
$subNavFrameScript = $subInfo['navFrameScript'] ? $subInfo['navFrameScript'] : $moduleInfo['navFrameScript'];
$subNavFrameScript = t3lib_div::resolveBackPath($subNavFrameScript);
// add GET params for sub module to the nav script
$subNavFrameScript = $this->wrapLinkWithAB($subNavFrameScript).$subInfo['navFrameScriptParam'];
......@@ -468,12 +471,15 @@ class alt_menu_functions {
$prefix = '';
$navFrameScriptParam = $subModuleInfo['navFrameScriptParam'] ? $subModuleInfo['navFrameScriptParam'] : $moduleInfo['navFrameScriptParam'];
if ($moduleInfo['navFrameScript']) {
$navFrameScript = t3lib_div::resolveBackPath($moduleInfo['navFrameScript']);
$navFrameScript = $this->wrapLinkWithAB($navFrameScript);
if ($BE_USER->uc['condensedMode']) {
$prefix=$this->wrapLinkWithAB($moduleInfo['navFrameScript']).$navFrameScriptParam.'&currentSubScript=';
$prefix=$navFrameScript.$navFrameScriptParam.'&currentSubScript=';
} else {
$prefix='alt_mod_frameset.php?'.
'fW="+top.TS.navFrameWidth+"'.
'&nav="+top.TS.PATH_typo3+"'.rawurlencode($this->wrapLinkWithAB($moduleInfo['navFrameScript']).$navFrameScriptParam).
'&nav="+top.TS.PATH_typo3+"'.rawurlencode($navFrameScript.$navFrameScriptParam).
'&script=';
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment