Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (revision 5387) +++ typo3/sysext/install/mod/class.tx_install.php (working copy) @@ -174,8 +174,8 @@ var $getTTF_string_alt = 'with freetype'; // Used to identify whether TTF-lib is included with GD var $action = ''; // The url that calls this script var $scriptSelf = 'index.php'; // The url that calls this script - var $fontTag2=''; - var $fontTag1=''; + var $fontTag2='
'; + var $fontTag1='
'; var $updateIdentity = 'TYPO3 Install Tool'; var $headerStyle =''; var $contentBeforeTable=''; @@ -948,17 +948,10 @@ $fileList .= '

Delete temp_CACHED* files'; if ($fileFound && @is_file($this->INSTALL['typo3conf_files'])) { - $this->headerStyle = ' - - '; $backupFile = $this->getBackupFilename($this->INSTALL['typo3conf_files']); $fileContent = t3lib_div::getUrl($this->INSTALL['typo3conf_files']); - $this->contentBeforeTable.= '
'.(substr($this->INSTALL['typo3conf_files'],-1)!='~' && !strstr($this->INSTALL['typo3conf_files'],'_bak') ? ' + $this->contentBeforeTable.= '
'.(substr($this->INSTALL['typo3conf_files'],-1)!='~' && !strstr($this->INSTALL['typo3conf_files'],'_bak') ? '  ' : '').'
File: '.$this->INSTALL['typo3conf_files'].' @@ -972,7 +965,7 @@

'. - ''; + '
'; } if ($this->contentBeforeTable) { @@ -1030,7 +1023,7 @@ $buf=$this->messageFunc_nl2br; $this->messageFunc_nl2br=0; $this->message($headCode,'DEBUG information','Please copy/paste the information from this text field into an email or bug-report as "Debug System Information" whenever you wish to get support or report problems. This information helps others to check if your system has some obvious misconfiguration and you\'ll get your help faster!
-
'); +
'); $this->messageFunc_nl2br=$buf; $getEnvArray = array(); @@ -1051,21 +1044,8 @@ ob_end_clean(); $contents = explode('',$contents[1]); - $this->message($headCode,'phpinfo()',$contents[0]); + $this->message($headCode,'phpinfo()','
' . $contents[0] . '
'); - - -$this->headerStyle = ' - -'; - $this->output($this->outputWrapper($this->printAll())); } @@ -3298,13 +3278,13 @@ $c=0; $out=array(); while(list($k,$v)=each($menuitems)) { - $bgcolor = ($this->INSTALL['images_type']==$k ? ' bgcolor="#ABBBB4"' : ' bgcolor="#F4F0E8"'); + $bgcolor = ($this->INSTALL['images_type']==$k ? ' class="activeMenu"' : ' class="generalTableBackground"'); $c++; $out[]=''.$this->fw($c.': '.$v).''; } $code = ''.implode($out,'').'
'; - $code = '
'.$code.'
'; + $code = '
'.$code.'
'; return '
'.$code.'
'; } @@ -3390,7 +3370,7 @@ $out=''; $out.=' '.$this->fw('Update required tables').' - '.$this->fw('COMPARE').' + '.$this->fw('COMPARE').' '.$this->fw(' ').' '.$this->fw(' ').' '; @@ -3398,7 +3378,7 @@ $out.=' '.$this->fw('Dump static data').' '.$this->fw(' ').' - '.$this->fw('IMPORT').' + '.$this->fw('IMPORT').' '.$this->fw(' ').' '; @@ -3420,27 +3400,27 @@ $out.=' '.$this->fw($fShortName.' ('.t3lib_div::formatSize(filesize($file)).')').' - '.$this->fw('COMPARE').' - '.$this->fw('IMPORT'.$spec1.$spec2.'').' - '.$this->fw('VIEW'.$spec1.$spec2.'').' + '.$this->fw('COMPARE').' + '.$this->fw('IMPORT'.$spec1.$spec2.'').' + '.$this->fw('VIEW'.$spec1.$spec2.'').' '; } // TCA $out.=' - '.$this->fw('Compare with $TCA').' + '.$this->fw('Compare with $TCA').' '; $out.=' - '.$this->fw('Create "admin" user').' + '.$this->fw('Create "admin" user').' '; $out.=' - '.$this->fw('Reset user preferences').' + '.$this->fw('Reset user preferences').' '; $out.=' - '.$this->fw('Clear tables').' + '.$this->fw('Clear tables').' '; $theForm=''.$out.'
'; @@ -4006,7 +3986,7 @@ $explanation = ''; if ($tmpObj->checkForUpdate($explanation)) { $updateWizardBoxes.= ' -
+

'.$identifier.'

'.str_replace(chr(10),'
',$explanation).'

@@ -4027,7 +4007,7 @@ break; case 'getUserInput': // second step - get user input and ask for final confirmation $title = 'Step 2 - Configuration of updates'; - $formContent = '

The following updates will be performed:

'; + $formContent = '

The following updates will be performed:

'; if (!$this->INSTALL['update']) { $content = 'No updates selected!'; break; @@ -4057,7 +4037,7 @@ $tmpObj = &$this->getUpgradeObjInstance($className, $identifier); - $content = '

'.$identifier.'

'; + $content = '

'.$identifier.'

'; // check user input if testing method is available if (method_exists($tmpObj,'checkUserInput')) { $customOutput = ''; @@ -4219,7 +4199,7 @@ */ function displayFields($arr, $pre=0, $label='') { $out=''; - $out.=''.$this->fw('Field name:').''.$this->fw($label?$label:'Info:').''; + $out.=''.$this->fw('Field name:').''.$this->fw($label?$label:'Info:').''; if (is_array($arr)) { reset($arr); while(list($fieldname, $fieldContent)=each($arr)) { @@ -4228,7 +4208,7 @@ } else { $fieldContent = $this->fw($fieldContent); } - $out.=''.$this->fw($fieldname).''.$fieldContent.''; + $out.=''.$this->fw($fieldname).''.$fieldContent.''; } } $out= ''.$out.'
'; @@ -4260,14 +4240,14 @@ $str2 = str_replace('int(10)','int(11)',$str2); // Compare: if (strcmp($str1,$str2)) { - $bgcolor=' bgcolor="#ABBBB4"'; + $bgcolor=' class="warning"'; } else { - $bgcolor=' bgcolor="#D9D5C9"'; + $bgcolor=' class="generalTableBackground"'; } $fieldContent = $this->fw($fieldContent); $fieldContent_db = $this->fw($arr_db[$fieldname]); $out.=' - '.$this->fw($fieldname).' + '.$this->fw($fieldname).' '.$fieldContent.' '.$fieldContent_db.' '; @@ -4297,7 +4277,7 @@ $fieldContent.= '
'; $fieldContent.= '
'.trim($arr[$fieldname.'.']).'
'; } - $out.=''.$this->fw($fieldname).''.$fieldContent.''; + $out.=''.$this->fw($fieldname).''.$fieldContent.''; $fC++; } } @@ -4744,35 +4724,30 @@ */ function printSection($head, $short_string, $long_string, $type) { $icon=''; - - $bgCol =' bgcolor="#D9D5C9"'; // The default color + $cssClass =' class="note"'; switch($type) { case '3': - $bgCol =' bgcolor="red"'; + $cssClass =' class="error"'; $icon = 'gfx/icon_fatalerror.gif'; break; case '2': - $bgCol =' bgcolor="#9BA1A8"'; + $cssClass =' class="warning"'; $icon = 'gfx/icon_warning.gif'; break; case '1': - // $bgCol =' bgcolor="#ABBBB4"'; $icon = 'gfx/icon_note.gif'; break; case '-1': - // $bgCol =' bgcolor="yellow"'; + $cssClass =' class="success"'; $icon = 'gfx/icon_ok.gif'; break; - default: - $bgCol =' bgcolor="#D3D9DC"'; - break; } if (!trim($short_string)) { $this->sections[$head][]=''; } else { $this->sections[$head][]=' - '.($icon?'':'').''.$this->fw($short_string).''.(trim($long_string)?' - '.$this->fw($long_string).'

' : ''); + ' . ($icon ? '' : '') . '' . $this->fw($short_string) . '' . (trim($long_string) ? ' + ' . $this->fw($long_string) . '

' : ''); } } @@ -4852,48 +4827,32 @@ - '.$this->headerStyle.' - + TYPO3 Install Tool '.($this->JSmessage?' ':'').' - '.$this->contentBeforeTable.' -
- - - + '.$this->contentBeforeTable.' +
'; + if($this->INSTALL['type'] == 'about') { + $out .= '
TYPO3
'; + } else { + $out .= '
'; + } + $out .= ' + -
+ - @@ -4931,13 +4890,13 @@ $c=0; $out=array(); while(list($k,$v)=each($this->menuitems)) { - $bgcolor = ($this->INSTALL['type']==$k ? ' bgcolor="#ABBBB4"' : ' bgcolor="#F4F0E8"'); + $bgcolor = ($this->INSTALL['type']==$k ? ' class="activeMenu"' : ' class="generalTableBackground"'); $c++; $out[]=''.$this->fw($c.': '.$v).''; } $code = '
+
TYPO3 '.TYPO3_branch.' Install Tool
-
Site: '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'
- '.($this->passwordOK ? '
Version: '.TYPO3_version.'
':'').'
+
Site: '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'
+ '.($this->passwordOK ? '
Version: '.TYPO3_version.'
':'').'
'.($this->step?$this->stepHeader():$this->menu()).$content.'
'.$this->note123().$this->endNotes().'
'.implode($out,chr(10)).'
'; - $code = '
'.$code.'
'; + $code = ''; return '
'.$code.'
'; } @@ -4991,7 +4950,7 @@ function note123() { if ($this->mode=='123') { $c=' - +
'.$this->fontTag1.'NOTICE: Install Tool is running in \'123\' mode. Click here to disable.
'.$this->fontTag1.'NOTICE: Install Tool is running in \'123\' mode. Click here to disable.
'; return $c; } @@ -5150,6 +5109,7 @@ return $backupFile; } + } if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php']) { Index: typo3/sysext/install/mod/install.css =================================================================== --- typo3/sysext/install/mod/install.css (revision 0) +++ typo3/sysext/install/mod/install.css (revision 0) @@ -0,0 +1,246 @@ +body, p, td, a, span, input, .bodytext { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 1em; + color: #000; + text-align: left; + word-wrap: break-word; +} + +h1, +h2 { + font-family: verdana, arial, helvetica, sans-serif; + font-weight: bold; +} + +h1 { + font-size: 14pt; +} + +h2 { + font-size: 12pt; +} + +a { + color: #600; + text-decoration: none; +} + +a:active { + text-decoration: none; +} + +a:hover { + color: #006; + text-decoration: underline; +} + +table { + width: 100%; +} + +th { + font-size: 10pt; + font-weight: bold; +} + +textarea { + width: 99%; +} + +.outerTable { + width: 80%; + max-width: 900px; +} + +* html .outerTable { + width: 900px; +} + +.smallOuterTable { + width:600px; +} + +.logo { + text-align: center; +} + +.smalltext { + font-size: 0.9em; + display: inline; +} + +.bodytext { + display: inline; +} + +.size3text { + font-size: 1.2em; +} + +.size4text { + font-size: 1.5em; +} + +.generalTableBackground { + background-color: #efeff4; +} + +.activeMenu { + background-color: #66a552; +} + +.createBorder { + background-color: black; +} + +.warning { + background-color: #ffc67f; +} +.success { + background-color: #af5; +} + +.editFile { + text-align: center; + max-width: 900px; + width: 80%; + margin: auto; +} + +* html .editFile { + width: 900px; +} + +.error { + background-color: #f66; +} + +.siteInfo { + color: navy; +} + +.note { + background-color: #d7dbe2; +} + +.updateWizardBoxes { + border: 1px solid; + margin: 10px; + padding: 0px 10px 10px; +} + + +.tcaTableHeader { + background-color: #b3b7bd; +} + +/* Menus */ +#imageMenu, +#menu { + width: 300px; + background-color: #b3b7bd; +} + +#imageMenu td.generalTableBackground a, +#menu td.generalTableBackground a, +#menu td.activeMenu a { + display: block; + text-decoration: none; +} + +#imageMenu td.generalTableBackground a:hover, +#menu td.generalTableBackground a:hover { + display: block; + background-color: #fa8800; + text-decoration: none; +} + +#imageMenu td.activeMenu a span, +#imageMenu td.generalTableBackground a:hover span, +#menu td.activeMenu a span, +#menu td.generalTableBackground a:hover span { + color: #fff; + text-decoration: none; +} + +#imageMenu td.activeMenu a, +#menu td.activeMenu a { + color: #fff; + text-decoration: none; +} + + +/* phpinfo */ +pre { + margin: 0px; + font-family: monospace; +} +.phpinfo table { + border-collapse: collapse; +} +.center { + text-align: center; +} +.center table { + margin-left: auto; + margin-right: auto; + text-align: left; +} + +.center th { + text-align: center !important; +} +.phpinfo td, +.phpinfo th { + border: 1px solid #000000; + font-size: 75%; + vertical-align: baseline; +} + +h1 { + font-size: 150%; +} + +h2 { + font-size: 125%; +} + +.p { + text-align: left; +} + +.e { + background-color: #ccf; + font-weight: bold; + color: #000000; +} + +.h { + background-color: #99c; + font-weight: bold; + color: #000000; +} + +.v { + background-color: #ccc; + color: #000000; +} + +.vr { + background-color: #ccc; + text-align: right; + color: #000000; +} + +.phpinfo img { + float: right; + border: 0px; +} + +.phpinfo hr { + width: 600px; + background-color: #ccc; + border: 0px; + height: 1px; + color: #000000; +}