Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (revision 7573) +++ typo3/sysext/install/mod/class.tx_install.php (working copy) @@ -701,7 +701,7 @@ // Define the markers content $markers = array( 'action' => $this->action, - 'content' => $this->printAll(), + 'content' => $this->printAll(TRUE), 'write' => 'Write to localconf.php', 'notice' => 'NOTICE:', 'explanation' => ' @@ -7575,21 +7575,29 @@ * * @return string HTML of all the messages */ - function printAll() { + function printAll($includeSection = FALSE) { // Get the template file $templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'PrintAll.html'); // Get the template part from the file $template = t3lib_parsehtml::getSubpart($templateFile, '###TEMPLATE###'); + $menu = t3lib_parsehtml::getSubpart($template, '###SECTIONMENU###'); + $links = t3lib_parsehtml::getSubpart($menu, '###SECTIONMENU_LINKS###'); $sections = array(); foreach ($this->sections as $header => $valArray) { // Get the subpart for sections $sectionSubpart = t3lib_parsehtml::getSubpart($template, '###SECTIONS###'); + $sectionMenu = t3lib_parsehtml::getSubpart($template, '###SECTIONMENU###'); // Define the markers content $sectionMarkers = array( + 'id' => md5($header), 'header' => $header . ':', 'sectionContent' => implode(chr(10), $valArray) ); + $sectionMenuMarkers = array( + 'jumpid' => md5($header), + 'header' => $header . ':', + ); // Fill the markers in the subpart $sections[] = t3lib_parsehtml::substituteMarkerArray( $sectionSubpart, @@ -7598,6 +7606,13 @@ 1, 1 ); + $menuLinks[] = t3lib_parsehtml::substituteMarkerArray( + $links, + $sectionMenuMarkers, + '###|###', + 1, + 1 + ); } // Substitute the subpart for the sections $content = t3lib_parsehtml::substituteSubpart( @@ -7605,7 +7620,24 @@ '###SECTIONS###', implode(chr(10), $sections) ); - + if ($includeSection) { + $menu = t3lib_parsehtml::substituteSubpart( + $menu, + '###SECTIONMENU_LINKS###', + implode(chr(10), $menuLinks) + ); + $content = t3lib_parsehtml::substituteSubpart( + $content, + '###SECTIONMENU###', + $menu + ); + } else { + $content = t3lib_parsehtml::substituteSubpart( + $content, + '###SECTIONMENU###', + '' + ); + } return $content; } Index: typo3/sysext/install/Resources/Private/Templates/PrintAll.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/PrintAll.html (revision 7573) +++ typo3/sysext/install/Resources/Private/Templates/PrintAll.html (working copy) @@ -12,8 +12,18 @@
###HEADER### + + +
+ + -

###HEADER###

+

###HEADER###

###SECTIONCONTENT###