Latest SANDPIT - MERGE from CVS (MERGE-GIT)

templates/creation/alias.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
 <!--This template doesnt work needs modification to the Engine.-->
+
 <template>
-<title>LDAP Alias</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/mail_alias.png</icon>
-<description>New LDAP Alias</description>
 <askcontainer>1</askcontainer>
-<rdn>uid</rdn>
-<visible>1</visible>
+<description>New LDAP Alias</description>
+<icon>images/go.png</icon>
 <invalid>0</invalid>
+<rdn>uid</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Generic: LDAP Alias</title>
+<visible>1</visible>
 
 <objectClasses>
 <objectClass id="alias"></objectClass>
@@ -19,13 +20,14 @@
 <attributes>
 <attribute id="aliasedObjectName">
 	<display>Alias To</display>
-	<order>1</order>
+	<order>2</order>
 	<page>1</page>
 </attribute>
 <attribute id="uid">
 	<display>User ID</display>
-	<order>2</order>
+	<order>1</order>
 	<page>1</page>
 </attribute>
 </attributes>
+
 </template>