mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
API: Allow custom category icons
This commit is contained in:
parent
fed41622c2
commit
a95f745018
@ -260,7 +260,7 @@ class admin_categories
|
||||
if(!$content['appname']) $content['appname'] = $appname;
|
||||
if($content['data']['icon'])
|
||||
{
|
||||
$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
|
||||
$content['icon_url'] = Api\Image::find('vfs',$content['data']['icon']) ?: self::icon_url($content['data']['icon']);
|
||||
}
|
||||
|
||||
$sel_options['icon'] = self::get_icons();
|
||||
@ -363,8 +363,18 @@ class admin_categories
|
||||
}
|
||||
}
|
||||
$dir->close();
|
||||
asort($icons);
|
||||
}
|
||||
|
||||
// Get custom icons
|
||||
$map = Api\Image::map();
|
||||
if(array_key_exists('vfs', $map))
|
||||
{
|
||||
foreach($map['vfs'] as $name => $path)
|
||||
{
|
||||
$icons[$name] = $name;
|
||||
}
|
||||
}
|
||||
asort($icons);
|
||||
return $icons;
|
||||
}
|
||||
|
||||
@ -420,7 +430,7 @@ class admin_categories
|
||||
$row['level_spacer'] = str_repeat(' ',$row['level']);
|
||||
}
|
||||
|
||||
if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
|
||||
if ($row['data']['icon']) $row['icon_url'] = Api\Image::find('vfs',$row['data']['icon']) ?: self::icon_url($row['data']['icon']);
|
||||
|
||||
$row['subs'] = $row['children'] ? count($row['children']) : 0;
|
||||
|
||||
|
@ -179,6 +179,9 @@ select#admin-mailaccount_ident_id {
|
||||
#admin-acl {width:99%;}
|
||||
|
||||
#admin-categories-edit_owner {overflow-y: auto;}
|
||||
#admin-categories-edit_icon_url {
|
||||
max-width: 32px;
|
||||
}
|
||||
|
||||
/*
|
||||
Admin command
|
||||
|
@ -187,6 +187,9 @@ select#admin-mailaccount_ident_id {
|
||||
#admin-categories-edit_owner {
|
||||
overflow-y: auto;
|
||||
}
|
||||
#admin-categories-edit_icon_url {
|
||||
max-width: 32px;
|
||||
}
|
||||
/*
|
||||
Admin command
|
||||
*/
|
||||
@ -209,7 +212,7 @@ Admin command
|
||||
@media all {
|
||||
div.dhtmlxTree td.standartTreeRow span.selectedTreeRow {
|
||||
background-color: rgba(102, 153, 204, 0.7);
|
||||
color: #1E1E1E;
|
||||
color: #1e1e1e;
|
||||
}
|
||||
/* #############################################################################
|
||||
// iframe
|
||||
|
Loading…
Reference in New Issue
Block a user