Fix transparency and algorithm for calculating severity icon
@@ -28,7 +28,7 @@ class IndexComposer
|
|||||||
$withData = [
|
$withData = [
|
||||||
'systemStatus' => 'danger',
|
'systemStatus' => 'danger',
|
||||||
'systemMessage' => trans('cachet.service.bad'),
|
'systemMessage' => trans('cachet.service.bad'),
|
||||||
'favicon' => 'favicon',
|
'favicon' => 'favicon-high-alert',
|
||||||
];
|
];
|
||||||
|
|
||||||
if (Component::notStatus(1)->count() === 0) {
|
if (Component::notStatus(1)->count() === 0) {
|
||||||
@@ -40,15 +40,13 @@ class IndexComposer
|
|||||||
$withData = [
|
$withData = [
|
||||||
'systemStatus' => 'success',
|
'systemStatus' => 'success',
|
||||||
'systemMessage' => trans('cachet.service.good'),
|
'systemMessage' => trans('cachet.service.good'),
|
||||||
|
'favicon' => 'favicon',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
|
if (Component::whereIn('status', [2, 3])->count() > 0) {
|
||||||
// Determine favicon to use
|
$withData['favicon'] = 'favicon-medium-alert';
|
||||||
if (Component::where('status', 4)->count() > 0 || Incident::where('status', 2)->count() > 0) {
|
}
|
||||||
$withData['favicon'] = 'favicon-high-alert';
|
|
||||||
} elseif (Component::whereIn('status', [2, 3])->count() > 0 || Incident::whereIn('status', [1, 3])->count() > 0) {
|
|
||||||
$withData['favicon'] = 'favicon-medium-alert';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$view->with($withData);
|
$view->with($withData);
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
public/img/favicon-high-alert.ico
Executable file → Normal file
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
BIN
public/img/favicon-medium-alert.ico
Executable file → Normal file
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |