- changed labels from company to organisation

- using a country-selection instead of an text-input
- disabled "change all members of org" if no org set

addressbook/inc/class.uicontacts.inc.php

@@ -907,6 +907,7 @@ class uicontacts extends bocontacts
 				$content['link_to']['to_id'] = $contact_id;
 			}
 		}
+		$content['disable_change_org'] = $view || !$content['org_name'];
 		//_debug_array($content);
 		$readonlys['button[delete]'] = !$this->check_perms(EGW_ACL_DELETE,$content);
 		$readonlys['button[copy]'] = $readonlys['button[edit]'] = $readonlys['button[vcard]'] = true;

addressbook/templates/default/edit.xet

@@ -47,7 +47,7 @@
 				</row>
 				<row height="28">
 					<image src="home"/>
-					<description value="company" options=",,,org_name"/>
+					<description value="organisation" options=",,,org_name"/>
 					<textbox size="45" maxlength="64" id="org_name" onchange="setFileasOptions(this);"/>
 				</row>
 				<row valign="top" height="70">
@@ -128,10 +128,12 @@
 				<row>
 					<description/>
 					<description value="country" options=",,,adr_one_countryname"/>
-					<textbox size="45" maxlength="64" id="adr_one_countryname"/>
+					<menulist span=",fullWidth">
+						<menupopup type="select-country" options="Select one,1" id="adr_one_countryname"/>
+					</menulist>
 					<description/>
 				</row>
-				<row disabled="@view">
+				<row disabled="@disable_change_org">
 					<image src="check"/>
 					<description/>
 					<checkbox label="change all organisation members" id="change_org" span="all" statustext="Apply changes to all members, whose fields have the same previous content"/>
@@ -175,7 +177,9 @@
 				<row>
 					<description/>
 					<description value="country" options=",,,adr_two_countryname"/>
-					<textbox size="45" maxlength="64" id="adr_two_countryname"/>
+					<menulist span=",fullWidth">
+						<menupopup type="select-country" options="Select one,1" id="adr_two_countryname"/>
+					</menulist>
 				</row>
 				<row height="30">
 					<image src="gear"/>
@@ -358,7 +362,7 @@
 					<tabbox>
 						<tabs>
 							<tab label="Personal" statustext=""/>
-							<tab label="Company" statustext=""/>
+							<tab label="Organisation" statustext=""/>
 							<tab label="Private" statustext=""/>
 							<tab label="Details" statustext=""/>
 							<tab label="Links" statustext=""/>

addressbook/templates/default/index.xet

@@ -45,7 +45,7 @@
 								<nextmatch-sortheader id="n_given" label="Firstname"/>
 							</row>
 							<row>
-								<nextmatch-sortheader id="org_name" label="Company" span="all"/>
+								<nextmatch-sortheader id="org_name" label="Organisation" span="all"/>
 							</row>
 							<row disabled="!@order=/^(org_name|n_fileas)$/">
 								<nextmatch-sortheader id="n_family" label="Name"/>