X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fphpldapadmin%2Ftemplates%2Fcreation%2FmozillaOrgPerson.xml;h=dc39a73ef2c251d75802a69070ac217293e44d3f;hb=f7dca5e366df2ec527499431028a20cab323d8fd;hp=fb05cda24deefcbd2ba70864d74d9fbfbc07958f;hpb=202368ea600f1c63978b6e130adb9e47d3d752d3;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/phpldapadmin/templates/creation/mozillaOrgPerson.xml b/etc/phpldapadmin/templates/creation/mozillaOrgPerson.xml
index fb05cda..dc39a73 100644
--- a/etc/phpldapadmin/templates/creation/mozillaOrgPerson.xml
+++ b/etc/phpldapadmin/templates/creation/mozillaOrgPerson.xml
@@ -1,139 +1,161 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>Address Book Entry (mozillaOrgPerson)</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/user.png</icon>
-<description>New Address Book Entry</description>
 <askcontainer>1</askcontainer>
+<description>New Thunderbird Address Book Entry</description>
+<icon>address-book.png</icon>
+<invalid>0</invalid>
 <rdn>cn</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Thunderbird: Address Book Entry</title>
 <visible>1</visible>
 
 <objectClasses>
 <objectClass id="inetOrgPerson"></objectClass>
-<objectClass id="mozillaAddressBookEntry"></objectClass>
+<objectClass id="mozillaOrgPerson"></objectClass>
 </objectClasses>
 
 <attributes>
 <attribute id="givenName">
 	<display>First Name</display>
-	<icon>images/uid.png</icon>
-	<onchange>autoFill:cn,%sn% %givenName%</onchange>
+	<onchange>=autoFill(cn;%sn% %givenName%)</onchange>
 	<order>1</order>
 </attribute>
 <attribute id="sn">
 	<display>Last Name</display>
-	<onchange>autoFill:cn,%sn% %givenName%</onchange>
+	<onchange>=autoFill(cn;%sn% %givenName%)</onchange>
 	<order>2</order>
 </attribute>
 <attribute id="cn">
-	<display>Common Name</display>
+	<display>Display Name</display>
 	<order>3</order>
 </attribute>
 <attribute id="mozillaNickName">
-	<display>Nickname</display>
+	<display>NickName</display>
 	<order>4</order>
 	<spacer>1</spacer>
 </attribute>
 <attribute id="mail">
-	<display>t_email</display>
+	<display>Email</display>
 	<order>5</order>
 </attribute>
 <attribute id="mozillaSecondEmail">
-	<display>Additional email</display>
+	<display>Alternative Email</display>
 	<order>6</order>
-	<spacer>1</spacer>
 </attribute>
-<attribute id="telephoneNumber">
-	<display>Work Phone</display>
-	<icon>images/phone.png</icon>
+<attribute id="nsAIMid">
+	<display>AIM Nick</display>
 	<order>7</order>
 </attribute>
-<attribute id="homePhone">
-	<display>Home Phone</display>
+<attribute id="mozillaUseHtmlMail">
+	<display>HTML Email Format</display>
 	<order>8</order>
+	<spacer>1</spacer>
 </attribute>
-<attribute id="facsimileTelephoneNumber">
-	<display>Fax</display>
+<attribute id="telephoneNumber">
+	<display>Work Phone Number</display>
 	<order>9</order>
 </attribute>
-<attribute id="pager">
-	<display>Page</display>
+<attribute id="homePhone">
+	<display>Home Phone Number</display>
 	<order>10</order>
 </attribute>
-<attribute id="mobile">
-	<display>Mobile</display>
+<attribute id="facsimileTelephoneNumber">
+	<display>Fax Number</display>
 	<order>11</order>
-	<spacer>1</spacer>
 </attribute>
-<attribute id="homePostalAddress">
-	<display>Home Address</display>
+<attribute id="pager">
+	<display>Pager</display>
 	<order>12</order>
 </attribute>
-<attribute id="mozillaHomePostalAddress2">
-	<display>Home Address 2</display>
+<attribute id="mobile">
+	<display>Mobile</display>
 	<order>13</order>
+	<spacer>1</spacer>
 </attribute>
-<attribute id="mozillaHomeLocalityName">
-	<display>Home City</display>
+<attribute id="mozillaHomeStreet">
+	<display>Address (personal)</display>
 	<order>14</order>
 </attribute>
-<attribute id="mozillaHomeState">
-	<display>Home State</display>
+<attribute id="mozillaHomeLocalityName">
+	<display>City (personal)</display>
 	<order>15</order>
 </attribute>
-<attribute id="mozillaHomePostalCode">
-	<display>Home ZIP/Postal Code</display>
+<attribute id="mozillaHomeState">
+	<display>State (personal)</display>
 	<order>16</order>
 </attribute>
-<attribute id="mozillaHomeCountryName">
-	<display>Home Country</display>
+<attribute id="mozillaHomePostalCode">
+	<display>Zip (personal)</display>
 	<order>17</order>
 </attribute>
-<attribute id="mozillaHomeUrl">
-	<display>Home Web page</display>
+<attribute id="mozillaHomeCountryName">
+	<display>Country (personal)</display>
 	<order>18</order>
-	<spacer>1</spacer>
 </attribute>
-<attribute id="title">
-	<display>Work Title</display>
+<attribute id="mozillaHomeUrl">
+	<display>Web page (personal)</display>
 	<order>19</order>
+	<spacer>1</spacer>
 </attribute>
-<attribute id="ou">
-	<display>Work Department</display>
+<attribute id="title">
+	<display>Title (professional)</display>
 	<order>20</order>
 </attribute>
-<attribute id="o">
-	<display>Work Organization</display>
+<attribute id="ou">
+	<display>Department (professional)</display>
 	<order>21</order>
 </attribute>
-<attribute id="street">
-	<display>Work Address</display>
+<attribute id="o">
+	<display>Organization (professional)</display>
 	<order>22</order>
 </attribute>
-<attribute id="mozillaWorkStreet2">
-	<display>Work Address 2</display>
+<attribute id="street">
+	<display>Address (professional)</display>
 	<order>23</order>
 </attribute>
 <attribute id="l">
-	<display>Work City</display>
+	<display>City (professional)</display>
 	<order>24</order>
 </attribute>
 <attribute id="st">
-	<display>Work State/Province</display>
+	<display>State (professional)</display>
 	<order>25</order>
 </attribute>
 <attribute id="postalCode">
-	<display>Work ZIP/Postal Code</display>
+	<display>Zip (professional)</display>
 	<order>26</order>
 </attribute>
 <attribute id="c">
-	<display>Work Country</display>
+	<display>Country (professional)</display>
 	<order>27</order>
 </attribute>
 <attribute id="mozillaWorkUrl">
-	<display>Work Web page</display>
+	<display>Web Page (professional)</display>
 	<order>28</order>
+	<spacer>1</spacer>
+</attribute>
+<attribute id="mozillaCustom1">
+	<display>Custom 1</display>
+	<order>29</order>
+</attribute>
+<attribute id="mozillaCustom2">
+	<display>Custom 2</display>
+	<order>30</order>
+</attribute>
+<attribute id="mozillaCustom3">
+	<display>Custom 3</display>
+	<order>31</order>
+</attribute>
+<attribute id="mozillaCustom4">
+	<display>Custom 4</display>
+	<order>32</order>
+</attribute>
+<attribute id="description">
+	<display>Description</display>
+	<order>33</order>
 </attribute>
 </attributes>
+
 </template>