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

diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 7ffe803b4..b0dbfc81b 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -1,135 +1,140 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
- 
- <!-- Headline container -->
- <tr>
-  <td colspan="4">
-   <h2>{t}Personal information{/t}</h2>
-  </td>
- </tr>
- 
- <!-- Base 1 container -->
+
+
+<h3>{t}Personal information{/t}</h3>
+
+
+<table summary="{t}Personal information{/t}">
  <tr>
-  
-  <!-- Image container -->
-  <!-- Image container -->
-  <td style="vertical-align:top">
-   <table>
+  <td>
+
+   <!-- The users picture settings container -->
+   <table summary="{t}The users picture{/t}">
     <tr>
-     <td width="147" height="200" bgcolor="gray">
+     <td style='width:147px; height:200px; background-color:gray;'>
       {if !$userPicture_is_readable}
-      <img class='center' border="0" width="100%" src="plugins/users/images/default.jpg" alt="{t}Personal picture{/t}">
+      <img  src="plugins/users/images/default.jpg" alt=''>
       {else}
-      <img class='center' border="0" width="100%" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
+      <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}
-      <input style='vertical-align:top;' type="submit" name="edit_picture" value="{t}Change picture{/t}...">
+      <button type="submit" name="edit_picture">{t}Change picture{/t}...</button>
       {/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"}
+  <!-- /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>
+      <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>
+       <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" size=25 maxlength=60 value="{$sn}">
-      {/render}
+       {render acl=$snACL}
+        <input type="text" id="sn" name="sn" maxlength=60 value="{$sn}">
+       {/render}
       {/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}
-    
-    {if $is_template ne "true"}
-    <tr>
-     <td><label for="givenName">{t}First name{/t}{$must}</label></td>
      <td>
-      
+      <label for="givenName">{t}First name{/t}{$must}</label>
+     </td>
+     <td>
       {if $multiple_support}
-      <input type="text" id="givenName" name="dummy3" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
+       <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" size=25 maxlength=60 value="{$givenName}">
-      {/render}
+       {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>
+      <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}
+       {render acl=$uidACL}
+        <input type="text" id="uid" name="uid" maxlength=60  value="{$uid}">
+       {/render}
       {else}
-      <input type="text" id="uid" name="dummy1" size=25 maxlength=60  value="{t}Multiple edit{/t}" disabled>
+       <input type="text" id="uid" name="dummy1" maxlength=60  value="{t}Multiple edit{/t}" disabled>
       {/if}
      </td>
     </tr>
-    {/if}
+
+   {else}
+
+   <!-- 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>
-      <div style="height:10px;"></div>
       <label for="personalTitle">{t}Personal title{/t}</label>
      </td>
      <td>
-      <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}">
+       <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>
+      <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}">
+       <input type="text" id="academicTitle" name="academicTitle" maxlength=60 value="{$academicTitle}">
       {/render}
      </td>
     </tr>
+
     {if !$multiple_support}
+
+    <!-- Date of birth container (not visible in mutliple edit) -->
     <tr>
      <td>
       <div style="height:10px;"></div>
-      <label for="day">{t}Date of birth{/t}</label>
+      <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" style='width:100px' 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 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>
@@ -139,13 +144,14 @@
      </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}
+
     <tr>
      <td>
       <label for="preferredLanguage">{t}Preferred langage{/t}</label>
@@ -160,30 +166,29 @@
     </tr>
     <tr>
      <td>
-      <div style="height:10px;"></div>
-      <label for="base">{t}Base{/t}</label>
+      <div style="height:10px;"> </div>
+      {t}Base{/t}
      </td>
      <td>
-      <div style="height:10px;"></div>
+      <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 class='left-border'>   &nbsp;
   </td>
-  <td style="vertical-align:top;">
-   
-   <!-- Address, ... -->
-   <table summary="" style="width:100%"> 
+
+  <td>
+   <table style="width:100%" summary="{t}Postal address{/t}"> 
     <tr>
-     <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
+     <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}
      </td>
     </tr>
@@ -191,7 +196,7 @@
      <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}
      </td>
     </tr>
@@ -199,15 +204,10 @@
      <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}">
+      <input type="text" id="labeledURI" name="labeledURI" maxlength=60 value="{$labeledURI}">
       {/render}
      </td>
     </tr>
-    <tr>
-     <td colspan=2>
-      <div style="height:10px;"></div>
-     </td>
-    </tr>
     <tr>
      <td><label for="pw_storage">{t}Password storage{/t}</label></td>
      <td>
@@ -218,7 +218,7 @@
        {/foreach}
       </select>
       {if $pw_configurable eq "true"}
-      &nbsp; <input id="edit_pw_method" type="submit" name="edit_pw_method" value="{t}Configure{/t}...">
+      &nbsp; <button id="edit_pw_method" type="submit" name="edit_pw_method">{t}Configure{/t}...</button>
       {/if}
       {/render}
      </td>
@@ -229,7 +229,7 @@
      <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}...">
+      <button id="edit_cert" type="submit" name="edit_cert">{t}Edit certificates{/t}...</button>
       {/render}
      </td>
     </tr>
@@ -241,19 +241,18 @@
      </td>
     </tr>
     <tr>
-     <td style='vertical-align:top'><label for="edit_perms">{t}Restrict login to{/t}</label></td>
-     <td>
+     <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 
+      <input type="text" id="res" name="res" 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}">
+      <button id="add_res" type="submit" name="add_res">{t}Add{/t}</button>
       {/render}
       
       {else}
@@ -269,11 +268,11 @@
       {$gosaLoginRestrictionWidget}
       {/render}
       {render acl=$gosaLoginRestrictionACL}
-      <input type="text" id="res" name="res" size=22 maxlength=33 
+      <input type="text" id="res" name="res" 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}">
+      <button id="add_res" type="submit" name="add_res">{t}Add{/t}</button>
       {/render}
       {/if}
       {/if}
@@ -284,29 +283,25 @@
  </tr>
 </table>
 
-<p class="seperator">&nbsp;</p>
+<hr>
 
-<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
- 
- <!-- Headline container -->
+<table summary="{t}Organizational information{/t}">
  <tr>
   <td colspan="3">
-   <h2>{t}Organizational information{/t}</h2>
+   <h3>{t}Organizational information{/t}</h3>
   </td>
  </tr>
- 
- <!-- Base 2 container -->
  <tr>
-  
+
   {if $governmentmode ne "true"}
   <!-- Company, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
+  <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" size=22 maxlength=60 value="{$o}">
+      <input type="text" id="o" name="o" maxlength=60 value="{$o}">
       {/render}
      </td>
     </tr>
@@ -314,7 +309,7 @@
      <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" size=22 maxlength=60 value="{$ou}">
+      <input type="text" id="ou" name="ou" maxlength=60 value="{$ou}">
       {/render}
      </td>
     </tr>
@@ -322,7 +317,7 @@
      <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" size=22 maxlength=60 value="{$departmentNumber}">
+      <input type="text" id="departmentNumber" name="departmentNumber" maxlength=60 value="{$departmentNumber}">
       {/render}
      </td>
     </tr>
@@ -330,7 +325,7 @@
      <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" size=22 maxlength=60 value="{$employeeNumber}">
+      <input type="text" id="employeeNumber" name="employeeNumber" maxlength=60 value="{$employeeNumber}">
       {/render}
      </td>
     </tr>
@@ -338,28 +333,23 @@
      <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" size=22 maxlength=60 value="{$employeeType}">
+      <input type="text" id="employeeType" name="employeeType" maxlength=60 value="{$employeeType}">
       {/render}
      </td>
     </tr>
     {if !$multiple_support}
     <tr>
-     <td><label for="manager">{t}Manager{/t}</label></td>
+     <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}'>
-      {/render}
-      {render acl=$managerACL}
-      <input type='image' src='images/lists/edit.png' name='editManager' class='center'>
+        <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!=""}
-      {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}
+        {image path="images/info_small.png" title="{$manager}" acl=$managerACL}
+        {image path="images/lists/trash.png" action="removeManager" acl=$managerACL}
       {/if}
      </td>
     </tr>
@@ -372,10 +362,13 @@
       <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'>
+      {image path="images/lists/edit.png" action="editManager"}
+
       {if $manager!=""}
-      <img src='images/info_small.png' title='{$manager}' class='center'>
-      <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
+      {image path="images/info_small.png" title="{$manager}"}
+
+      {image path="images/lists/trash.png" action="removeManager"}
+
       {/if}
       {/if}
      </td>
@@ -385,18 +378,17 @@
    </table>
   </td>
   
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
+  <td class='left-border'>   &nbsp;
   </td>
   
   <!-- Phone, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
+  <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" size=22 maxlength=60 value="{$roomNumber}">
+      <input type="text" id="roomNumber" name="roomNumber" maxlength=60 value="{$roomNumber}">
       {/render}
      </td>
     </tr>
@@ -405,7 +397,7 @@
      <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" size=22 maxlength=60 value="{$telephoneNumber}">
+      <input type="text" id="telephoneNumber" name="telephoneNumber" maxlength=60 value="{$telephoneNumber}">
       {/render}
      </td>
     </tr>
@@ -414,7 +406,7 @@
      <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" size=22 maxlength=60 value="{$mobile}">
+      <input type="text" id="mobile" name="mobile" maxlength=60 value="{$mobile}">
       {/render}
      </td>
     </tr>
@@ -422,7 +414,7 @@
      <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" size=22 maxlength=60 value="{$pager}">
+      <input type="text" id="pager" name="pager" maxlength=60 value="{$pager}">
       {/render}
      </td>
     </tr>
@@ -430,25 +422,24 @@
      <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" size=22 maxlength=60 value="{$facsimileTelephoneNumber}">
+      <input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" maxlength=60 value="{$facsimileTelephoneNumber}">
       {/render}
      </td>
     </tr>
    </table>
   </td>
   
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
+  <td class='left-border'>   &nbsp;
   </td>
   
   <!-- Location, ... -->
-  <td style="vertical-align:top;">
-   <table summary="" style="width:100%"> 
+  <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" size=22 maxlength=60 value="{$l}">
+      <input type="text" id="l" name="l" maxlength=60 value="{$l}">
       {/render}
      </td>
     </tr>
@@ -456,15 +447,15 @@
      <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" size=22 maxlength=60 value="{$st}">
+      <input type="text" id="st" name="st" maxlength=60 value="{$st}">
       {/render}
      </td>
     </tr>
     <tr>
-     <td style="vertical-align:top;"><label for="postalAddress">{t}Address{/t}</label></td>
+     <td><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>
+        <textarea cols="200" id="postalAddress" name="postalAddress" rows=3 style="width:100%">{$postalAddress}</textarea>
       {/render}
      </td>
     </tr>
@@ -474,13 +465,13 @@
   {else} 
   
   <!-- Beschreibung, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
-   <table summary=""> 
+  <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" size=22 maxlength=60 value="{$vocation}">
+      <input type="text" id="vocation" name="vocation" maxlength=60 value="{$vocation}">
       {/render}
      </td>
     </tr>
@@ -488,7 +479,7 @@
      <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" size=22 maxlength=60
+      <input type="text" id="gouvernmentOrganizationalUnitDescription" name="gouvernmentOrganizationalUnitDescription" maxlength=60
       value="{$gouvernmentOrganizationalUnitDescription}">
       {/render}
      </td>
@@ -497,7 +488,7 @@
      <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" size=22 maxlength=60
+      <input type="text" id="gouvernmentOrganizationalUnitSubjectArea" name="gouvernmentOrganizationalUnitSubjectArea" maxlength=60
       value="{$gouvernmentOrganizationalUnitSubjectArea}">
       {/render}
      </td>
@@ -506,7 +497,7 @@
      <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"  size=22 maxlength=60
+      <input type="text" name="functionalTitle" id="functionalTitle"  maxlength=60
       value="{$functionalTitle}">
       {/render}
      </td>
@@ -515,7 +506,7 @@
      <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" size=22 maxlength=60 value="{$role}">
+      <input type="text" id="role" name="role" maxlength=60 value="{$role}">
       {/render}
      </td>
     </tr>
@@ -523,13 +514,13 @@
   </td>
   
   <!-- Phone, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
-   <table summary=""> 
+  <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" size=22 maxlength=60
+      <input type="text" id="gouvernmentOrganizationalPersonLocality" name="gouvernmentOrganizationalPersonLocality" maxlength=60
       value="{$gouvernmentOrganizationalPersonLocality}">
       {/render}
      </td>
@@ -538,7 +529,7 @@
      <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" size=22 maxlength=60 
+      <input type="text" id="gouvernmentOrganizationalUnit" name="gouvernmentOrganizationalUnit" maxlength=60 
       value="{$gouvernmentOrganizationalUnit}">
       {/render}
      </td>
@@ -547,7 +538,7 @@
      <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" size=22 maxlength=60 value="{$street}">
+      <input type="text" name="street" id="street" maxlength=60 value="{$street}">
       {/render}
      </td>
     </tr>
@@ -555,7 +546,7 @@
      <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" size=22 maxlength=60 value="{$postalCode}">
+      <input type="text" name="postalCode" id="postalCode" maxlength=60 value="{$postalCode}">
       {/render}
      </td>
     </tr>
@@ -563,7 +554,7 @@
      <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" size=22 maxlength=60
+      <input type="text" id="houseIdentifier" name="houseIdentifier" maxlength=60
       value="{$houseIdentifier}">
       {/render}
      </td>
@@ -572,13 +563,13 @@
   </td>
   
   <!-- Location, ... -->
-  <td style="vertical-align:top;">
-   <table summary=""> 
+  <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" size=22 maxlength=60 value="{$roomNumber}">
+      <input type="text" id="roomNumber" name="roomNumber" maxlength=60 value="{$roomNumber}">
       {/render}
      </td>
     </tr>
@@ -587,7 +578,7 @@
      <td>
       {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}">
+      <input type="text" id="telephoneNumber" name="telephoneNumber" maxlength=60 value="{$telephoneNumber}">
       {else}
       <i>{t}Please use the phone tab{/t}</i>
       {/if}
@@ -598,7 +589,7 @@
      <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" size=22 maxlength=60 
+      <input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" maxlength=60 
       value="{$facsimileTelephoneNumber}">
       {/render}
      </td>
@@ -607,7 +598,7 @@
      <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" size=22 maxlength=60 id="ivbbLastDeliveryCollective" 
+      <input type="text" name="ivbbLastDeliveryCollective" maxlength=60 id="ivbbLastDeliveryCollective" 
       value="{$ivbbLastDeliveryCollective}">
       {/render}
      </td>