From: <ral...@us...> - 2006-10-26 13:41:00
|
Author: ralfbecker Date: Thu Oct 26 15:40:47 2006 New Revision: 22748 URL: http://www.egroupware.org/viewvc?rev=3D3D22748&view=3D3Drev Log: fixed not shown customfields in addressbook index, if a not set one is in b= =3D efore Modified: trunk/addressbook/inc/class.uicontacts.inc.php trunk/addressbook/setup/etemplates.inc.php trunk/addressbook/templates/default/index.xet Modified: trunk/addressbook/inc/class.uicontacts.inc.php URL: http://www.egroupware.org/viewvc/trunk/addressbook/inc/class.uicontact= =3D s=2Einc.php?rev=3D3D22748&r1=3D3D22747&r2=3D3D22748&view=3D3Ddiff =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D --- trunk/addressbook/inc/class.uicontacts.inc.php (original) +++ trunk/addressbook/inc/class.uicontacts.inc.php Thu Oct 26 15:40:47 2006 @@ -708,7 +708,7 @@ { foreach($this->customfields as $name =3D3D> $data) { - $row['customfields'][] =3D3D $customfields[$row['id']][$name]; + $row['customfields'][] =3D3D $customfields[$row['id']][$name] ? $cus= to=3D mfields[$row['id']][$name] : ' '; } } if ($this->prefs['home_column'] !=3D3D 'never' && !$homeaddress) Modified: trunk/addressbook/setup/etemplates.inc.php URL: http://www.egroupware.org/viewvc/trunk/addressbook/setup/etemplates.in= =3D c=2Ephp?rev=3D3D22748&r1=3D3D22747&r2=3D3D22748&view=3D3Ddiff =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D --- trunk/addressbook/setup/etemplates.inc.php (original) +++ trunk/addressbook/setup/etemplates.inc.php Thu Oct 26 15:40:47 2006 @@ -2,7 +2,7 @@ /** * eGroupWare - eTemplates for Application addressbook * http://www.egroupware.org =3D - * generated by soetemplate::dump4setup() 2006-10-24 22:05 + * generated by soetemplate::dump4setup() 2006-10-26 15:46 * * @license http://opensource.org/licenses/gpl-license.php GPL - GNU Gene= =3D ral Public License * @package addressbook @@ -112,7 +112,7 @@ =3D $templ_data[] =3D3D array('name' =3D3D> 'addressbook.index.right','templat= e' =3D =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.001','d= ata' =3D3D=3D > 'a:1:{i:0;a:5:{s:4:"type";s:6:"select";s:5:"label";s:4:"Type";s:4:"name";= =3D s:15:"col_filter[tid]";s:4:"help";s:23:"Select addressbook type";s:8:"oncha= =3D nge";i:1;}}','size' =3D3D> '','style' =3D3D> '','modified' =3D3D> '11452862= 18',); =3D -$templ_data[] =3D3D array('name' =3D3D> 'addressbook.index.rows','template= ' =3D =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.001','d= ata' =3D3D=3D > 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:= =3D 2:"th";s:2:"c2";s:7:"row,top";s:1:"E";s:12:",!@show_home";s:1:"C";s:12:"60,= =3D @no_photo";s:1:"I";s:2:"90";s:1:"H";s:17:",@no_customfields";}i:1;a:9:{s:1:= =3D "A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"da= =3D ta";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=3D3Dn_given";s:2:"h5";s:32:",!@or= de=3D r=3D3D/^(org_name|n_fileas)$/";s:2:"h3";s:17:",!@order=3D3Dn_family";s:2:"h= 1";s=3D :17:",!@order=3D3Dn_fileas";s:2:"h6";s:16:",@order=3D3Dn_fileas";}i:1;a:2:{= s:1:=3D "A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"l= =3D abel";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type"= =3D ;s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader"= =3D ;s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"ty= =3D pe";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_fa= =3D mily";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"l= =3D abel";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"n= =3D extmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}= =3D }i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisa= =3D tion";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";= =3D a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextma= =3D tch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a= =3D :4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"la= =3D bel";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4= =3D :"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"= =3D own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label"= =3D ;}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0= =3D ";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label= =3D ";s:5:"Photo";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Busine= =3D ss address";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Home add= =3D ress";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{= =3D s:4:"type";s:5:"label";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business= =3D phone";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Mobile phone";s:= =3D 4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:8:"te= =3D l_home";s:5:"label";s:10:"Home phone";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";= =3D s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url= =3D ";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"= =3D Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4= =3D :"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"H";a:6:{s:4:= =3D "type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type= =3D ";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][lab= =3D el]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options= =3D ";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:5:"al= =3D ign";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"l= =3D abel";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"butt= =3D on";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"chec= =3D k_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,= =3D form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align"= =3D ;s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:5:{s:4:"type";= =3D s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row= =3D }[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"= =3D type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:= =3D 4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:= =3D 5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s= =3D :4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:= =3D "1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"n= =3D o_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[fi= =3D rst_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:= =3D {s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"D";a:6:{s:4:"= =3D type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:= =3D 4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:= =3D {s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"la= =3D bel";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;= =3D a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:= =3D 4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:= =3D 3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr= =3D _one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_= =3D one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:= =3D 4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${ro= =3D w}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hb= =3D ox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s= =3D :1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:5:{s:4:"type";s:5:= =3D "label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftP= =3D ad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"l= =3D abel";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a= =3D :3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"n= =3D o_lang";s:1:"1";}}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0= =3D ";i:1;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${= =3D row}[tel_work]";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[t= =3D el_work_link],,,calling,$cont[call_popup]";}i:2;a:5:{s:4:"type";s:5:"label"= =3D ;s:4:"name";s:16:"${row}[tel_cell]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:"= =3D ,telNumbers";s:4:"size";s:53:",$row_cont[tel_cell_link],,,calling,$cont[cal= =3D l_popup]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home= =3D ]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$r= =3D ow_cont[tel_home_link],,,calling,$cont[call_popup]";}i:4;a:4:{s:4:"type";s:= =3D 5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:= =3D "size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s= =3D :1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"typ= =3D e";s:5:"label";s:4:"size";s:3:",,1";s:4:"span";s:12:",fixedHeight";s:7:"no_= =3D lang";s:1:"1";s:4:"name";s:11:"${row}[url]";}i:2;a:5:{s:4:"type";s:5:"label= =3D ";s:4:"size";s:52:",@${row}[email_link],,,_blank,$row_cont[email_popup]";s:= =3D 4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:7:"no_lang";= =3D s:1:"1";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"size";s:62:",@${row}[email_ho= =3D me_link],,,_blank,$row_cont[email_home_popup]";s:4:"span";s:12:",fixedHeigh= =3D t";s:4:"name";s:18:"${row}[email_home]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7= =3D :{s:4:"type";s:4:"grid";s:4:"size";s:15:",45,0,,0,0,auto";s:4:"name";s:20:"= =3D ${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"= =3D type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:= =3D "no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:5:{i:1;s= =3D :2:"45";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";i:2;s:1:"0";}}s:1:"I";a:7:{s= =3D :4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:4:{s:4:"type";s:5:"image"= =3D ;s:4:"size";s:52:"addressbook.uicontacts.view&contact_id=3D3D$row_cont[id]"= ;s=3D :5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"butto= =3D n";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:189:"window= =3D .open(egw::link(\'/index.php\',\'menuaction=3D3Daddressbook.uicontacts.edit= &c=3D ontact_id=3D3D$row_cont[id]\'),\'_blank\',\'dependent=3D3Dyes,width=3D3D850= ,heigh=3D t=3D3D440,scrollbars=3D3Dyes,status=3D3Dyes\'); return false;";s:4:"name";s= :19:"e=3D dit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"dele= =3D te[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"he= =3D lp";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete = =3D this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"check= =3D ed[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple cont= =3D acts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrin= =3D t";}}}s:4:"rows";i:2;s:4:"cols";i:9;s:4:"size";s:4:"100%";s:7:"options";a:1= =3D :{i:0;s:4:"100%";}}}','size' =3D3D> '100%','style' =3D3D> '','modified' =3D= 3D> '1=3D 145192391',); +$templ_data[] =3D3D array('name' =3D3D> 'addressbook.index.rows','template= ' =3D =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.001','d= ata' =3D3D=3D > 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:= =3D 2:"th";s:2:"c2";s:7:"row,top";s:1:"E";s:12:",!@show_home";s:1:"C";s:12:"60,= =3D @no_photo";s:1:"I";s:2:"90";s:1:"H";s:17:",@no_customfields";}i:1;a:9:{s:1:= =3D "A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"da= =3D ta";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=3D3Dn_given";s:2:"h5";s:32:",!@or= de=3D r=3D3D/^(org_name|n_fileas)$/";s:2:"h3";s:17:",!@order=3D3Dn_family";s:2:"h= 1";s=3D :17:",!@order=3D3Dn_fileas";s:2:"h6";s:16:",@order=3D3Dn_fileas";}i:1;a:2:{= s:1:=3D "A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"l= =3D abel";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type"= =3D ;s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader"= =3D ;s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"ty= =3D pe";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_fa= =3D mily";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"l= =3D abel";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"n= =3D extmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}= =3D }i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisa= =3D tion";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";= =3D a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextma= =3D tch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a= =3D :4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"la= =3D bel";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4= =3D :"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"= =3D own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label"= =3D ;}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0= =3D ";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label= =3D ";s:5:"Photo";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Busine= =3D ss address";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Home add= =3D ress";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{= =3D s:4:"type";s:5:"label";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business= =3D phone";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Mobile phone";s:= =3D 4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:8:"te= =3D l_home";s:5:"label";s:10:"Home phone";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";= =3D s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url= =3D ";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"= =3D Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4= =3D :"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"H";a:6:{s:4:= =3D "type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type= =3D ";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][lab= =3D el]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options= =3D ";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:5:"al= =3D ign";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"l= =3D abel";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"butt= =3D on";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"chec= =3D k_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,= =3D form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align"= =3D ;s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:5:{s:4:"type";= =3D s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row= =3D }[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"= =3D type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:= =3D 4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:= =3D 5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s= =3D :4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:= =3D "1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"n= =3D o_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[fi= =3D rst_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:= =3D {s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"D";a:6:{s:4:"= =3D type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:= =3D 4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:= =3D {s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"la= =3D bel";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;= =3D a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:= =3D 4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:= =3D 3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr= =3D _one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_= =3D one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:= =3D 4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${ro= =3D w}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hb= =3D ox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s= =3D :1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:5:{s:4:"type";s:5:= =3D "label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftP= =3D ad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"l= =3D abel";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a= =3D :3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"n= =3D o_lang";s:1:"1";}}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0= =3D ";i:1;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${= =3D row}[tel_work]";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[t= =3D el_work_link],,,calling,$cont[call_popup]";}i:2;a:5:{s:4:"type";s:5:"label"= =3D ;s:4:"name";s:16:"${row}[tel_cell]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:"= =3D ,telNumbers";s:4:"size";s:53:",$row_cont[tel_cell_link],,,calling,$cont[cal= =3D l_popup]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home= =3D ]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$r= =3D ow_cont[tel_home_link],,,calling,$cont[call_popup]";}i:4;a:4:{s:4:"type";s:= =3D 5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:= =3D "size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s= =3D :1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"typ= =3D e";s:5:"label";s:4:"size";s:3:",,1";s:4:"span";s:12:",fixedHeight";s:7:"no_= =3D lang";s:1:"1";s:4:"name";s:11:"${row}[url]";}i:2;a:5:{s:4:"type";s:5:"label= =3D ";s:4:"size";s:52:",@${row}[email_link],,,_blank,$row_cont[email_popup]";s:= =3D 4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:7:"no_lang";= =3D s:1:"1";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"size";s:62:",@${row}[email_ho= =3D me_link],,,_blank,$row_cont[email_home_popup]";s:4:"span";s:12:",fixedHeigh= =3D t";s:4:"name";s:18:"${row}[email_home]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7= =3D :{s:4:"type";s:4:"grid";s:4:"size";s:15:",48,0,,0,0,auto";s:4:"name";s:20:"= =3D ${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"= =3D type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:= =3D "no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:5:{i:1;s= =3D :2:"48";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";i:2;s:1:"0";}}s:1:"I";a:7:{s= =3D :4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:4:{s:4:"type";s:5:"image"= =3D ;s:4:"size";s:52:"addressbook.uicontacts.view&contact_id=3D3D$row_cont[id]"= ;s=3D :5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"butto= =3D n";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:189:"window= =3D .open(egw::link(\'/index.php\',\'menuaction=3D3Daddressbook.uicontacts.edit= &c=3D ontact_id=3D3D$row_cont[id]\'),\'_blank\',\'dependent=3D3Dyes,width=3D3D850= ,heigh=3D t=3D3D440,scrollbars=3D3Dyes,status=3D3Dyes\'); return false;";s:4:"name";s= :19:"e=3D dit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"dele= =3D te[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"he= =3D lp";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete = =3D this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"check= =3D ed[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple cont= =3D acts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrin= =3D t";}}}s:4:"rows";i:2;s:4:"cols";i:9;s:4:"size";s:4:"100%";s:7:"options";a:1= =3D :{i:0;s:4:"100%";}}}','size' =3D3D> '100%','style' =3D3D> '','modified' =3D= 3D> '1=3D 145192391',); =3D $templ_data[] =3D3D array('name' =3D3D> 'addressbook.search','template' = =3D3D> '=3D ','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '','data' =3D3D> 'a:= 1:{i:0;a=3D :4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:2:{s= =3D :4:"type";s:8:"template";s:4:"name";s:16:"addressbook.edit";}s:1:"B";a:1:{s= =3D :4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"si= =3D ze";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:5:"label";s:8:"Operator";s:4= =3D :"name";s:8:"operator";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:6:"sele= =3D ct";s:4:"name";s:11:"meth_select";s:7:"no_lang";s:1:"1";}s:4:"span";s:3:"al= =3D l";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:5:{s:4:"type";= =3D s:4:"hbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:= =3D "button";s:5:"label";s:6:"Search";s:4:"name";s:14:"button[search]";s:7:"onc= =3D lick";s:37:"xajax_eT_wrapper(this); return false;";}i:2;a:4:{s:4:"type";s:6= =3D :"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"on= =3D click";s:29:"window.close(); return false;";}}s:1:"B";a:1:{s:4:"type";s:5:"= =3D label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' =3D3D> '','style' =3D3D>= '',=3D 'modified' =3D3D> '1161707411',); =3D Modified: trunk/addressbook/templates/default/index.xet URL: http://www.egroupware.org/viewvc/trunk/addressbook/templates/default/i= =3D ndex.xet?rev=3D3D22748&r1=3D3D22747&r2=3D3D22748&view=3D3Ddiff =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D --- trunk/addressbook/templates/default/index.xet (original) +++ trunk/addressbook/templates/default/index.xet Thu Oct 26 15:40:47 2006 @@ -2,7 +2,7 @@ <!-- $Id$ --> <overlay> <template id=3D3D"addressbook.index.left" template=3D3D"" lang=3D3D"" gro= up=3D3D"=3D 0" version=3D3D"1.3.001"> - <menulist span=3D3D",bold"> + <menulist class=3D3D"bold"> <menupopup data=3D3D"" rows=3D3D"1" cols=3D3D"1" id=3D3D"org_view" no_l= ang=3D3D"1=3D " statustext=3D3D"Select a view" onchange=3D3D"1" options=3D3D"All contacts= "/> </menulist> </template> @@ -59,12 +59,12 @@ <description value=3D3D"Photo"/> <description value=3D3D"Business address"/> <description value=3D3D"Home address"/> - <vbox orient=3D3D",0,0"> + <vbox options=3D3D"0,0"> <description id=3D3D"tel_work" value=3D3D"Business phone"/> <description value=3D3D"Mobile phone" id=3D3D"tel_cell"/> <description id=3D3D"tel_home" value=3D3D"Home phone"/> </vbox> - <vbox orient=3D3D",0,0"> + <vbox options=3D3D"0,0"> <description id=3D3D"url" value=3D3D"Url"/> <description value=3D3D"Business email" id=3D3D"email"/> <description id=3D3D"email_home" value=3D3D"Home email"/> @@ -86,7 +86,7 @@ </row> <row class=3D3D"row" valign=3D3D"top"> <image label=3D3D"$row_cont[type_label]" src=3D3D"${row}[type]" align= =3D3D"=3D center" no_lang=3D3D"1"/> - <vbox id=3D3D"${row}[id]" orient=3D3D",0,0"> + <vbox options=3D3D"0,0" id=3D3D"${row}[id]"> <description id=3D3D"${row}[line1]" no_lang=3D3D"1"/> <description id=3D3D"${row}[line2]" no_lang=3D3D"1"/> <description id=3D3D"${row}[org_unit]" no_lang=3D3D"1"/> @@ -94,36 +94,36 @@ <description id=3D3D"${row}[first_org]" no_lang=3D3D"1"/> </vbox> <image src=3D3D"${row}[photo]"/> - <vbox orient=3D3D",0,0"> + <vbox options=3D3D"0,0"> <description id=3D3D"${row}[adr_one_countryname]" no_lang=3D3D"1"/> - <hbox orient=3D3D"0,0,0"> + <hbox options=3D3D"0,0" orient=3D3D"0"> <description no_lang=3D3D"1" id=3D3D"${row}[adr_one_locality]"/> <description id=3D3D"${row}[adr_one_postalcode]" class=3D3D"leftPad= 5" v=3D alue=3D3D" " no_lang=3D3D"1"/> </hbox> <description no_lang=3D3D"1" id=3D3D"${row}[adr_one_street]"/> <description id=3D3D"${row}[adr_one_street2]" no_lang=3D3D"1"/> </vbox> - <vbox orient=3D3D",0,0"> + <vbox options=3D3D"0,0"> <description id=3D3D"${row}[adr_two_countryname]" no_lang=3D3D"1"/> - <hbox orient=3D3D",0,0"> + <hbox options=3D3D"0,0"> <description no_lang=3D3D"1" id=3D3D"${row}[adr_two_locality]"/> <description id=3D3D"${row}[adr_two_postalcode]" class=3D3D"leftPad= 5" v=3D alue=3D3D" " no_lang=3D3D"1"/> </hbox> <description no_lang=3D3D"1" id=3D3D"${row}[adr_two_street]"/> <description id=3D3D"${row}[adr_two_street2]" no_lang=3D3D"1"/> </vbox> - <vbox orient=3D3D",0,0"> + <vbox options=3D3D"0,0"> <description no_lang=3D3D"1" id=3D3D"${row}[tel_work]" class=3D3D"te= lNumbe=3D rs" options=3D3D",$row_cont[tel_work_link],,,calling,$cont[call_popup]"/> <description id=3D3D"${row}[tel_cell]" no_lang=3D3D"1" class=3D3D"te= lNumbe=3D rs" options=3D3D",$row_cont[tel_cell_link],,,calling,$cont[call_popup]"/> <description id=3D3D"${row}[tel_home]" no_lang=3D3D"1" class=3D3D"te= lNumbe=3D rs" options=3D3D",$row_cont[tel_home_link],,,calling,$cont[call_popup]"/> <description id=3D3D"${row}[tel_prefered]" no_lang=3D3D"1" options= =3D3D",$=3D row_cont[tel_prefered_link],,,calling,$cont[call_popup]"/> </vbox> - <vbox orient=3D3D",0,0"> + <vbox options=3D3D"0,0"> <description options=3D3D",,1" class=3D3D"fixedHeight" no_lang=3D3D"= 1" id=3D =3D3D"${row}[url]"/> <description options=3D3D",@${row}[email_link],,,_blank,$row_cont[em= ai=3D l_popup]" class=3D3D"fixedHeight" id=3D3D"${row}[email]" no_lang=3D3D"1"/> <description options=3D3D",@${row}[email_home_link],,,_blank,$row_co= nt=3D [email_home_popup]" class=3D3D"fixedHeight" id=3D3D"${row}[email_home]" no_= lang=3D =3D3D"1"/> </vbox> - <grid height=3D3D"45" border=3D3D"0" spacing=3D3D"0" padding=3D3D"0" = overflow=3D =3D3D"auto"> + <grid height=3D3D"48" border=3D3D"0" spacing=3D3D"0" padding=3D3D"0" = overflow=3D =3D3D"auto"> <columns> <column/> </columns> @@ -133,7 +133,7 @@ </row> </rows> </grid> - <hbox class=3D3D"noPrint" orient=3D3D"0,0"> + <hbox options=3D3D"0" class=3D3D"noPrint" orient=3D3D"0"> <image options=3D3D"addressbook.uicontacts.view&contact_id=3D3D$= row_=3D cont[id]" label=3D3D"View" src=3D3D"view"/> <button image=3D3D"edit" label=3D3D"Edit" onclick=3D3D"window.open(e= gw::li=3D nk('/index.php','menuaction=3D3Daddressbook.uicontacts.edit&contact_id= =3D3D=3D $row_cont[id]'),'_blank','dependent=3D3Dyes,width=3D3D850,height=3D3D440,sc= rollba=3D rs=3D3Dyes,status=3D3Dyes'); return false;" id=3D3D"edit[$row_cont[id]]"/> <button id=3D3D"delete[$row_cont[id]]" image=3D3D"delete" label=3D3D= "Delet=3D e" statustext=3D3D"Delete this contact" onclick=3D3D"return confirm('Delete= thi=3D s contact');"/> |