holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change addressbook custom icons to be based on VFS image dir + name instead of previous per type

Browse Source
This commit is contained in:
Nathan Gray 2014-11-19 22:06:30 +00:00
parent 4da6635a51
commit 459c647837
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_egw_record.inc.php
View File

@ -118,7 +118,7 @@ class addressbook_egw_record implements importexport_iface_egw_record
$ui->type_icon($this->owner, $this->private, $this->tid, $icon, $label);
// Specific photo
return $this->jpegphoto ? egw_framework::link('/index.php',$ui->photo_src($this->identifier,$this->jpegphoto)):'addressbook/'.$icon;
return $this->jpegphoto ? egw_framework::link('/index.php',$ui->photo_src($this->identifier,$this->jpegphoto)):$icon;
}
/**
* saves record into backend

6
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1741,6 +1741,12 @@ window.egw_LAB.wait(function() {
$label = $owner == $this->user ? lang('personal') : common::grab_owner_name($owner);
}
// show tid icon for tid!='n' AND only if one is defined
if ($tid != 'n' && common::image('addressbook',$this->content_types[$tid]['name']))
{
$icon = common::image('addressbook',$this->content_types[$tid]['name']);
}
// Legacy - from when icons could be anywhere
if ($tid != 'n' && $this->content_types[$tid]['options']['icon'])
{
$icon = $this->content_types[$tid]['options']['icon'];

26
addressbook/templates/default/admin.types.xet
View File

@ -4,32 +4,6 @@
<template id="addressbook.admin.types" template="" lang="" group="0" version="">
<vbox>
<template id="admin.customfields.types" content="content_types"/>
<grid id="content_type_options">
<columns>
<column/>
<column/>
<column/>
</columns>
<rows>
<row>
<hbox span="all">
<description value="Options for type " class="header"/>
<description id="type" no_lang="1" font_style="b"/>
<description/>
</hbox>
</row>
<row>
<description value="Icon"/>
<textbox id="icon" size="40"/>
<description value="Choose an icon for this contact type"/>
</row>
<row>
<description value="Template"/>
<textbox id="template" size="40"/>
<description value="Chosse an eTemplate for this contact type"/>
</row>
</rows>
</grid>
<button label="Save" id="save"/>
</vbox>
<styles>.header{