From a8dde2649e881d717c8d48c208d3f0df232be12e Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 15 May 2012 15:53:14 +0000 Subject: [PATCH] * Addressbook: fixed not working changing of organisation members, also place this feature more prominent beside buttons --- addressbook/inc/class.addressbook_bo.inc.php | 18 +++++++++++++++++- addressbook/inc/class.addressbook_ui.inc.php | 2 +- addressbook/inc/hook_config.inc.php | 4 ++-- addressbook/setup/etemplates.inc.php | 6 +++--- addressbook/templates/default/edit.xet | 10 +++------- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php index e5104f1e3f..a4fc17a0ea 100755 --- a/addressbook/inc/class.addressbook_bo.inc.php +++ b/addressbook/inc/class.addressbook_bo.inc.php @@ -1215,7 +1215,14 @@ class addressbook_bo extends addressbook_so { if (isset($fields[$name])) { - $criteria[$name] = $fields[$name]; + if (empty($fields[$name])) + { + $criteria[] = "($name IS NULL OR $name='')"; + } + else + { + $criteria[$name] = $fields[$name]; + } } } return parent::search($criteria,false,'n_family,n_given','','',false,'OR',false,array('org_name'=>$org_name)); @@ -1231,6 +1238,15 @@ class addressbook_bo extends addressbook_so */ function changed_fields($from,$to,$only_org_fields=true) { + // we only care about countryname, if contrycode is empty + foreach(array( + 'adr_one_countryname' => 'adr_one_countrycode', + 'adr_two_countryname' => 'adr_one_countrycode', + ) as $name => $code) + { + if (!empty($from[$code])) $from[$name] = ''; + if (!empty($to[$code])) $to[$name] = ''; + } $changed = array(); foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name) { diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index adf4e9297e..b821779b45 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -2003,7 +2003,6 @@ class addressbook_ui extends addressbook_bo } $readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE,$content); $readonlys['button[edit]'] = !$this->check_perms(EGW_ACL_EDIT,$content); - $content['disable_change_org'] = true; // how to display addresses $content['addr_format'] = $this->addr_format_by_country($content['adr_one_countryname']); @@ -2036,6 +2035,7 @@ class addressbook_ui extends addressbook_bo { $content['owner'] .= 'p'; } + $this->tmpl->set_cell_attribute('change_org','disabled',true); // Prevent double countries - invalid code blanks it, disabling doesn't work $content['adr_one_countrycode'] = '-'; diff --git a/addressbook/inc/hook_config.inc.php b/addressbook/inc/hook_config.inc.php index 7c4eddef0e..121e06fdb0 100644 --- a/addressbook/inc/hook_config.inc.php +++ b/addressbook/inc/hook_config.inc.php @@ -94,7 +94,7 @@ function org_fileds_to_update($config) foreach($bocontacts->contact_fields as $field => $label) { // some fields never making sense for an organisation - if (!in_array($field,array('id','tid','owner','created','creator','modified','modifier','private','n_prefix','n_given','n_middle','n_family','n_suffix','n_fn'))) + if (!in_array($field,array('id','tid','owner','created','creator','modified','modifier','private','n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','account_id'))) { $fields[$field] = $label; } @@ -107,7 +107,7 @@ function org_fileds_to_update($config) $fields['#'.$name] = $data['label']; } } - + // Remove country codes as an option, it will be added by BO constructor unset($fields['adr_one_countrycode']); unset($fields['adr_two_countrycode']); diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php index 11dd8a3aa1..6b4f1635b4 100755 --- a/addressbook/setup/etemplates.inc.php +++ b/addressbook/setup/etemplates.inc.php @@ -2,7 +2,7 @@ /** * EGroupware - eTemplates for Application addressbook * http://www.egroupware.org - * generated by soetemplate::dump4setup() 2012-05-14 10:01 + * generated by soetemplate::dump4setup() 2012-05-15 16:59 * * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package addressbook @@ -24,7 +24,7 @@ $templ_data[] = array('name' => 'addressbook.display','template' => '','lang' => $templ_data[] = array('name' => 'addressbook.display.rows','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:17:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:17:",!@show[org_name]";s:1:"C";s:17:",!@show[org_unit]";s:1:"D";s:13:",!@show[n_fn]";s:1:"E";s:14:",!@show[email]";s:1:"F";s:17:",!@show[tel_work]";s:1:"G";s:17:",!@show[tel_cell]";s:1:"H";s:16:",!@show[tel_fax]";s:1:"I";s:17:",!@show[org_home]";s:1:"J";s:12:",!@show[url]";s:1:"K";s:23:",!@show[adr_one_street]";s:1:"L";s:27:",!@show[adr_one_postalcode]";s:1:"M";s:25:",!@show[adr_one_locality]";s:1:"N";s:23:",!@show[adr_one_region]";s:1:"O";s:16:",!@show[custom1]";s:1:"P";s:16:",!@show[custom2]";}i:1;a:17:{s:1:"A";a:2:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:4:"type";}s:1:"B";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Company";s:4:"name";s:8:"org_name";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Department";s:4:"name";s:8:"org_unit";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Contact";s:4:"name";s:4:"n_fn";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Email";s:4:"name";s:5:"email";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business phone";s:4:"name";s:8:"tel_work";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}s:1:"H";a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:7:"tel_fax";s:5:"label";s:3:"Fax";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Home phone";s:4:"name";s:8:"tel_home";}s:1:"J";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Internet";s:4:"name";s:3:"url";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:6:"Street";s:4:"name";s:14:"adr_one_street";}s:1:"L";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"ZIP Code";s:4:"name";s:18:"adr_one_postalcode";}s:1:"M";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"City";s:4:"name";s:16:"adr_one_locality";}s:1:"N";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:6:"Region";s:4:"name";s:14:"adr_one_region";}s:1:"O";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:15:"@customlabel[1]";s:4:"name";s:7:"custom1";}s:1:"P";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:15:"@customlabel[2]";s:4:"name";s:7:"custom2";}s:1:"Q";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"select country";s:4:"name";s:7:"country";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}}}i:2;a:17:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:4:"size";s:1:"1";s:4:"name";s:12:"${row}[type]";s:8:"readonly";s:1:"1";s:5:"label";s:21:"$row_cont[type_label]";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_name]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[email]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_work]";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[tel_fax]";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[url]";}s:1:"K";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[adr_one_street]";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";}}s:1:"L";a:2:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";}s:1:"M";a:2:{s:4:"type";s:5:"label";s:4:"name";s:24:"${row}[adr_one_locality]";}s:1:"N";a:2:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[adr_one_region]";}s:1:"O";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[custom1]";}s:1:"P";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[custom2]";}s:1:"Q";a:2:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";}}}s:4:"rows";i:2;s:4:"cols";i:17;s:4:"size";s:14:"100%,,,,,,auto";s:7:"options";a:2:{i:0;s:4:"100%";i:6;s:4:"auto";}}}','size' => '100%,,,,,,auto','style' => '','modified' => '1195309977',); -$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:87:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private|History";s:4:"name";s:84:"tabs=general|cats|home|details|links|distribution_list|custom|custom_private|history";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{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:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";s:4:"name";s:12:"button[more]";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1216641537',); +$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:87:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private|History";s:4:"name";s:84:"tabs=general|cats|home|details|links|distribution_list|custom|custom_private|history";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{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:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";s:4:"name";s:12:"button[more]";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:9:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"7";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}i:7;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";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1216641537',); $templ_data[] = array('name' => 'addressbook.edit.access','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"c2";s:4:",top";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Publish into groups:";}s:1:"B";a:3:{s:4:"type";s:6:"manual";s:7:"onclick";s:13:"return false;";s:4:"name";s:30:"ManualAddressbookPublishgroups";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"5";s:4:"name";s:16:"published_groups";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1140005589',); @@ -34,7 +34,7 @@ $templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang $templ_data[] = array('name' => 'addressbook.edit.custom_private','template' => '','lang' => '','group' => '0','version' => '1.9.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:12:"$cont[tid],1";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,286,,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:"286";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,286,,row_on,0,0,auto','style' => '','modified' => '1200540111',); -$templ_data[] = array('name' => 'addressbook.edit.details','template' => '','lang' => '','group' => '0','version' => '1.9.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%,286,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"286";i:6;s:4:"auto";}}}','size' => '100%,286,,,,,auto','style' => '','modified' => '1165511695',); +$templ_data[] = array('name' => 'addressbook.edit.details','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"c1";s:4:",top";s:2:"c2";s:11:"row_off,top";s:2:"h1";s:9:",@cat_tab";s:2:"c6";s:6:"row_on";s:2:"c5";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: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:4;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:5;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:6;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:6;s:4:"cols";i:3;s:4:"size";s:17:"100%,286,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"286";i:6;s:4:"auto";}}}','size' => '100%,286,,,,,auto','style' => '','modified' => '1165511695',); $templ_data[] = array('name' => 'addressbook.edit.distribution_list','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"c1";s:2:"th";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Distribution lists";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"grid";s:7:"options";a:0:{}s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:4:"name";s:13:"distrib_lists";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:17:"100%,286,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"286";i:6;s:4:"auto";}}}','size' => '100%,286,,,,,auto','style' => '','modified' => '1200059576',); diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet index 62ec42c5c1..2daf14f4a0 100644 --- a/addressbook/templates/default/edit.xet +++ b/addressbook/templates/default/edit.xet @@ -259,7 +259,7 @@ -