From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 1 Mar 2010 16:09:32 +0000 (+0000)
Subject: Updated generic tpl
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=83406d5a1735ba51032679e293b4398cc4a89d93;p=gosa.git

Updated generic tpl


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15812 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 806930eb3..cbbca8ed5 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -1,128 +1,85 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
+<h3>{t}Personal information{/t}</h3>
 
- <!-- Headline container -->
- <tr>
-  <td colspan="4">
-   <h2>{t}Personal information{/t}</h2>
-  </td>
- </tr>
-
- <!-- Base 1 container -->
- <tr>
-
-  <!-- Image container -->
-	<!-- Image container -->
-	<td style="vertical-align:top">
-	  <table>
-	   <tr>
-		<td width="147" height="200" bgcolor="gray">
-		{if !$userPicture_is_readable}
-			<img class='center' border="0" width="100%" src="plugins/users/images/default.jpg" alt="{t}Personal picture{/t}">
-		{else}
-			<img class='center' border="0" width="100%" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
-		{/if}
-		</td>
-	   </tr>
-	   <tr>
-		<td>
-{render acl=$userPictureACL checkbox=$multiple_support checked=$use_edit_picture}
-		 	<input style='vertical-align:top;' type="submit" name="edit_picture" value="{t}Change picture{/t}...">
-{/render}
-		</td>
-	   </tr>
-	  </table>
-	</td>
-	<!--
-	Old image container, with incorrect image scaling.
-  <td style="vertical-align:top">
-   <img align="bottom" border="1" width="145" height="200" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
-   <br>
-   <input type="submit" name="edit_picture" value="{t}Change picture{/t}...">
-  </td>
-	-->
-
-  <!-- Name, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
-    {if $is_template ne "true"}
-    <tr>
-     <td><label for="sn">{t}Last name{/t}{$must}</label></td>
-     <td>
-{if $multiple_support}
-	 <input type="text" id="sn" name="dummy2" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
+<div class="container">
+
+  <div class="container-element">
+    <div class="fieldset-left">
+      <fieldset>
+{if !$userPicture_is_readable}
+			  <img class='center' border="0" src="plugins/users/images/default.jpg" alt="{t}Personal picture{/t}">
 {else}
-{render acl=$snACL}
-	 <input type="text" id="sn" name="sn" size=25 maxlength=60 value="{$sn}">
-{/render}
+			  <img class='center' border="0" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
 {/if}
-	 </td>
-    </tr>
-    {else}
-    <tr>
-     <td><label for="sn">{t}Template name{/t}{$must}</label></td>
-     <td>{render acl=$snACL}<input type="text" id="sn" name="sn" size=25 maxlength=60 value="{$sn}">{/render}</td>
-    </tr>
-    {/if}
+        <br>
+        {render acl=$userPictureACL checkbox=$multiple_support checked=$use_edit_picture}
+          <input style='vertical-align:top;' type="submit" name="edit_picture" value="{t}Change picture{/t}...">
+        {/render}
+      </fieldset>
+    </div>
+  </div>
 
-    {if $is_template ne "true"}
-    <tr>
-     <td><label for="givenName">{t}First name{/t}{$must}</label></td>
-     <td>
+  <div class="container-element">
+    <div class="fieldset-middle">
+      <legend>{t}Generic{/t}</legend>
+      <fieldset>
+{if $is_template eq "true"}
 
-{if $multiple_support}
-	 <input type="text" id="givenName" name="dummy3" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
+        <label for="sn">{t}Template name{/t}{$must}</label>
+        {render acl=$snACL}
+          <input type="text" id="sn" name="sn" value="{$sn}">
+        {/render}
 {else}
-{render acl=$givenNameACL}
-	 <input type="text" id="givenName" name="givenName" size=25 maxlength=60 value="{$givenName}">
-{/render}
+
+ {if $multiple_support}
+
+        <label for="sn">{t}Last name{/t}{$must}</label>
+	      <input type="text" id="sn" name="dummy2" value="{t}Multiple edit{/t}" disabled>
+
+        <label for="givenName">{t}Given name{/t}{$must}</label>
+	      <input type="text" id="givenName" name="dummy3" value="{t}Multiple edit{/t}" disabled>
+
+        <label for="uid">{t}Uid{/t}{$must}</label>
+			  <input type="text" id="uid" name="dummy1" value="{t}Multiple edit{/t}" disabled>
+
+ {else}
+
+        <label for="sn">{t}Last name{/t}{$must}</label>
+        {render acl=$snACL}
+  	      <input type="text" id="sn" name="sn" value="{$sn}">
+        {/render}
+
+        <label for="givenName">{t}Given name{/t}{$must}</label>
+        {render acl=$givenNameACL}
+  	      <input type="text" id="givenName" name="givenName" value="{$givenName}">
+        {/render}
+
+        <label for="uid">{t}Uid{/t}{$must}</label>
+        {render acl=$uidACL}
+  	      <input type="text" id="uid" name="uid" value="{$uid}">
+        {/render}
+
+ {/if}
 {/if}
-	 </td>
-    </tr>
-    <tr>
-     <td><label for="uid">{t}Login{/t}{$must}</label></td>
-     <td>
-		{if !$multiple_support}
-{render acl=$uidACL}
-			<input type="text" id="uid" name="uid" size=25 maxlength=60  value="{$uid}">
-{/render}
-		{else}
-			<input type="text" id="uid" name="dummy1" size=25 maxlength=60  value="{t}Multiple edit{/t}" disabled>
-		{/if}
-	 </td>
-    </tr>
-    {/if}
-      
-    <tr>
-     <td>
+
       <div style="height:10px;"></div>
+
       <label for="personalTitle">{t}Personal title{/t}</label>
-     </td>
-     <td>
+      {render acl=$personalTitleACL checkbox=$multiple_support checked=$use_personalTitle}
+		    <input type="text" id="personalTitle" name="personalTitle" value="{$personalTitle}">
+      {/render}
+      <label for="academicTitle">{t}Academic title{/t}</label>
+      {render acl=$academicTitleACL checkbox=$multiple_support checked=$use_academicTitle}
+	      <input type="text" id="academicTitle" name="academicTitle" value="{$academicTitle}">
+      {/render}
+
       <div style="height:10px;"></div>
-{render acl=$personalTitleACL checkbox=$multiple_support checked=$use_personalTitle}
-		<input type="text" id="personalTitle" name="personalTitle" size=25 maxlength=60 value="{$personalTitle}">
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="academicTitle">{t}Academic title{/t}</label></td>
-     <td>
-{render acl=$academicTitleACL checkbox=$multiple_support checked=$use_academicTitle}
-	      <input type="text" id="academicTitle" name="academicTitle" size=25 maxlength=60 value="{$academicTitle}">
-{/render}
-     </td>
-    </tr>
+
 {if !$multiple_support}
-    <tr>
-     <td>
-      <div style="height:10px;"></div>
+
       <label for="day">{t}Date of birth{/t}</label>
-     </td>
-     <td>
-      <div style="height:10px;"></div>
-{render acl=$dateOfBirthACL}
-        <input type="text" id="dateOfBirth" name="dateOfBirth" class="date" style='width:100px' value="{$dateOfBirth}">
-        {if $dateOfBirthACL|regex_replace:"/[cdmr]/":"" == "w"}
+      {render acl=$dateOfBirthACL}
+      <input type="text" id="dateOfBirth" name="dateOfBirth" class="date"  value="{$dateOfBirth}">
+      {if $dateOfBirthACL|regex_replace:"/[cdmr]/":"" == "w"}
         <script type="text/javascript">
           {literal}
           var datepicker  = new DatePicker({ relative : 'dateOfBirth', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true,
@@ -130,222 +87,183 @@
           {/literal}
         </script>
         {/if}
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>
+      {/render}
+
       <label for="gender">{t}Sex{/t}</label>
-     </td>
-     <td>
-{render acl=$genderACL}
+      {render acl=$genderACL}
 	      <select size="1" id="gender" name="gender">
 	       {html_options options=$gender_list selected=$gender}
 	      </select>
-{/render}
-     </td>
-    </tr>
+      {/render}
+
 {/if}
-    <tr>
-     <td>
+
       <label for="preferredLanguage">{t}Preferred langage{/t}</label>
-     </td>
-     <td>
-{render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage}
+      {render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage}
 	      <select size="1" id="preferredLanguage" name="preferredLanguage">
 	       {html_options options=$preferredLanguage_list selected=$preferredLanguage}
 	      </select>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>
-      <div style="height:10px;"></div>
+      {/render}
+
       <label for="base">{t}Base{/t}</label>
-     </td>
-     <td>
       <div style="height:10px;"></div>
-{render acl=$baseACL checkbox=$multiple_support checked=$use_base}
-      {$base}
-{/render}
-     </td>
-    </tr>
-   </table>
-  </td>
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
-  </td>
-  <td style="vertical-align:top;">
-
-   <!-- Address, ... -->
-   <table summary="" style="width:100%"> 
-    <tr>
-     <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
-      <td>
-{render acl=$homePostalAddressACL checkbox=$multiple_support checked=$use_homePostalAddress}
-	     <textarea id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="homePhone">{t}Private phone{/t}</label>
-     </td><td>
-{render acl=$homePhoneACL checkbox=$multiple_support checked=$use_homePhone}
-	     <input type="text" id="homePhone" name="homePhone" size=25 maxlength=60 value="{$homePhone}">
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="labeledURI">{t}Homepage{/t}</label></td>
-     <td>
-{render acl=$labeledURIACL checkbox=$multiple_support checked=$use_labeledURI}
-	 	<input type="text" id="labeledURI" name="labeledURI" size=25 maxlength=60 value="{$labeledURI}">
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td colspan=2>
+      {render acl=$baseACL checkbox=$multiple_support checked=$use_base}
+        {$base}
+      {/render}
+
+      </fieldset>
+    </div>
+  </div>
+
+  <div class="container-element">
+    <div class="fieldset-right">
+
+      <legend>{t}Postal address{/t}</legend>
+      <fieldset>
+
+      <label for="homePostalAddress">{t}Address{/t}</label>
+      {render acl=$homePostalAddressACL checkbox=$multiple_support checked=$use_homePostalAddress}
+	      <textarea id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
+      {/render}
+     
+      <label for="homePhone">{t}Private phone{/t}</label>
+      {render acl=$homePhoneACL checkbox=$multiple_support checked=$use_homePhone}
+	      <input type="text" id="homePhone" name="homePhone" size=25 maxlength=60 value="{$homePhone}">
+      {/render}
+     
+      <label for="labeledURI">{t}Homepage{/t}</label>
+      {render acl=$labeledURIACL checkbox=$multiple_support checked=$use_labeledURI}
+        <input type="text" id="labeledURI" name="labeledURI" size=25 maxlength=60 value="{$labeledURI}">
+      {/render}
+     
       <div style="height:10px;"></div>
-     </td>
-    </tr>
-    <tr>
-     <td><label for="pw_storage">{t}Password storage{/t}</label></td>
-     <td>
-{render acl=$passwordStorageACL checkbox=$multiple_support checked=$use_pw_storage}
+
+      <label for="pw_storage">{t}Password storage{/t}</label>
+      {render acl=$passwordStorageACL checkbox=$multiple_support checked=$use_pw_storage}
 	      <select size="1" id="pw_storage" name="pw_storage" onchange='document.mainform.submit()'>
-			{foreach from=$pwmode key=value item=desc}
-				<option value="{$value}" {if $pwmode_select == $value}selected{/if} >{$desc}</option>
-			{/foreach}
+          {foreach from=$pwmode key=value item=desc}
+            <option value="{$value}" {if $pwmode_select == $value}selected{/if} >{$desc}</option>
+          {/foreach}
 	      </select>
-	{if $pw_configurable eq "true"}
-	      &nbsp; <input id="edit_pw_method" type="submit" name="edit_pw_method" value="{t}Configure{/t}...">
-	{/if}
-{/render}
-     </td>
-    </tr>
-
-    {if $is_template ne "true" && !$multiple_support}
-    <tr>
-     <td><label for="edit_cert">{t}Certificates{/t}</label></td>
-     <td>
-{render acl=$CertificatesACL mode=read_active}
-      		<input id="edit_cert" type="submit" name="edit_cert" value="{t}Edit certificates{/t}...">
-{/render}
-     </td>
-    </tr>
-    {/if}
+      {/render}
+      {render acl=$passwordStorageACL checkbox=$multiple_support checked=$use_pw_storage}
+      	{if $pw_configurable eq "true"}
+	        &nbsp; <input id="edit_pw_method" type="submit" name="edit_pw_method" value="{t}Configure{/t}...">
+	      {/if}
+      {/render}
+     
+      {if $is_template ne "true" && !$multiple_support}
+        <label for="edit_cert">{t}Certificates{/t}</label>
+        {render acl=$CertificatesACL mode=read_active}
+          <input id="edit_cert" type="submit" name="edit_cert" value="{t}Edit certificates{/t}...">
+        {/render}
+      {/if}
 
-    <tr>
-     <td colspan=2>
       <div style="height:10px;"></div>
-     </td>
-    </tr>
-    <tr>
-     <td style='vertical-align:top'><label for="edit_perms">{t}Restrict login to{/t}</label></td>
-     <td>
-     
-     {if !$multiple_support}
-       {render acl=$gosaLoginRestrictionACL}
-         {$gosaLoginRestrictionWidget}
-       {/render}
-        {render acl=$gosaLoginRestrictionACL}
-       <input type="text" id="res" name="res" size=22 maxlength=33 
-        value="{t}IP or network{/t}" onFocus='document.getElementById("res").value=""'>
-       {/render}
-        {render acl=$gosaLoginRestrictionACL}
-       <input id="add_res" type="submit" name="add_res" value="{t}Add{/t}">
-       {/render}
-      
-     {else}
-      <input type='checkbox' name='use_gosaLoginRestriction' {if $use_gosaLoginRestriction} checked {/if}
-        onClick='document.mainform.submit();'
-      >
-      {if !$use_gosaLoginRestriction}
-        {render acl=$gosaLoginRestriction_ONLY_R_ACL}
-          {$gosaLoginRestrictionWidget}
-        {/render}
-      {else}
+     
+      {if !$multiple_support}
         {render acl=$gosaLoginRestrictionACL}
           {$gosaLoginRestrictionWidget}
         {/render}
         {render acl=$gosaLoginRestrictionACL}
-	        <input type="text" id="res" name="res" size=22 maxlength=33 
-            value="{t}IP or network{/t}" onFocus='document.getElementById("res").value=""'>
+        <input type="text" id="res" name="res" size=22 maxlength=33 
+          value="{t}IP or network{/t}" onFocus='document.getElementById("res").value=""'>
         {/render}
         {render acl=$gosaLoginRestrictionACL}
-     	    <input id="add_res" type="submit" name="add_res" value="{t}Add{/t}">
+          <input id="add_res" type="submit" name="add_res" value="{t}Add{/t}">
         {/render}
+      
+      {else}
+
+        <input type='checkbox' name='use_gosaLoginRestriction' {if $use_gosaLoginRestriction} checked {/if}
+          onClick='document.mainform.submit();'>
+        {if !$use_gosaLoginRestriction}
+          {render acl=$gosaLoginRestriction_ONLY_R_ACL}
+            {$gosaLoginRestrictionWidget}
+          {/render}
+        {else}
+          {render acl=$gosaLoginRestrictionACL}
+            {$gosaLoginRestrictionWidget}
+          {/render}
+          {render acl=$gosaLoginRestrictionACL}
+            <input type="text" id="res" name="res" size=22 maxlength=33 
+              value="{t}IP or network{/t}" onFocus='document.getElementById("res").value=""'>
+          {/render}
+          {render acl=$gosaLoginRestrictionACL}
+            <input id="add_res" type="submit" name="add_res" value="{t}Add{/t}">
+          {/render}
+        {/if}
       {/if}
-     {/if}
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
+
+      </fieldset>
+    </div>
+  </div>
+</div>
+
+<!--
 
 <p class="seperator">&nbsp;</p>
 
-<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
+
 
  <!-- Headline container -->
- <tr>
-  <td colspan="3">
+ 
+  
    <h2>{t}Organizational information{/t}</h2>
-  </td>
- </tr>
+  
+ 
 
  <!-- Base 2 container -->
- <tr>
+ 
 
   {if $governmentmode ne "true"}
   <!-- Company, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
-    <tr>
-     <td><label for="o">{t}Organization{/t}</label></td>
-     <td>	
+  
+    
+    
+     <label for="o">{t}Organization{/t}</label>
+     	
 {render acl=$oACL checkbox=$multiple_support checked=$use_o}
 		<input type="text" id="o" name="o" size=22 maxlength=60 value="{$o}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="ou">{t}Department{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="ou">{t}Department{/t}</label>
+     
 {render acl=$ouACL checkbox=$multiple_support checked=$use_ou}
 		<input type="text" id="ou" name="ou" size=22 maxlength=60 value="{$ou}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="departmentNumber">{t}Department No.{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="departmentNumber">{t}Department No.{/t}</label>
+     
 {render acl=$departmentNumberACL checkbox=$multiple_support checked=$use_departmentNumber}
 	      <input type="text" id="departmentNumber" name="departmentNumber" size=22 maxlength=60 value="{$departmentNumber}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="employeeNumber">{t}Employee No.{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="employeeNumber">{t}Employee No.{/t}</label>
+     
 {render acl=$employeeNumberACL checkbox=$multiple_support checked=$use_employeeNumber}
       		<input type="text" id="employeeNumber" name="employeeNumber" size=22 maxlength=60 value="{$employeeNumber}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="employeeType">{t}Employee type{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="employeeType">{t}Employee type{/t}</label>
+     
 {render acl=$employeeTypeACL checkbox=$multiple_support checked=$use_employeeType}
       		<input type="text" id="employeeType" name="employeeType" size=22 maxlength=60 value="{$employeeType}">
 {/render}
-     </td>
-    </tr>
+     
+    
     {if !$multiple_support}
-    <tr>
-     <td><label for="manager">{t}Manager{/t}</label></td>
-     <td>
+    
+     <label for="manager">{t}Manager{/t}</label>
+     
 {render acl=$managerACL}
         <input type='text' name='manager_name' id='manager_name' value='{$manager_name}' disabled
           title='{$manager}'>
@@ -361,12 +279,12 @@
         <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
 {/render}
         {/if}
-     </td>
-    </tr>
+     
+    
     {else}
-    <tr>
-     <td><label for="manager">{t}Manager{/t}</label></td>
-     <td>
+    
+     <label for="manager">{t}Manager{/t}</label>
+     
       <input type='checkbox' value="1" name="use_manager" id="use_manager" {if $use_manager} checked {/if}
         onClick="document.mainform.submit();">
         <input type='text' name='manager_name' id='manager_name' value='{$manager_name}' disabled
@@ -378,213 +296,213 @@
         <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
         {/if}
         {/if}
-     </td>
-    </tr>
+     
+    
   
     {/if}
-   </table>
-  </td>
    
-  <td style="border-left:1px solid #A0A0A0">
+  
+   
+  
    &nbsp;
-  </td>
+  
 
   <!-- Phone, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
-    <tr>
-     <td><label for="roomNumber">{t}Room No.{/t}</label></td>
-     <td>
+  
+    
+    
+     <label for="roomNumber">{t}Room No.{/t}</label>
+     
 {render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber}
 		<input type="text" id="roomNumber" name="roomNumber" size=22 maxlength=60 value="{$roomNumber}">
 {/render}
-     </td>
-    </tr>
+     
+    
     {if $has_phoneaccount ne "true"}
-    <tr>
-     <td><label for="telephoneNumber">{t}Phone{/t}</label></td>
-     <td>
+    
+     <label for="telephoneNumber">{t}Phone{/t}</label>
+     
 {render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber}
       		<input type="text" id="telephoneNumber" name="telephoneNumber" size=22 maxlength=60 value="{$telephoneNumber}">
 {/render}
-     </td>
-    </tr>
+     
+    
     {/if}
-    <tr>
-     <td><label for="mobile">{t}Mobile{/t}</label></td>
-     <td>
+    
+     <label for="mobile">{t}Mobile{/t}</label>
+     
 {render acl=$mobileACL checkbox=$multiple_support checked=$use_mobile}
 		<input type="text" id="mobile" name="mobile" size=22 maxlength=60 value="{$mobile}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="pager">{t}Pager{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="pager">{t}Pager{/t}</label>
+     
 {render acl=$pagerACL checkbox=$multiple_support checked=$use_pager}
       		<input type="text" id="pager" name="pager" size=22 maxlength=60 value="{$pager}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="facsimileTelephoneNumber">{t}Fax{/t}</label>
+     
 {render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber}
 		<input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" size=22 maxlength=60 value="{$facsimileTelephoneNumber}">
 {/render}
-     </td>
-    </tr>
-   </table>
-  </td>
+     
+    
+   
+  
 
-  <td style="border-left:1px solid #A0A0A0">
+  
    &nbsp;
-  </td>
+  
 
   <!-- Location, ... -->
-  <td style="vertical-align:top;">
-   <table summary="" style="width:100%"> 
-    <tr>
-     <td><label for="l">{t}Location{/t}</label></td>
-     <td>
+  
+    
+    
+     <label for="l">{t}Location{/t}</label>
+     
 {render acl=$lACL checkbox=$multiple_support checked=$use_l}
 		<input type="text" id="l" name="l" size=22 maxlength=60 value="{$l}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="st">{t}State{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="st">{t}State{/t}</label>
+     
 {render acl=$stACL checkbox=$multiple_support checked=$use_st}
 		<input type="text" id="st" name="st" size=22 maxlength=60 value="{$st}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td style="vertical-align:top;"><label for="postalAddress">{t}Address{/t}</label></td>
-     <td>
+     
+    
+    
+     
+     
 {render acl=$postalAddressACL checkbox=$multiple_support checked=$use_postalAddress}
       		<textarea id="postalAddress" name="postalAddress" rows=3 style="width:100%">{$postalAddress}</textarea>
 {/render}
-     </td>
-    </tr>
-   </table>
-  </td>
+     
+    
+   
+  
 
   {else} 
 
   <!-- Beschreibung, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
-   <table summary=""> 
-    <tr>
-     <td><label for="vocation">{t}Vocation{/t}</label></td>
-     <td>
+  
+    
+    
+     <label for="vocation">{t}Vocation{/t}</label>
+     
 {render acl=$vocationACL checkbox=$multiple_support checked=$use_vocation}
 		<input type="text" id="vocation" name="vocation" size=22 maxlength=60 value="{$vocation}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="gouvernmentOrganizationalUnitDescription">{t}Unit description{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="gouvernmentOrganizationalUnitDescription">{t}Unit description{/t}</label>
+     
 {render acl=$gouvernmentOrganizationalUnitDescriptionACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitDescription}
       		<input type="text" id="gouvernmentOrganizationalUnitDescription" name="gouvernmentOrganizationalUnitDescription" size=22 maxlength=60
 		value="{$gouvernmentOrganizationalUnitDescription}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="gouvernmentOrganizationalUnitSubjectArea">{t}Subject area{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="gouvernmentOrganizationalUnitSubjectArea">{t}Subject area{/t}</label>
+     
 {render acl=$gouvernmentOrganizationalUnitSubjectAreaACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitSubjectArea}
 	      	<input type="text" id="gouvernmentOrganizationalUnitSubjectArea" name="gouvernmentOrganizationalUnitSubjectArea" size=22 maxlength=60
            	value="{$gouvernmentOrganizationalUnitSubjectArea}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="functionalTitle">{t}Functional title{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="functionalTitle">{t}Functional title{/t}</label>
+     
 {render acl=$functionalTitleACL checkbox=$multiple_support checked=$use_functionalTitle}
       		<input type="text" name="functionalTitle" id="functionalTitle"  size=22 maxlength=60
              	value="{$functionalTitle}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="role">{t}Role{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="role">{t}Role{/t}</label>
+     
 {render acl=$roleACL checkbox=$multiple_support checked=$use_role}
       		<input type="text" id="role" name="role" size=22 maxlength=60 value="{$role}">
 {/render}
-     </td>
-    </tr>
-   </table>
-  </td>
+     
+    
+   
+  
   
   <!-- Phone, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
-   <table summary=""> 
-    <tr>
-     <td><label for="gouvernmentOrganizationalPersonLocality">{t}Person locality{/t}</label></td>
-     <td>
+  
+    
+    
+     <label for="gouvernmentOrganizationalPersonLocality">{t}Person locality{/t}</label>
+     
 {render acl=$gouvernmentOrganizationalPersonLocalityACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalPersonLocality}
       		<input type="text" id="gouvernmentOrganizationalPersonLocality" name="gouvernmentOrganizationalPersonLocality" size=22 maxlength=60
                 value="{$gouvernmentOrganizationalPersonLocality}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="gouvernmentOrganizationalUnit">{t}Unit{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="gouvernmentOrganizationalUnit">{t}Unit{/t}</label>
+     
 {render acl=$gouvernmentOrganizationalUnitACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnit}
 		<input type="text" id="gouvernmentOrganizationalUnit" name="gouvernmentOrganizationalUnit" size=22 maxlength=60 
             	value="{$gouvernmentOrganizationalUnit}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="street">{t}Street{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="street">{t}Street{/t}</label>
+     
 {render acl=$streetACL checkbox=$multiple_support checked=$use_street}
       		<input type="text" name="street" id="street" size=22 maxlength=60 value="{$street}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="postalCode">{t}Postal code{/t}</label></td>
-     <td> 
+     
+    
+    
+     <label for="postalCode">{t}Postal code{/t}</label>
+      
 {render acl=$postalCodeACL checkbox=$multiple_support checked=$use_postalCode}
       		<input type="text" name="postalCode" id="postalCode" size=22 maxlength=60 value="{$postalCode}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="houseIdentifier">{t}House identifier{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="houseIdentifier">{t}House identifier{/t}</label>
+     
 {render acl=$houseIdentifierACL checkbox=$multiple_support checked=$use_houseIdentifier}
       		<input type="text" id="houseIdentifier" name="houseIdentifier" size=22 maxlength=60
              	value="{$houseIdentifier}">
 {/render}
-     </td>
-    </tr>
-   </table>
-  </td>
+     
+    
+   
+  
 
   <!-- Location, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
-    <tr>
-     <td><label for="roomNumber">{t}Room No.{/t}</label></td>
-     <td>
+  
+    
+    
+     <label for="roomNumber">{t}Room No.{/t}</label>
+     
 {render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber}
 		<input type="text" id="roomNumber" name="roomNumber" size=22 maxlength=60 value="{$roomNumber}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="telephoneNumber">{t}Phone{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="telephoneNumber">{t}Phone{/t}</label>
+     
 {render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber}
 	      {if $has_phoneaccount ne "true"}
 			<input type="text" id="telephoneNumber" name="telephoneNumber" size=22 maxlength=60 value="{$telephoneNumber}">
@@ -592,41 +510,41 @@
 			<i>{t}Please use the phone tab{/t}</i>
 	      {/if}
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="facsimileTelephoneNumber">{t}Fax{/t}</label>
+     
 {render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber}
       		<input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" size=22 maxlength=60 
                 value="{$facsimileTelephoneNumber}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="ivbbLastDeliveryCollective">{t}Last delivery{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="ivbbLastDeliveryCollective">{t}Last delivery{/t}</label>
+     
 {render acl=$ivbbLastDeliveryCollectiveACL checkbox=$multiple_support checked=$use_ivbbLastDeliveryCollective}
       		<input type="text" name="ivbbLastDeliveryCollective" size=22 maxlength=60 id="ivbbLastDeliveryCollective" 
              	value="{$ivbbLastDeliveryCollective}">
 {/render}
-     </td>
-    </tr>
-    <tr>
-     <td><label for="publicVisible">{t}Public visible{/t}</label></td>
-     <td>
+     
+    
+    
+     <label for="publicVisible">{t}Public visible{/t}</label>
+     
 {render acl=$publicVisibleACL checkbox=$multiple_support checked=$use_publicVisible}
 	      <select size="1" id="publicVisible" name="publicVisible">
 	       {html_options values=$ivbbmodes output=$ivbbmodes selected=$publicVisible}
 	      </select>
 {/render}
-     </td>
-    </tr>
-   </table>
-  </td>
+     
+    
+   
+  
  {/if} 
- </tr>
-</table>
+ 
+
 
 {if $multiple_support}
 	<input type="hidden" name="user_mulitple_edit" value="1">
@@ -639,3 +557,4 @@
 	focus_field('sn');
   -->
 </script>
+-->