extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not return app-placeholder icon, if app is not installed or has not navbar icon, also changed placeholder from "app" to "app-indicator"

Browse Source
This commit is contained in:
ralf 2024-09-26 14:59:52 +02:00
parent 1f23433506
commit 7211dc789e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Image.php
View File

@ -179,7 +179,7 @@ class Image
'mouse_scroll_lr' => 'arrows', 'mouse_scroll_lr' => 'arrows',
'mouse_scroll_ud' => 'arrow-down-up', 'mouse_scroll_ud' => 'arrow-down-up',
'move' => 'scissors', 'move' => 'scissors',
'navbar' => 'app', 'navbar' => 'app-indicator',
'new' => 'file-earmark-plus', 'new' => 'file-earmark-plus',
'new_leaf' => 'file-earmark-plus', 'new_leaf' => 'file-earmark-plus',
'next' => 'arrow-bar-right', 'next' => 'arrow-bar-right',
@ -430,7 +430,8 @@ class Image
$url = $webserver_url.$image_map['vfs'][$image.$extension]; $url = $webserver_url.$image_map['vfs'][$image.$extension];
} }
// then our globals lookup table $global2bootstrap, but not for $app/navbar // 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]; $image = $image_map['global'][$app.'/'.$image] ?? $image_map['global'][$image];
// allow redirects like "calendar/yearview" --> "calendar/bi-12-square" // allow redirects like "calendar/yearview" --> "calendar/bi-12-square"