Index: typo3/sysext/install/mod/install.css
===================================================================
--- typo3/sysext/install/mod/install.css (revision 5986)
+++ typo3/sysext/install/mod/install.css (working copy)
@@ -3,17 +3,17 @@
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 {
@@ -21,7 +21,7 @@
}
a {
- color: #600;
+ color: #600;
text-decoration: none;
}
@@ -30,7 +30,7 @@
}
a:hover {
- color: #006;
+ color: #006;
text-decoration: underline;
}
@@ -38,9 +38,9 @@
width: 100%;
}
-th {
- font-size: 10pt;
- font-weight: bold;
+th {
+ font-size: 10pt;
+ font-weight: bold;
}
textarea {
@@ -93,13 +93,6 @@
background-color: black;
}
-.warning {
- background-color: #ffc67f;
-}
-.success {
- background-color: #af5;
-}
-
.editFile {
text-align: center;
max-width: 900px;
@@ -111,21 +104,13 @@
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;
}
@@ -134,6 +119,49 @@
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 {
@@ -148,10 +176,10 @@
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;
}
@@ -172,7 +200,7 @@
/* phpinfo */
pre {
- margin: 0px;
+ margin: 0px;
font-family: monospace;
}
.phpinfo table {
@@ -181,19 +209,19 @@
.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;
}
@@ -210,37 +238,37 @@
}
.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;
}
Index: typo3/sysext/install/mod/class.tx_install.php
===================================================================
--- typo3/sysext/install/mod/class.tx_install.php (revision 5986)
+++ typo3/sysext/install/mod/class.tx_install.php (working copy)
@@ -552,16 +552,16 @@
$headCode='Header legend';
+ $this->message($headCode, 'Notice!', '
+ Indicates that something is important to be aware of.
+ This does not 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 not 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 potential error.
@@ -3371,7 +3371,7 @@
$out='';
$out.='
| '.$this->fw('Update required tables').' |
- '.$this->fw('COMPARE').'
+ ' . $this->fw('COMPARE') . '
'.$this->fw(' ').' |
'.$this->fw(' ').' |
';
@@ -3379,7 +3379,7 @@
$out.='
| '.$this->fw('Dump static data').' |
'.$this->fw(' ').' |
- '.$this->fw('IMPORT').' |
+ ' . $this->fw('IMPORT') . ' |
'.$this->fw(' ').' |
';
@@ -3401,27 +3401,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='';
@@ -4731,30 +4731,29 @@
* @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][]='
- ' . ($icon ? '
' : '') . '' . $this->fw($short_string) . '
' . (trim($long_string) ? '
+ ' . '' . $this->fw($short_string) . '
' . (trim($long_string) ? '
' . $this->fw($long_string) . '
|
' : '');
}
}
@@ -4959,7 +4958,7 @@
function note123() {
if ($this->mode=='123') {
$c='';
return $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.