Project

General

Profile

Download (12.5 KB)

Bug #21082 » 11989_v3.diff

Administrator Admin, 2009-09-20 18:51

View differences:

typo3/sysext/install/mod/install.css (working copy)
font-size: 1em;
color: #000;
text-align: left;
word-wrap: break-word;
word-wrap: break-word;
}
h1,
h2 {
font-family: verdana, arial, helvetica, sans-serif;
h1,
h2 {
font-family: verdana, arial, helvetica, sans-serif;
font-weight: bold;
}
h1 {
font-size: 14pt;
font-size: 14pt;
}
h2 {
......
}
a {
color: #600;
color: #600;
text-decoration: none;
}
......
}
a:hover {
color: #006;
color: #006;
text-decoration: underline;
}
......
width: 100%;
}
th {
font-size: 10pt;
font-weight: bold;
th {
font-size: 10pt;
font-weight: bold;
}
textarea {
......
background-color: black;
}
.warning {
background-color: #ffc67f;
}
.success {
background-color: #af5;
}
.editFile {
text-align: center;
max-width: 900px;
......
width: 900px;
}
.error {
background-color: #f66;
}
.siteInfo {
color: navy;
}
.note {
background-color: #d7dbe2;
}
.updateWizardBoxes {
border: 1px solid;
margin: 10px;
border: 1px solid;
margin: 10px;
padding: 0px 10px 10px;
}
......
background-color: #b3b7bd;
}
/* Styles for messages (matching flash messages) */
.typo3-message {
padding: 6px;
padding-left: 26px;
margin-bottom: 4px;
background-repeat: no-repeat;
background-position: 5px 7px;
border: 1px solid;
}
.message-notice {
background-color: #fff;
border-color: #dee0e1;
}
.message-information {
background-image: url("../../../gfx/information.png");
background-color: #dfedf8;
border-color: #bccfe4;
}
.message-ok {
background-image: url("../../../gfx/ok.png");
background-color: #dfd;
border-color: #beb;
}
.message-warning {
background-image: url("../../../gfx/warning.png");
background-color: #ffd;
border-color: #f6ea68;
}
.message-error {
background-image: url("../../../gfx/error.png");
background-color: #fcc;
border-color: #ebb;
}
/* Colors to match above message styles, but without the icon in the background */
.warning {
background-color: #ffd;
}
.notice {
background-color: #fff;
}
/* Menus */
#imageMenu,
#menu {
......
text-decoration: none;
}
#imageMenu td.generalTableBackground a:hover,
#imageMenu td.generalTableBackground a:hover,
#menu td.generalTableBackground a:hover {
display: block;
background-color: #fa8800;
background-color: #fa8800;
text-decoration: none;
}
......
/* phpinfo */
pre {
margin: 0px;
margin: 0px;
font-family: monospace;
}
.phpinfo table {
......
.center {
text-align: center;
}
.center table {
margin-left: auto;
margin-right: auto;
.center table {
margin-left: auto;
margin-right: auto;
text-align: left;
}
.center th {
text-align: center !important;
.center th {
text-align: center !important;
}
.phpinfo td,
.phpinfo th {
border: 1px solid #000000;
font-size: 75%;
.phpinfo td,
.phpinfo th {
border: 1px solid #000000;
font-size: 75%;
vertical-align: baseline;
}
......
}
.e {
background-color: #ccf;
font-weight: bold;
background-color: #ccf;
font-weight: bold;
color: #000000;
}
.h {
background-color: #99c;
font-weight: bold;
background-color: #99c;
font-weight: bold;
color: #000000;
}
.v {
background-color: #ccc;
background-color: #ccc;
color: #000000;
}
.vr {
background-color: #ccc;
text-align: right;
background-color: #ccc;
text-align: right;
color: #000000;
}
.phpinfo img {
float: right;
float: right;
border: 0px;
}
.phpinfo hr {
width: 600px;
background-color: #ccc;
border: 0px;
height: 1px;
width: 600px;
background-color: #ccc;
border: 0px;
height: 1px;
color: #000000;
}
typo3/sysext/install/mod/class.tx_install.php (working copy)
$headCode='Header legend';
$this->message($headCode, 'Notice!', '
Indicates that something is important to be aware of.
This does <em>not</em> indicate an error.
',1);
$this->message($headCode, 'Just information', '
This is a simple message with some information about something.
');
$this->message($headCode, 'Check was successful', '
Indicates that something was checked and returned an expected result.
',-1);
$this->message($headCode, 'Notice!', '
Indicates that something is important to be aware of.
This does <em>not</em> indicate an error.
',1);
$this->message($headCode, 'Warning!', '
Indicates that something may very well cause trouble and you should definitely look into it before proceeding.
This indicates a <em>potential</em> error.
......
$out='';
$out.='<tr>
<td nowrap="nowrap"><strong>'.$this->fw('Update required tables').'</strong></td>
<td'.($action_type=='cmpFile|CURRENT_TABLES'?' class="note"':'').'>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=cmpFile|CURRENT_TABLES#bottom').'"><strong>COMPARE</strong></a>').'</td>
<td' . ($action_type == 'cmpFile|CURRENT_TABLES' ? ' class="notice"' : '') . '>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=cmpFile|CURRENT_TABLES#bottom') . '"><strong>COMPARE</strong></a>') . '</td>
<td>'.$this->fw('&nbsp;').'</td>
<td>'.$this->fw('&nbsp;').'</td>
</tr>';
......
$out.='<tr>
<td nowrap="nowrap"><strong>'.$this->fw('Dump static data').'</strong></td>
<td>'.$this->fw('&nbsp;').'</td>
<td nowrap="nowrap"'.($action_type=='import|CURRENT_STATIC'?' class="note"':'').'>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=import|CURRENT_STATIC#bottom').'"><strong>IMPORT</strong></a>').'</td>
<td nowrap="nowrap"' . ($action_type == 'import|CURRENT_STATIC' ? ' class="notice"' : '').'>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=import|CURRENT_STATIC#bottom') . '"><strong>IMPORT</strong></a>') . '</td>
<td>'.$this->fw('&nbsp;').'</td>
</tr>';
......
$out.='<tr>
<td nowrap="nowrap">'.$this->fw($fShortName.' ('.t3lib_div::formatSize(filesize($file)).')').'</td>
<td'.($action_type=='cmpFile|'.$file?' class="note"':'').'>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=cmpFile|'.rawurlencode($file).'#bottom').'"><strong>COMPARE</strong></a>').'</td>
<td nowrap="nowrap"'.($action_type=='import|'.$file?' class="note"':'').'>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=import|'.rawurlencode($file).'#bottom').'"><strong>IMPORT'.$spec1.$spec2.'</strong></a>').'</td>
<td nowrap="nowrap"'.($action_type=='view|'.$file?' class="note"':'').'>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=view|'.rawurlencode($file).'#bottom').'"><strong>VIEW'.$spec1.$spec2.'</strong></a>').'</td>
<td' . ($action_type == 'cmpFile|' . $file ? ' class="notice"' : '') . '>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=cmpFile|' . rawurlencode($file) . '#bottom') . '"><strong>COMPARE</strong></a>') . '</td>
<td nowrap="nowrap"' . ($action_type == 'import|' . $file ? ' class="notice"' : '') . '>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=import|' . rawurlencode($file) . '#bottom') . '"><strong>IMPORT' . $spec1 . $spec2 . '</strong></a>') . '</td>
<td nowrap="nowrap"' . ($action_type == 'view|' . $file ? ' class="notice"' : '') . '>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=view|' . rawurlencode($file) . '#bottom') . '"><strong>VIEW' . $spec1 . $spec2 . '</strong></a>') . '</td>
</tr>';
}
// TCA
$out.='<tr>
<td></td>
<td colspan="3"'.($action_type=="cmpTCA|"?' class="note"':'').'><strong>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=cmpTCA|#bottom').'">Compare with $TCA</a>').'</strong></td>
<td colspan="3"' . ($action_type == "cmpTCA|" ? ' class="notice"' : '') . '><strong>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=cmpTCA|#bottom') . '">Compare with $TCA</a>') . '</strong></td>
</tr>';
$out.='<tr>
<td></td>
<td colspan="3"'.($action_type=="adminUser|"?' class="note"':'').'><strong>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=adminUser|#bottom').'">Create "admin" user</a>').'</strong></td>
<td colspan="3"' . ($action_type == "adminUser|" ? ' class="notice"' : '') . '><strong>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=adminUser|#bottom') . '">Create "admin" user</a>') . '</strong></td>
</tr>';
$out.='<tr>
<td></td>
<td colspan="3"'.($action_type=="UC|"?' class="note"':'').'><strong>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=UC|#bottom').'">Reset user preferences</a>').'</strong></td>
<td colspan="3"' . ($action_type == "UC|" ? ' class="notice"' : '') . '><strong>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=UC|#bottom') . '">Reset user preferences</a>') . '</strong></td>
</tr>';
$out.='<tr>
<td></td>
<td colspan="3"'.($action_type=="cache|"?' class="note"':'').'><strong>'.$this->fw('<a href="'.htmlspecialchars($this->action.'&TYPO3_INSTALL[database_type]=cache|#bottom').'">Clear tables</a>').'</strong></td>
<td colspan="3"' . ($action_type == "cache|" ? ' class="notice"' : '') . '><strong>' . $this->fw('<a href="' . htmlspecialchars($this->action . '&TYPO3_INSTALL[database_type]=cache|#bottom') . '">Clear tables</a>') . '</strong></td>
</tr>';
$theForm='<table border="0" cellpadding="2" cellspacing="2">'.$out.'</table>';
......
* @return void
*/
function printSection($head, $short_string, $long_string, $type) {
$icon='';
$cssClass =' class="note"';
switch($type) {
case '3':
$cssClass =' class="error"';
$icon = 'gfx/icon_fatalerror.gif';
break;
case '2':
$cssClass =' class="warning"';
$icon = 'gfx/icon_warning.gif';
case 3:
$cssClass = ' class="typo3-message message-error"';
break;
case '1':
$icon = 'gfx/icon_note.gif';
case 2:
$cssClass = ' class="typo3-message message-warning"';
break;
case '-1':
$cssClass =' class="success"';
$icon = 'gfx/icon_ok.gif';
case 1:
$cssClass =' class="typo3-message message-notice"';
break;
case 0:
$cssClass = ' class="typo3-message message-information"';
break;
case -1:
$cssClass = ' class="typo3-message message-ok"';
break;
}
if (!trim($short_string)) {
$this->sections[$head][]='';
} else {
$this->sections[$head][]='
<tr><td' . $cssClass . ' nowrap="nowrap">' . ($icon ? '<img src="' . $this->backPath . $icon . '" width="18" height="16" align="top" alt="">' : '') . '<strong>' . $this->fw($short_string) . '</strong></td></tr>' . (trim($long_string) ? '
<tr><td' . $cssClass . ' nowrap="nowrap">' . '<strong>' . $this->fw($short_string) . '</strong></td></tr>' . (trim($long_string) ? '
<tr><td>' . $this->fw($long_string) . '<br /><br /></td></tr>' : '');
}
}
......
function note123() {
if ($this->mode=='123') {
$c='<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td class="note" nowrap="nowrap"><img src="'.$this->backPath.'gfx/icon_note.gif" width="18" height="16" align="top" alt=""><strong>'.$this->fontTag1.'NOTICE: Install Tool is running in \'123\' mode. <a href="'.$this->scriptSelf.'">Click here to disable.</a></span></strong></td></tr>
<tr><td class="notice" nowrap="nowrap"><img src="' . $this->backPath . 'gfx/icon_note.gif" width="18" height="16" align="top" alt=""><strong>' . $this->fontTag1 . 'NOTICE: Install Tool is running in \'123\' mode. <a href="' . $this->scriptSelf . '">Click here to disable.</a></span></strong></td></tr>
</table>';
return $c;
}
(2-2/2)