Latest SANDPIT - MERGE from CVS (MERGE-GIT)

templates/creation/inetOrgPerson.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>Address Book Entry</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/user.png</icon>
-<description>New Address Book Entry</description>
 <askcontainer>1</askcontainer>
+<description>New Address Book Entry</description>
+<icon>images/user.png</icon>
+<invalid>0</invalid>
 <rdn>cn</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Generic: Address Book Entry</title>
 <visible>1</visible>
 
 <objectClasses>
@@ -17,13 +19,13 @@
 <attribute id="givenName">
 	<display>First name</display>
 	<icon>images/uid.png</icon>
-	<onchange>autoFill:cn,%givenName% %sn%</onchange>
+	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<order>1</order>
 	<page>1</page>
 </attribute>
 <attribute id="sn">
 	<display>Last name</display>
-	<onchange>autoFill:cn,%givenName% %sn%</onchange>
+	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<order>2</order>
 	<page>1</page>
 </attribute>
@@ -33,19 +35,24 @@
 	<page>1</page>
 	<spacer>1</spacer>
 </attribute>
+<attribute id="jpegPhoto">
+	<display>Photo</display>
+	<order>3</order>
+	<spacer>1</spacer>
+</attribute>
 <attribute id="o">
 	<display>Organisation</display>
 	<order>4</order>
 	<page>1</page>
 </attribute>
 <attribute id="street">
+	<cols>50</cols>
 	<display>Street</display>
 	<icon>images/mail.png</icon>
-	<type>textarea</type>
-	<cols>50</cols>
-	<rows>4</rows>
 	<order>4</order>
 	<page>1</page>
+	<rows>4</rows>
+	<type>textarea</type>
 </attribute>
 <attribute id="l">
 	<display>City</display>
@@ -85,4 +92,5 @@
 	<page>1</page>
 </attribute>
 </attributes>
+
 </template>