Index: typo3/sysext/install/mod/class.tx_install.php
===================================================================
--- typo3/sysext/install/mod/class.tx_install.php (revision 5957)
+++ typo3/sysext/install/mod/class.tx_install.php (working copy)
@@ -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,23 @@
* @return void
*/
function printSection($head, $short_string, $long_string, $type) {
- $icon='';
- $cssClass =' class="note"';
+ $cssClass =' class="typo3-message message-notice"';
switch($type) {
case '3':
- $cssClass =' class="error"';
- $icon = 'gfx/icon_fatalerror.gif';
+ $cssClass =' class="typo3-message message-error"';
break;
case '2':
- $cssClass =' class="warning"';
- $icon = 'gfx/icon_warning.gif';
+ $cssClass =' class="typo3-message message-warning"';
break;
- case '1':
- $icon = 'gfx/icon_note.gif';
- break;
case '-1':
- $cssClass =' class="success"';
- $icon = 'gfx/icon_ok.gif';
+ $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 +4952,7 @@
function note123() {
if ($this->mode=='123') {
$c='';
return $c;
}
Index: typo3/sysext/install/mod/install.css
===================================================================
--- typo3/sysext/install/mod/install.css (revision 5957)
+++ typo3/sysext/install/mod/install.css (working copy)
@@ -93,13 +93,6 @@
background-color: black;
}
-.warning {
- background-color: #ffc67f;
-}
-.success {
- background-color: #af5;
-}
-
.editFile {
text-align: center;
max-width: 900px;
@@ -111,18 +104,10 @@
width: 900px;
}
-.error {
- background-color: #f66;
-}
-
.siteInfo {
color: navy;
}
-.note {
- background-color: #d7dbe2;
-}
-
.updateWizardBoxes {
border: 1px solid;
margin: 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 8px;
+ 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 {
'.$this->fontTag1.'NOTICE: Install Tool is running in \'123\' mode. Click here to disable.