X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fpersonal%2Fgeneric%2Fgeneric.tpl;h=b0dbfc81bbfef9c4020871337ea3e5cfbcbe64a1;hb=18f1a48e61ead1ee3711f2c41358bbed7afa2390;hp=5f21d7624fbda8f056be838aa207766ca8b145cd;hpb=d0bd7629ab11905ed35e9a431cb8e3083ceabaa1;p=gosa.git

diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 5f21d7624..b0dbfc81b 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -1,561 +1,632 @@
-<h3>{t}Personal information{/t}</h3>
-
-<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}
-			  <img class='center' border="0" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
-{/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>
-
-  <div class="container-element" style='width:30%;'>
-    <div class="fieldset-middle">
-      <legend>{t}Generic{/t}</legend>
-      <fieldset>
-{if $is_template eq "true"}
-
-        <label for="sn">{t}Template name{/t}{$must}</label>
-        {render acl=$snACL}
-          <input type="text" id="sn" name="sn" value="{$sn}">
-        {/render}
-{else}
-
- {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}
+<h3>{t}Personal information{/t}</h3>
 
-        <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}
+<table summary="{t}Personal information{/t}">
+ <tr>
+  <td>
 
-        <label for="uid">{t}Uid{/t}{$must}</label>
-        {render acl=$uidACL}
-  	      <input type="text" id="uid" name="uid" value="{$uid}">
-        {/render}
+   <!-- The users picture settings container -->
+   <table summary="{t}The users picture{/t}">
+    <tr>
+     <td style='width:147px; height:200px; background-color:gray;'>
+      {if !$userPicture_is_readable}
+      <img  src="plugins/users/images/default.jpg" alt=''>
+      {else}
+      <img  src="getbin.php?rand={$rand}" alt='' style='width:147px;' >
+      {/if}
+     </td>
+    </tr>
+    <tr>
+     <td>
+      {render acl=$userPictureACL checkbox=$multiple_support checked=$use_edit_picture}
+      <button type="submit" name="edit_picture">{t}Change picture{/t}...</button>
+      {/render}
+     </td>
+    </tr>
+   </table>
+  <!-- /The users picture settings container -->
+
+  </td> 
+  <td>
+
+   {if $is_template ne "true"}
+
+   <!-- The users personal settings container -->
+   <table summary="{t}Account settings{/t}"> 
+    <tr>
+     <td>
+      <label for="sn">{t}Last name{/t}{$must}</label>
+     </td>
+     <td>
+      {if $multiple_support}
+       <input type="text" id="sn" name="dummy2" maxlength=60 value="{t}Multiple edit{/t}" disabled>
+      {else}
+       {render acl=$snACL}
+        <input type="text" id="sn" name="sn" maxlength=60 value="{$sn}">
+       {/render}
+      {/if}
+     </td>
+    </tr>
+    <tr>
+     <td>
+      <label for="givenName">{t}First name{/t}{$must}</label>
+     </td>
+     <td>
+      {if $multiple_support}
+       <input type="text" id="givenName" name="dummy3" maxlength=60 value="{t}Multiple edit{/t}" disabled>
+      {else}
+       {render acl=$givenNameACL}
+        <input type="text" id="givenName" name="givenName" maxlength=60 value="{$givenName}">
+       {/render}
+      {/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" maxlength=60  value="{$uid}">
+       {/render}
+      {else}
+       <input type="text" id="uid" name="dummy1" maxlength=60  value="{t}Multiple edit{/t}" disabled>
+      {/if}
+     </td>
+    </tr>
 
- {/if}
-{/if}
+   {else}
 
-      <div style="height:10px;"></div>
+   <!-- The template settings container -->
+   <table summary="{t}Account settings{/t}"> 
+    <tr>
+     <td><label for="sn">{t}Template name{/t}{$must}</label></td>
+     <td>{render acl=$snACL}<input type="text" id="sn" name="sn" maxlength=60 value="{$sn}">{/render}</td>
+    </tr>
 
+   {/if}
+    
+   <!-- Additional account/template settings -->
+    <tr>
+     <td>
       <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}">
+       <input type="text" id="personalTitle" name="personalTitle" 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" value="{$academicTitle}">
+       <input type="text" id="academicTitle" name="academicTitle" maxlength=60 value="{$academicTitle}">
       {/render}
+     </td>
+    </tr>
 
-      <div style="height:10px;"></div>
-
-{if !$multiple_support}
+    {if !$multiple_support}
 
-      <label for="day">{t}Date of birth{/t}</label>
-      {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,
-                                             enableCloseEffect : false, enableShowEffect : false });
-          {/literal}
-        </script>
-        {/if}
+    <!-- Date of birth container (not visible in mutliple edit) -->
+    <tr>
+     <td>
+      <div style="height:10px;"></div>
+      <label for="dateOfBirth">{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" 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,
+                    enableCloseEffect : false, 
+                    enableShowEffect : false });
+           {/literal}
+          </script>
+         {/if}
       {/render}
-
+     </td>
+    </tr>
+    <tr>
+     <td>
       <label for="gender">{t}Sex{/t}</label>
+     </td>
+     <td>
       {render acl=$genderACL}
-	      <select size="1" id="gender" name="gender">
-	       {html_options options=$gender_list selected=$gender}
-	      </select>
+       <select size="1" id="gender" name="gender">
+        {html_options options=$gender_list selected=$gender}
+       </select>
       {/render}
+     </td>
+    </tr>
+    {/if}
 
-{/if}
-
+    <tr>
+     <td>
       <label for="preferredLanguage">{t}Preferred langage{/t}</label>
+     </td>
+     <td>
       {render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage}
-	      <select size="1" id="preferredLanguage" name="preferredLanguage">
-	       {html_options options=$preferredLanguage_list selected=$preferredLanguage}
-	      </select>
+      <select size="1" id="preferredLanguage" name="preferredLanguage">
+       {html_options options=$preferredLanguage_list selected=$preferredLanguage}
+      </select>
       {/render}
-
-      <label for="base">{t}Base{/t}</label>
-      <div style="height:10px;"></div>
+     </td>
+    </tr>
+    <tr>
+     <td>
+      <div style="height:10px;"> </div>
+      {t}Base{/t}
+     </td>
+     <td>
+      <div style="height:10px;"> </div>
       {render acl=$baseACL checkbox=$multiple_support checked=$use_base}
-        {$base}
+      {$base}
       {/render}
-
-      </fieldset>
-    </div>
-  </div>
-
-  <div class="container-element" style='width:50%;'>
-    <div class="fieldset-right">
-
-      <fieldset>
-
-      <label for="homePostalAddress">{t}Address{/t}</label>
+     </td>
+    </tr>
+   </table>
+
+  </td>
+  <td class='left-border'>   &nbsp;
+  </td>
+
+  <td>
+   <table style="width:100%" summary="{t}Postal address{/t}"> 
+    <tr>
+     <td><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>
+        <textarea cols='200' id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
       {/render}
-     
-      <label for="homePhone">{t}Private phone{/t}</label>
+     </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}">
+      <input type="text" id="homePhone" name="homePhone" maxlength=60 value="{$homePhone}">
       {/render}
-     
-      <label for="labeledURI">{t}Homepage{/t}</label>
+     </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}
-     
-      <div style="height:10px;"></div>
-
-      <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}
-	      </select>
+      <input type="text" id="labeledURI" name="labeledURI" maxlength=60 value="{$labeledURI}">
       {/render}
+     </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}
-      	{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}
+      <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}
+      </select>
+      {if $pw_configurable eq "true"}
+      &nbsp; <button id="edit_pw_method" type="submit" name="edit_pw_method">{t}Configure{/t}...</button>
       {/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}
+      <button id="edit_cert" type="submit" name="edit_cert">{t}Edit certificates{/t}...</button>
+      {/render}
+     </td>
+    </tr>
+    {/if}
+    
+    <tr>
+     <td colspan=2>
       <div style="height:10px;"></div>
-     
+     </td>
+    </tr>
+    <tr>
+     <td colspan="2"><label for="res">{t}Restrict login to{/t}</label>
+      
       {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}
+      {render acl=$gosaLoginRestrictionACL}
+      {$gosaLoginRestrictionWidget}
+      {/render}
+      {render acl=$gosaLoginRestrictionACL}
+      <input type="text" id="res" name="res" maxlength=33 
+      value="{t}IP or network{/t}" onFocus='document.getElementById("res").value=""'>
+      {/render}
+      {render acl=$gosaLoginRestrictionACL}
+      <button id="add_res" type="submit" name="add_res">{t}Add{/t}</button>
+      {/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}
+      <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" maxlength=33 
+      value="{t}IP or network{/t}" onFocus='document.getElementById("res").value=""'>
+      {/render}
+      {render acl=$gosaLoginRestrictionACL}
+      <button id="add_res" type="submit" name="add_res">{t}Add{/t}</button>
+      {/render}
       {/if}
-
-      </fieldset>
-    </div>
-  </div>
-</div>
-
-<div class='clear'></div>
-
-<!--
-
-<p class="seperator">&nbsp;</p>
-
-
-
- <!-- Headline container -->
- 
-  
-   <h2>{t}Organizational information{/t}</h2>
-  
- 
-
- <!-- Base 2 container -->
- 
+      {/if}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</table>
+
+<hr>
+
+<table summary="{t}Organizational information{/t}">
+ <tr>
+  <td colspan="3">
+   <h3>{t}Organizational information{/t}</h3>
+  </td>
+ </tr>
+ <tr>
 
   {if $governmentmode ne "true"}
   <!-- Company, ... -->
-  
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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>
+   <table summary="{t}Organizational information{/t} - {t}part{/t} 1">
+    <tr>
+     <td><label for="o">{t}Organization{/t}</label></td>
+     <td>	
+      {render acl=$oACL checkbox=$multiple_support checked=$use_o}
+      <input type="text" id="o" name="o" maxlength=60 value="{$o}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="ou">{t}Department{/t}</label></td>
+     <td>
+      {render acl=$ouACL checkbox=$multiple_support checked=$use_ou}
+      <input type="text" id="ou" name="ou" maxlength=60 value="{$ou}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="departmentNumber">{t}Department No.{/t}</label></td>
+     <td>
+      {render acl=$departmentNumberACL checkbox=$multiple_support checked=$use_departmentNumber}
+      <input type="text" id="departmentNumber" name="departmentNumber" maxlength=60 value="{$departmentNumber}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="employeeNumber">{t}Employee No.{/t}</label></td>
+     <td>
+      {render acl=$employeeNumberACL checkbox=$multiple_support checked=$use_employeeNumber}
+      <input type="text" id="employeeNumber" name="employeeNumber" maxlength=60 value="{$employeeNumber}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="employeeType">{t}Employee type{/t}</label></td>
+     <td>
+      {render acl=$employeeTypeACL checkbox=$multiple_support checked=$use_employeeType}
+      <input type="text" id="employeeType" name="employeeType" maxlength=60 value="{$employeeType}">
+      {/render}
+     </td>
+    </tr>
     {if !$multiple_support}
-    
-     <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}'>
-{/render}
-{render acl=$managerACL}
-        <input type='image' src='images/lists/edit.png' name='editManager' class='center'>
-{/render}
-        {if $manager!=""}
-{render acl=$managerACL}
-        <img src='images/info_small.png' title='{$manager}' class='center'>
-{/render}
-{render acl=$managerACL}
-        <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
-{/render}
-        {/if}
-     
-    
+    <tr>
+     <td><label for="manager_name">{t}Manager{/t}</label></td>
+     <td>
+      {render acl=$managerACL}
+        <input type='text' name='manager_name' id='manager_name' value='{$manager_name}' disabled title='{$manager}'
+          style='width:130px;'>
+      {/render}
+
+      {image path="images/lists/edit.png" action="editManager" acl=$managerACL}
+      {if $manager!=""}
+        {image path="images/info_small.png" title="{$manager}" acl=$managerACL}
+        {image path="images/lists/trash.png" action="removeManager" acl=$managerACL}
+      {/if}
+     </td>
+    </tr>
     {else}
-    
-     <label for="manager">{t}Manager{/t}</label>
-     
+    <tr>
+     <td><label for="manager">{t}Manager{/t}</label></td>
+     <td>
       <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
-          title='{$manager}'>
-        {if $use_manager}
-        <input type='image' src='images/lists/edit.png' name='editManager' class='center'>
-        {if $manager!=""}
-        <img src='images/info_small.png' title='{$manager}' class='center'>
-        <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
-        {/if}
-        {/if}
-     
+      onClick="document.mainform.submit();">
+      <input type='text' name='manager_name' id='manager_name' value='{$manager_name}' disabled
+      title='{$manager}'>
+      {if $use_manager}
+      {image path="images/lists/edit.png" action="editManager"}
+
+      {if $manager!=""}
+      {image path="images/info_small.png" title="{$manager}"}
+
+      {image path="images/lists/trash.png" action="removeManager"}
+
+      {/if}
+      {/if}
+     </td>
+    </tr>
     
-  
     {/if}
-   
+   </table>
+  </td>
   
-   
+  <td class='left-border'>   &nbsp;
+  </td>
   
-   &nbsp;
-  
-
   <!-- Phone, ... -->
-  
-    
-    
-     <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>
+   <table summary="{t}Organizational information{/t} - {t}part{/t} 2">
+    <tr>
+     <td><label for="roomNumber">{t}Room No.{/t}</label></td>
+     <td>
+      {render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber}
+      <input type="text" id="roomNumber" name="roomNumber" maxlength=60 value="{$roomNumber}">
+      {/render}
+     </td>
+    </tr>
     {if $has_phoneaccount ne "true"}
-    
-     <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}
-     
-    
+    <tr>
+     <td><label for="telephoneNumber">{t}Phone{/t}</label></td>
+     <td>
+      {render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber}
+      <input type="text" id="telephoneNumber" name="telephoneNumber" maxlength=60 value="{$telephoneNumber}">
+      {/render}
+     </td>
+    </tr>
     {/if}
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-   
-  
-
+    <tr>
+     <td><label for="mobile">{t}Mobile{/t}</label></td>
+     <td>
+      {render acl=$mobileACL checkbox=$multiple_support checked=$use_mobile}
+      <input type="text" id="mobile" name="mobile" maxlength=60 value="{$mobile}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="pager">{t}Pager{/t}</label></td>
+     <td>
+      {render acl=$pagerACL checkbox=$multiple_support checked=$use_pager}
+      <input type="text" id="pager" name="pager" maxlength=60 value="{$pager}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label></td>
+     <td>
+      {render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber}
+      <input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" maxlength=60 value="{$facsimileTelephoneNumber}">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
   
-   &nbsp;
+  <td class='left-border'>   &nbsp;
+  </td>
   
-
   <!-- Location, ... -->
+  <td>
+   <table summary="{t}Organizational information{/t} - {t}part{/t} 3">
+    <tr>
+     <td><label for="l">{t}Location{/t}</label></td>
+     <td>
+      {render acl=$lACL checkbox=$multiple_support checked=$use_l}
+      <input type="text" id="l" name="l" maxlength=60 value="{$l}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="st">{t}State{/t}</label></td>
+     <td>
+      {render acl=$stACL checkbox=$multiple_support checked=$use_st}
+      <input type="text" id="st" name="st" maxlength=60 value="{$st}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="postalAddress">{t}Address{/t}</label></td>
+     <td>
+      {render acl=$postalAddressACL checkbox=$multiple_support checked=$use_postalAddress}
+        <textarea cols="200" id="postalAddress" name="postalAddress" rows=3 style="width:100%">{$postalAddress}</textarea>
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </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}
-     
-    
-    
-     <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}
-     
-    
-    
-     
-     
-{render acl=$postalAddressACL checkbox=$multiple_support checked=$use_postalAddress}
-      		<textarea id="postalAddress" name="postalAddress" rows=3 style="width:100%">{$postalAddress}</textarea>
-{/render}
-     
-    
-   
-  
-
   {else} 
-
-  <!-- Beschreibung, ... -->
-  
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-   
   
+  <!-- Beschreibung, ... -->
+  <td class="right-border">
+   <table summary="{t}Organizational information{/t} - {t}part{/t} 1">
+    <tr>
+     <td><label for="vocation">{t}Vocation{/t}</label></td>
+     <td>
+      {render acl=$vocationACL checkbox=$multiple_support checked=$use_vocation}
+      <input type="text" id="vocation" name="vocation" maxlength=60 value="{$vocation}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="gouvernmentOrganizationalUnitDescription">{t}Unit description{/t}</label></td>
+     <td>
+      {render acl=$gouvernmentOrganizationalUnitDescriptionACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitDescription}
+      <input type="text" id="gouvernmentOrganizationalUnitDescription" name="gouvernmentOrganizationalUnitDescription" maxlength=60
+      value="{$gouvernmentOrganizationalUnitDescription}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="gouvernmentOrganizationalUnitSubjectArea">{t}Subject area{/t}</label></td>
+     <td>
+      {render acl=$gouvernmentOrganizationalUnitSubjectAreaACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitSubjectArea}
+      <input type="text" id="gouvernmentOrganizationalUnitSubjectArea" name="gouvernmentOrganizationalUnitSubjectArea" maxlength=60
+      value="{$gouvernmentOrganizationalUnitSubjectArea}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="functionalTitle">{t}Functional title{/t}</label></td>
+     <td>
+      {render acl=$functionalTitleACL checkbox=$multiple_support checked=$use_functionalTitle}
+      <input type="text" name="functionalTitle" id="functionalTitle"  maxlength=60
+      value="{$functionalTitle}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="role">{t}Role{/t}</label></td>
+     <td>
+      {render acl=$roleACL checkbox=$multiple_support checked=$use_role}
+      <input type="text" id="role" name="role" maxlength=60 value="{$role}">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
   
   <!-- Phone, ... -->
+  <td class='right-border'>
+   <table summary="{t}Organizational information{/t} - {t}part{/t} 2">
+    <tr>
+     <td><label for="gouvernmentOrganizationalPersonLocality">{t}Person locality{/t}</label></td>
+     <td>
+      {render acl=$gouvernmentOrganizationalPersonLocalityACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalPersonLocality}
+      <input type="text" id="gouvernmentOrganizationalPersonLocality" name="gouvernmentOrganizationalPersonLocality" maxlength=60
+      value="{$gouvernmentOrganizationalPersonLocality}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="gouvernmentOrganizationalUnit">{t}Unit{/t}</label></td>
+     <td>
+      {render acl=$gouvernmentOrganizationalUnitACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnit}
+      <input type="text" id="gouvernmentOrganizationalUnit" name="gouvernmentOrganizationalUnit" maxlength=60 
+      value="{$gouvernmentOrganizationalUnit}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="street">{t}Street{/t}</label></td>
+     <td>
+      {render acl=$streetACL checkbox=$multiple_support checked=$use_street}
+      <input type="text" name="street" id="street" maxlength=60 value="{$street}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="postalCode">{t}Postal code{/t}</label></td>
+     <td> 
+      {render acl=$postalCodeACL checkbox=$multiple_support checked=$use_postalCode}
+      <input type="text" name="postalCode" id="postalCode" maxlength=60 value="{$postalCode}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="houseIdentifier">{t}House identifier{/t}</label></td>
+     <td>
+      {render acl=$houseIdentifierACL checkbox=$multiple_support checked=$use_houseIdentifier}
+      <input type="text" id="houseIdentifier" name="houseIdentifier" maxlength=60
+      value="{$houseIdentifier}">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-   
-  
-
   <!-- Location, ... -->
-  
-    
-    
-     <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}
-     
-    
-    
-     <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}">
-	      {else}
-			<i>{t}Please use the phone tab{/t}</i>
-	      {/if}
-{/render}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-    
-     <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}
-     
-    
-   
-  
- {/if} 
- 
-
+  <td>
+   <table summary="{t}Organizational information{/t} - {t}part{/t} 3">
+    <tr>
+     <td><label for="roomNumber">{t}Room No.{/t}</label></td>
+     <td>
+      {render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber}
+      <input type="text" id="roomNumber" name="roomNumber" maxlength=60 value="{$roomNumber}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="telephoneNumber">{t}Phone{/t}</label></td>
+     <td>
+      {render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber}
+      {if $has_phoneaccount ne "true"}
+      <input type="text" id="telephoneNumber" name="telephoneNumber" maxlength=60 value="{$telephoneNumber}">
+      {else}
+      <i>{t}Please use the phone tab{/t}</i>
+      {/if}
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label></td>
+     <td>
+      {render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber}
+      <input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" maxlength=60 
+      value="{$facsimileTelephoneNumber}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="ivbbLastDeliveryCollective">{t}Last delivery{/t}</label></td>
+     <td>
+      {render acl=$ivbbLastDeliveryCollectiveACL checkbox=$multiple_support checked=$use_ivbbLastDeliveryCollective}
+      <input type="text" name="ivbbLastDeliveryCollective" maxlength=60 id="ivbbLastDeliveryCollective" 
+      value="{$ivbbLastDeliveryCollective}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><label for="publicVisible">{t}Public visible{/t}</label></td>
+     <td>
+      {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">
+<input type="hidden" name="user_mulitple_edit" value="1">
 {/if}
 <input type=hidden name="generic">
 
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-	focus_field('sn');
-  -->
-</script>
+<!-- // First input field on page
+focus_field('sn');
 -->
+</script>