mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
fix not return app-placeholder icon, if app is not installed or has not navbar icon, also changed placeholder from "app" to "app-indicator"
This commit is contained in:
parent
1f23433506
commit
7211dc789e
@ -179,7 +179,7 @@ class Image
|
||||
'mouse_scroll_lr' => 'arrows',
|
||||
'mouse_scroll_ud' => 'arrow-down-up',
|
||||
'move' => 'scissors',
|
||||
'navbar' => 'app',
|
||||
'navbar' => 'app-indicator',
|
||||
'new' => 'file-earmark-plus',
|
||||
'new_leaf' => 'file-earmark-plus',
|
||||
'next' => 'arrow-bar-right',
|
||||
@ -430,7 +430,8 @@ class Image
|
||||
$url = $webserver_url.$image_map['vfs'][$image.$extension];
|
||||
}
|
||||
// then our globals lookup table $global2bootstrap, but not for $app/navbar
|
||||
elseif(($image !== 'navbar' || $app === 'api') && (isset($image_map['global'][$app.'/'.$image]) || isset($image_map['global'][$image])))
|
||||
elseif(($image !== 'navbar' || $app === 'api' || !isset($image_map[$app][$image])) &&
|
||||
(isset($image_map['global'][$app.'/'.$image]) || isset($image_map['global'][$image])))
|
||||
{
|
||||
$image = $image_map['global'][$app.'/'.$image] ?? $image_map['global'][$image];
|
||||
// allow redirects like "calendar/yearview" --> "calendar/bi-12-square"
|
||||
|
Loading…
Reference in New Issue
Block a user