fixed multiple bugs with addressbook types:

- bug #1772: custom fields for single addressbook types show in all
- removed template warning, if no template was selected
- showing type icon if available
- added "all" to type selection
- removed some weird doublicate code
This commit is contained in:
Ralf Becker 2008-10-20 19:35:18 +00:00
parent 6777a093bf
commit 00065b8247
3 changed files with 32 additions and 47 deletions

View File

@ -139,12 +139,7 @@ class addressbook_ui extends addressbook_bo
{
$org_view = $content['nm']['org_view'];
}
if ($content['nm']['col_filter']['tid'])
{
$typeselection = $content['nm']['col_filter']['tid'];
} else {
$typeselection='n';
}
}
elseif($_GET['add_list'])
{
@ -212,6 +207,8 @@ class addressbook_ui extends addressbook_bo
$content['nm'] = array_merge($content['nm'],$state);
}
}
if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
if ($this->lists_available())
{
$sel_options['filter2'] = $this->get_lists(EGW_ACL_READ,array('' => lang('none')));
@ -293,7 +290,6 @@ class addressbook_ui extends addressbook_bo
$sel_options['action']['delete_list'] = lang('Delete selected distribution list!');
}
if ($this->prefs['document_dir'])
{
$sel_options['action'][lang('Insert in document').':'] = $this->get_document_actions();
@ -308,7 +304,7 @@ class addressbook_ui extends addressbook_bo
}
else
{
$content['nm']['col_filter']['tid'] = ($typeselection ? $typeselection : 'n');
if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = 'n';
$content['nm']['header_right'] = 'addressbook.index.right';
foreach($this->content_types as $tid => $data)
{
@ -761,13 +757,10 @@ class addressbook_ui extends addressbook_bo
function get_rows(&$query,&$rows,&$readonlys,$id_only=false)
{
$do_email = $query['do_email'];
// is this wanted???
if ($query['sitemgr_display'])
{
$old_state = $GLOBALS['egw']->session->appsession($query['sitemgr_display'],'addressbook');
} else {
$old_state = $GLOBALS['egw']->session->appsession($do_email ? 'email' : 'index','addressbook');
}
$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
$old_state = $GLOBALS['egw']->session->appsession($what,'addressbook',$query);
if (!isset($this->org_views[(string) $query['org_view']])) // we dont have an org view, unset the according col_filters
{
if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
@ -807,12 +800,6 @@ class addressbook_ui extends addressbook_bo
{
$query['searchletter'] = ''; // reset lettersearch if viewing the contacts of one organisation
}
if ($query['sitemgr_display'])
{
$old_state = $GLOBALS['egw']->session->appsession($query['sitemgr_display'],'addressbook',$query);
} else {
$GLOBALS['egw']->session->appsession(($do_email ? 'email' : 'index'),'addressbook',$query);
}
// save the state of the index in the user prefs
$state = serialize(array(
'filter' => $query['filter'],
@ -822,15 +809,9 @@ class addressbook_ui extends addressbook_bo
'col_filter' => array('tid' => $query['col_filter']['tid']),
'org_view' => $query['org_view'],
));
if ($state != $this->prefs[($query['sitemgr_display'] ? $query['sitemgr_display'].'_state' : 'index_state')])
if ($state != $this->prefs[$what.'_state'])
{
$GLOBALS['egw']->preferences->add('addressbook',($query['sitemgr_display'] ? $query['sitemgr_display'].'_state' : 'index_state'),$state);
// save prefs, but do NOT invalid the cache (unnecessary)
$GLOBALS['egw']->preferences->save_repository(false,'user',false);
}
if ($state != $this->prefs[$do_email ? 'email_state' : 'index_state'])
{
$GLOBALS['egw']->preferences->add('addressbook',$do_email ? 'email_state' : 'index_state',$state);
$GLOBALS['egw']->preferences->add('addressbook',$what.'_state',$state);
// save prefs, but do NOT invalid the cache (unnecessary)
$GLOBALS['egw']->preferences->save_repository(false,'user',false);
}
@ -1158,12 +1139,6 @@ class addressbook_ui extends addressbook_bo
$icon = 'private';
$label = lang('private');
}
elseif ($tid != 'n')
{
// ToDo Conny: tid-icons
$icon = '';
$label = $tid;
}
elseif ($GLOBALS['egw']->accounts->get_type($owner) == 'g')
{
$icon = 'group';
@ -1174,6 +1149,12 @@ class addressbook_ui extends addressbook_bo
$icon = 'personal';
$label = $owner == $this->user ? lang('personal') : $GLOBALS['egw']->common->grab_owner_name($owner);
}
// show tid icon for tid!='n' AND only if one is defined
if ($tid != 'n' && $this->content_types[$tid]['options']['icon'])
{
$icon = $this->content_types[$tid]['options']['icon'];
$label = $this->content_types[$tid]['name'].' ('.$label.')';
}
}
/**
@ -1495,7 +1476,7 @@ class addressbook_ui extends addressbook_bo
$GLOBALS['egw_info']['flags']['include_xajax'] = true;
if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template']))
if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template'] ? $this->content_types[$content['tid']]['options']['template'] : 'addressbook.edit'))
{
$content['msg'] = lang('WARNING: Template "%1" not found, using default template instead.', $this->content_types[$content['tid']]['options']['template'])."\n";
$content['msg'] .= lang('Please update the templatename in your customfields section!');
@ -1682,7 +1663,7 @@ $readonlys['button[vcard]'] = true;
{
$content['no_tid'] = true;
}
if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template']))
if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template'] ? $this->content_types[$content['tid']]['options']['template'] : 'addressbook.edit'))
{
$content['msg'] = lang('WARNING: Template "%1" not found, using default template instead.', $this->content_types[$content['tid']]['options']['template'])."\n";
$content['msg'] .= lang('Please update the templatename in your customfields section!');

View File

@ -2,7 +2,7 @@
/**
* eGroupWare - eTemplates for Application addressbook
* http://www.egroupware.org
* generated by soetemplate::dump4setup() 2008-10-20 12:12
* generated by soetemplate::dump4setup() 2008-10-20 22:00
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package addressbook
@ -34,12 +34,14 @@ $templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang'
$templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165513081',);
$templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1165512859',);
$templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:22:",$cont[no_private_cfs]";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1200540144',);
$templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:32:"$cont[tid],$cont[no_private_cfs]";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1200540144',);
$templ_data[] = array('name' => 'addressbook.edit.custom_private','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:2:",1";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1200540111',);
$templ_data[] = array('name' => 'addressbook.edit.custom_private','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:12:"$cont[tid],1";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1200540111',);
$templ_data[] = array('name' => 'addressbook.edit.details','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:7:{s:2:"c1";s:4:",top";s:2:"c2";s:11:"row_off,top";s:2:"h1";s:9:",@cat_tab";s:2:"c4";s:11:"row_off,top";s:2:"h3";s:20:",@disable_change_org";s:2:"c3";s:6:"row_on";s:2:"c5";s:6:"row_on";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:12:"3,,width:99%";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"edit";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Notes";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"6,50";s:4:"name";s:4:"note";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"check";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:31:"change all organisation members";s:4:"name";s:10:"change_org";s:4:"span";s:3:"all";s:4:"help";s:73:"Apply changes to all members, whose fields have the same previous content";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:1:"1";s:5:"label";s:7:"Created";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";}}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:7:"created";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";}}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"modified";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165511695',);
$templ_data[] = array('name' => 'addressbook.edit.details','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:2:"c1";s:4:",top";s:2:"c2";s:11:"row_off,top";s:2:"h1";s:9:",@cat_tab";s:2:"h3";s:20:",@disable_change_org";s:2:"c3";s:6:"row_on";s:2:"c7";s:6:"row_on";s:2:"c6";s:11:"row_off,top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:12:"3,,width:99%";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"edit";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Notes";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"6,50";s:4:"name";s:4:"note";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"check";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:31:"change all organisation members";s:4:"name";s:10:"change_org";s:4:"span";s:3:"all";s:4:"help";s:73:"Apply changes to all members, whose fields have the same previous content";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"home";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Last date";}s:1:"C";a:2:{s:4:"type";s:4:"link";s:4:"name";s:9:"last_link";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Next date";}s:1:"C";a:2:{s:4:"type";s:4:"link";s:4:"name";s:9:"next_link";}}i:6;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:1:"1";s:5:"label";s:7:"Created";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";}}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:7:"created";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}}i:7;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";}}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"modified";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}}}s:4:"rows";i:7;s:4:"cols";i:3;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165511695',);
@ -110,6 +112,8 @@ $templ_data[] = array('name' => 'addressbook.index.org_rows','template' => '','l
$templ_data[] = array('name' => 'addressbook.index.right','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:6:"select";s:5:"label";s:4:"Type";s:4:"name";s:15:"col_filter[tid]";s:4:"help";s:23:"Select addressbook type";s:8:"onchange";i:1;}}','size' => '','style' => '','modified' => '1145286218',);
$templ_data[] = array('name' => 'addressbook.index.right','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:6:"select";s:4:"name";s:15:"col_filter[tid]";s:4:"help";s:23:"Select addressbook type";s:8:"onchange";i:1;s:4:"size";s:3:"All";s:5:"label";s:4:"Type";}}','size' => '','style' => '','modified' => '1145286218',);
$templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','lang' => '','group' => '0','version' => '1.3.005','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:6:"search";s:5:"label";s:15:"Advanced search";s:7:"onclick";s:166:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.search\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:3:"add";s:5:"label";s:3:"Add";s:4:"help";s:17:"Add a new contact";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:12:",rightPadAdd";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:6:"manual";s:4:"span";s:12:",rightPadAdd";}}}','size' => '','style' => '.rightPadAdd { width: 30px; }','modified' => '1169256471',);
$templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:6:"search";s:5:"label";s:15:"Advanced search";s:7:"onclick";s:170:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.search\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:3:"add";s:5:"label";s:3:"Add";s:4:"help";s:17:"Add a new contact";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:12:",rightPadAdd";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:6:"manual";s:4:"span";s:12:",rightPadAdd";}}}','size' => '','style' => '.rightPadAdd { width: 30px; }','modified' => '1169256471',);

View File

@ -54,7 +54,7 @@
</grid>
</template>
<template id="addressbook.edit.general" template="" lang="" group="0" version="1.5.002">
<grid height="258">
<grid height="286">
<columns>
<column/>
<column/>
@ -350,7 +350,7 @@
</rows>
</grid>
</template>
<template id="addressbook.edit.custom" template="" lang="" group="0" version="1.5.001">
<template id="addressbook.edit.custom" template="" lang="" group="0" version="1.5.002">
<grid width="100%" height="258" class="row_on" spacing="0" padding="0" overflow="auto">
<columns>
<column/>
@ -360,12 +360,12 @@
<description value="Custom fields"/>
</row>
<row height="100%">
<customfields options=",$cont[no_private_cfs]"/>
<customfields options="$cont[tid],$cont[no_private_cfs]"/>
</row>
</rows>
</grid>
</template>
<template id="addressbook.edit.custom_private" template="" lang="" group="0" version="1.5.001">
<template id="addressbook.edit.custom_private" template="" lang="" group="0" version="1.5.002">
<grid width="100%" height="258" class="row_on" spacing="0" padding="0" overflow="auto">
<columns>
<column/>
@ -375,7 +375,7 @@
<description value="Custom fields"/>
</row>
<row height="100%">
<customfields options=",1"/>
<customfields options="$cont[tid],1"/>
</row>
</rows>
</grid>
@ -467,7 +467,7 @@
</rows>
</grid>
</template>
<template id="addressbook.edit" template="" lang="" group="0" version="1.5.005">
<template id="addressbook.edit" template="" lang="" group="0" version="1.5.006">
<grid>
<columns>
<column width="450"/>
@ -601,7 +601,7 @@
</row>
<row disabled="@hidebuttons">
<hbox>
<button label="Edit" id="button[edit]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
<button label="Edit" id="button[edit]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]'),'_blank','dependent=yes,width=850,height=460,scrollbars=yes,status=yes'); return false;"/>
<button label="Copy" id="button[copy]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]&amp;makecp=1'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
<button label="vCard" id="button[vcard]" statustext="download this contact as vCard file"/>
<button label="Save" id="button[save]" accesskey="s"/>