Fixed bug #7713: EM - Translation Manager loose CSS while updating, credits Steffen...
authorIngo Renner <ingo.renner@typo3.org>
Mon, 3 Mar 2008 12:02:13 +0000 (12:02 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Mon, 3 Mar 2008 12:02:13 +0000 (12:02 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3352 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/class.em_index.php

index 4086d0f..0eeef17 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * Added new descriptions for some page property fields, credits Uschi Renziehausen
        * Added feature #7140: EM should send TYPO3 version when connecting to TER, credits Niels Pardon
        * Fixed bug #7704: Image Position in Text/Image doesn't work, redits Steffen Kamper
+       * Fixed bug #7713: EM - Translation Manager loose CSS while updating, credits Steffen Kamper
 
 2008-03-03  Dmitry Dulepov  <dmitry@typo3.org>
 
index 162917c..a7f488c 100644 (file)
@@ -1139,7 +1139,15 @@ EXTENSION KEYS:
        function translationHandling()  {
                global $LANG, $TYPO3_LOADED_EXT;
                $LANG->includeLLFile('EXT:setup/mod/locallang.xml');
-
+               
+               //prepare docheader
+               $docHeaderButtons = $this->getButtons();
+               $markers = array(
+                       'CSH' => $docHeaderButtons['csh'],
+                       'FUNC_MENU' => $this->getFuncMenu(),
+               );      
+                               
+                               
                $incoming = t3lib_div::_POST('SET');
                if(isset($incoming['selectedLanguages']) && is_array($incoming['selectedLanguages'])) {
                        t3lib_BEfunc::getModuleData($this->MOD_MENU, array('selectedLanguages' => serialize($incoming['selectedLanguages'])), $this->MCONF['name'], '', 'selectedLanguages');
@@ -1194,7 +1202,13 @@ EXTENSION KEYS:
                                $loadedExtensions = array_diff($loadedExtensions,array('_CACHEFILE'));
 
                                        // Override content output - we now do that ourself:
-                               echo ($this->content . $this->doc->section('Translation status',$content,0,1));
+                               $this->content .= $this->doc->section('Translation status',$content,0,1);
+                                       // Setting up the buttons and markers for docheader
+                               $content = $this->doc->startPage('Extension Manager');
+                               $content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
+                               $contentParts=explode('###CONTENT###',$content);
+                               echo $contentParts[0].$this->content;
+                               
                                $this->doPrintContent = FALSE;
                                flush();
 
@@ -1265,15 +1279,21 @@ EXTENSION KEYS:
                                                document.getElementById("progress-message").firstChild.data="Check done.";
                                        </script>
                                ';
-                               echo $this->doc->endPage();
-                               return '';
+                               echo $contentParts[1] . $this->doc->endPage();
+                               exit;
 
                        } elseif(t3lib_div::_GET('l10n') == 'update') {
                                $loadedExtensions = array_keys($TYPO3_LOADED_EXT);
                                $loadedExtensions = array_diff($loadedExtensions,array('_CACHEFILE'));
 
                                        // Override content output - we now do that ourself:
-                               echo ($this->content . $this->doc->section('Translation status',$content,0,1));
+                               $this->content .= $this->doc->section('Translation status',$content,0,1);
+                                       // Setting up the buttons and markers for docheader
+                               $content = $this->doc->startPage('Extension Manager');
+                               $content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
+                               $contentParts=explode('###CONTENT###',$content);
+                               echo $contentParts[0].$this->content;
+                               
                                $this->doPrintContent = FALSE;
                                flush();
 
@@ -1351,8 +1371,8 @@ EXTENSION KEYS:
                                                document.getElementById("progress-message").firstChild.data="Update done.";
                                        </script>
                                ';
-                               echo $this->doc->endPage();
-                               return '';
+                               echo $contentParts[1] . $this->doc->endPage();
+                               exit;
                        }
 
                        $this->content.=$this->doc->section('Translation status',$content,0,1);