From 9973835b360eb0966bdf0263f0ff7c98e9b4b3b3 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sat, 8 Sep 2001 04:52:17 +0000
Subject: [PATCH] Update this form to match the other

---
 admin/templates/default/account_form_ldap.tpl | 101 +++++++++---------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/admin/templates/default/account_form_ldap.tpl b/admin/templates/default/account_form_ldap.tpl
index 793279e109..132e5a5c5e 100644
--- a/admin/templates/default/account_form_ldap.tpl
+++ b/admin/templates/default/account_form_ldap.tpl
@@ -5,59 +5,55 @@
   <center>
 	<table border="0" width="95%">
 		<tr>
+			<td valign="top">
 				{rows}
-			<td>
-				<table border="0" width="100%">
-					<tr bgcolor="{th_bg}">
-						<td colspan="4">
-							<b>{lang_action}</b>
-						</td>
-					</tr>
-					
-					<tr bgcolor="{tr_color1}">
-						<td width="25%">
-							{lang_loginid}
-						</td>
-						<td width="25%">
-							{account_lid}&nbsp;
-						</td>
-						<td width="25%">
-							{lang_account_active}:
-						</td>
-						<td width="25%">
-							{account_status}
-						</td>
-					</tr>
-					
-					<tr bgcolor="{tr_color2}">
-						<td>{lang_firstname}</td>
-						<td>{account_firstname}&nbsp;</td>
-						<td>{lang_lastname}</td>
-						<td>{account_lastname}&nbsp;</td>
-					</tr>
+			</td>
+			<td valign="top">
 
-    <tr bgcolor="{tr_color2}">
-     <td>{lang_homedir}</td>
-     <td>{homedirectory}&nbsp;</td>
-     <td>{lang_shell}</td>
-     <td>{loginshell}&nbsp;</td>
-    </tr>
-    {password_fields}
+			   <table border=0 width=100%>
+			    <tr bgcolor="{th_bg}">
+			      <td colspan="4"><b>{lang_action}</b></td>
+			    </tr>
+				
+			    <tr bgcolor="{tr_color1}">
+			     <td width="25%">{lang_loginid}</td>
+			     <td width="25%">{account_lid}&nbsp;</td>
+				
+			     <td width="25%">{lang_account_active}:</td>
+			     <td width="25%">{account_status}</td>
+			    </tr>
+				
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_firstname}</td>
+			     <td>{account_firstname}&nbsp;</td>
+			     <td>{lang_lastname}</td>
+			     <td>{account_lastname}&nbsp;</td>
+			    </tr>
+			
+			    {password_fields}
+
+			    <tr bgcolor="{tr_color2}">
+				 <td>{lang_homedir}</td>
+				 <td>{homedirectory}&nbsp;</td>
+				 <td>{lang_shell}</td>
+				 <td>{loginshell}&nbsp;</td>
+				</tr>
  
-    <tr bgcolor="{tr_color2}">
-     <td>{lang_groups}</td>
-     <td>{groups_select}&nbsp;</td>
-     <td>{lang_file_space}</td>
-     <td>{account_file_space}{account_file_space_select}</td>
-    </tr>
-
-    </tr>
-
-    {permissions_list}
-    
-	{form_buttons}
-
-   </table>
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_groups}</td>
+			     <td colspan="3">{groups_select}&nbsp;</td>
+			    </tr>
+			
+			    <tr bgcolor="{tr_color1}">
+			     <td>{lang_expires}</td>
+			     <td colspan=3>{input_expires}&nbsp;</td>
+			    </tr>
+			
+			    {permissions_list}
+			    
+				 {form_buttons}
+			
+			   </table>
    			</td>
    		</tr>
    	</table>
@@ -90,3 +86,8 @@
     </tr>
 <!-- END form_logininfo -->
 
+<!-- BEGIN link_row -->
+	<tr bgcolor="{tr_color}">
+		<td>&nbsp;<a href="{row_link}">{row_text}</a></td>
+	</tr>
+<!-- END link_row -->