Latest SANDPIT - MERGE from CVS (MERGE-GIT)

templates/creation/organizationalRole.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>Organisational Role</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/o.png</icon>
-<description>New Organisational Role</description>
 <askcontainer>1</askcontainer>
+<description>New Organisational Role</description>
+<icon>images/o.png</icon>
+<invalid>0</invalid>
 <rdn>cn</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Generic: Organisational Role</title>
 <visible>1</visible>
 
 <objectClasses>
@@ -29,21 +31,18 @@
 	<order>3</order>
 	<spacer>1</spacer>
 </attribute>
-
 <attribute id="description">
 	<display>Comments</display>
 	<icon>images/light.png</icon>
 	<order>4</order>
 	<spacer>1</spacer>
 </attribute>
-
 <attribute id="roleOccupant">
 	<display>Occupant</display>
 	<icon>images/object.png</icon>
 	<order>5</order>
 	<spacer>1</spacer>
 </attribute>
-
 <attribute id="street">
 	<display>Street Address</display>
 	<icon>images/mail.png</icon>
@@ -62,7 +61,6 @@
 	<order>9</order>
 	<spacer>1</spacer>
 </attribute>
-
 <attribute id="postalAddress">
 	<display>Postal Address</display>
 	<icon>images/mail.png</icon>
@@ -74,6 +72,6 @@
 	<icon>images/mail.png</icon>
 	<order>11</order>
 </attribute>
-
 </attributes>
+
 </template>