From 56bc7d5f45503281be24f18a772256d2337da9f1 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 4 Mar 2010 07:47:29 +0000
Subject: [PATCH] Updated generic templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16010 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../plugins/personal/generic/class_user.inc   |   2 +-
 .../plugins/personal/generic/generic.tpl      | 238 +++++++++---------
 .../personal/generic/generic_certs.tpl        |  26 +-
 .../personal/generic/generic_picture.tpl      |  40 +--
 .../plugins/personal/generic/password.tpl     |   2 +-
 .../personal/generic/paste_generic.tpl        | 100 ++++----
 6 files changed, 194 insertions(+), 214 deletions(-)

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 8bb519724..cce9ec8d8 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -566,7 +566,7 @@ class user extends plugin
             $add_str_info = "<br><i>"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.)")."</i>";
           }
 
-          $str = "<table summary=\"\" border=0>
+          $str = "<table \"\" border=0>
                     <tr>
                       <td style='vertical-align:top'>CN</td>
                       <td>".preg_replace("/ /", "&nbsp;", $certificate->getname())."</td>
diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 06bcfca5c..7d8ec7f7b 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -1,21 +1,16 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
- 
- <!-- Headline container -->
- <tr>
-  <td colspan="4">
-   <h3>{t}Personal information{/t}</h3>
-  </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>
+
+   <!-- The users picture settings container -->
+   <table summary="{t}The users picture{/t}">
     <tr>
-     <td style='width:147px; height: 200px;' bgcolor="gray">
+     <td style="vertical-align: middle; width:147px; height:200px; background-color:gray;">
       {if !$userPicture_is_readable}
       <img  src="plugins/users/images/default.jpg" alt=''>
       {else}
@@ -31,80 +26,94 @@
      </td>
     </tr>
    </table>
-  </td>
-  
-  <!-- Name, ... -->
+  <!-- /The users picture settings container -->
+
+  </td> 
   <td style="vertical-align:top;">
-   <table summary=""> 
-    {if $is_template ne "true"}
+
+   {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>
@@ -112,16 +121,20 @@
      </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>
@@ -131,20 +144,21 @@
      </td>
      <td>
       {render acl=$genderACL}
-      <select size="1" id="gender" name="gender">
-       {html_options options=$gender_list selected=$gender}
-      </select>
+       <select 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>
      </td>
      <td>
       {render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage}
-      <select size="1" id="preferredLanguage" name="preferredLanguage">
+      <select id="preferredLanguage" name="preferredLanguage">
        {html_options options=$preferredLanguage_list selected=$preferredLanguage}
       </select>
       {/render}
@@ -163,14 +177,14 @@
      </td>
     </tr>
    </table>
+
   </td>
   <td style="border-left:1px solid #A0A0A0">
    &nbsp;
   </td>
+
   <td style="vertical-align:top;">
-   
-   <!-- Address, ... -->
-   <table summary="" style="width:100%"> 
+   <table style="width:100%" summary="{t}Postal address{/t}"> 
     <tr>
      <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
      <td>
@@ -183,7 +197,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>
@@ -191,20 +205,15 @@
      <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>
       {render acl=$passwordStorageACL checkbox=$multiple_support checked=$use_pw_storage}
-      <select size="1" id="pw_storage" name="pw_storage" onchange='document.mainform.submit()'>
+      <select 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}
@@ -240,7 +249,7 @@
       {$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}
@@ -260,7 +269,7 @@
       {$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}
@@ -275,28 +284,25 @@
  </tr>
 </table>
 
+<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">
    <h3>{t}Organizational information{/t}</h3>
   </td>
  </tr>
- 
- <!-- Base 2 container -->
  <tr>
-  
+
   {if $governmentmode ne "true"}
   <!-- Company, ... -->
   <td style="vertical-align:top;">
-   <table summary=""> 
+   <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>
@@ -304,7 +310,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>
@@ -312,7 +318,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>
@@ -320,7 +326,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>
@@ -328,7 +334,7 @@
      <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>
@@ -379,12 +385,12 @@
   
   <!-- Phone, ... -->
   <td style="vertical-align:top;">
-   <table summary=""> 
+   <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>
@@ -393,7 +399,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>
@@ -402,7 +408,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>
@@ -410,7 +416,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>
@@ -418,7 +424,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 value="{$facsimileTelephoneNumber}">
+      <input type="text" id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" maxlength=60 value="{$facsimileTelephoneNumber}">
       {/render}
      </td>
     </tr>
@@ -431,12 +437,12 @@
   
   <!-- Location, ... -->
   <td style="vertical-align:top;">
-   <table summary="" style="width:100%"> 
+   <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>
@@ -444,7 +450,7 @@
      <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>
@@ -463,12 +469,12 @@
   
   <!-- Beschreibung, ... -->
   <td style="vertical-align:top;border-right:1px solid #b0b0b0">
-   <table summary=""> 
+   <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>
@@ -476,7 +482,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>
@@ -485,7 +491,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>
@@ -494,7 +500,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>
@@ -503,7 +509,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>
@@ -512,12 +518,12 @@
   
   <!-- Phone, ... -->
   <td style="vertical-align:top;border-right:1px solid #b0b0b0">
-   <table summary=""> 
+   <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>
@@ -526,7 +532,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>
@@ -535,7 +541,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>
@@ -543,7 +549,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>
@@ -551,7 +557,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>
@@ -561,12 +567,12 @@
   
   <!-- Location, ... -->
   <td style="vertical-align:top;">
-   <table summary=""> 
+   <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>
@@ -575,7 +581,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}
@@ -586,7 +592,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>
@@ -595,7 +601,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>
@@ -604,7 +610,7 @@
      <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">
+      <select id="publicVisible" name="publicVisible">
        {html_options values=$ivbbmodes output=$ivbbmodes selected=$publicVisible}
       </select>
       {/render}
diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl
index 97100e1c4..ad71a8401 100644
--- a/gosa-core/plugins/personal/generic/generic_certs.tpl
+++ b/gosa-core/plugins/personal/generic/generic_certs.tpl
@@ -1,9 +1,10 @@
 <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
-<h3>
-{t}Certificates{/t}</h3>
-<table width="100%" cellpadding=4 border=0>
+
+<h3>{t}Certificates{/t}</h3>
+
+<table summary="{t}The users standart certificate{/t}" style="width:100%">
  <tr>
-  <td width="12%" style="vertical-align:top">
+  <td width="25%" style="vertical-align:top">
    {t}Standard certificate{/t}
   </td>
   <td style="vertical-align:top">
@@ -24,10 +25,12 @@
   </td>
  </tr>
 </table>
-<br>
-<table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
+
+<hr>
+
+<table summary="{t}The users S/MIME certificate{/t}" style="width:100%">
  <tr>
-  <td width="12%" style="vertical-align:top">
+  <td width="25%" style="vertical-align:top">
    {t}S/MIME certificate{/t} 
   </td>
   <td style="vertical-align:top">
@@ -48,10 +51,12 @@
   </td>
  </tr>
 </table>
-<br>
-<table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
+
+<hr>
+
+<table summary="{t}The users PKCS12 certificate{/t}" style="width:100%">
  <tr>
-  <td width="12%" style="vertical-align:top">
+  <td width="25%" style="vertical-align:top">
    {t}PKCS12 certificate{/t} 
   </td>
   <td style="vertical-align:top">
@@ -85,6 +90,7 @@
  </tr>
  {/if}
 </table>
+<hr>
 <div class='plugin-actions'>
  {render acl=$CertificateACL}
  <button type='submit' name='cert_edit_finish'>
diff --git a/gosa-core/plugins/personal/generic/generic_picture.tpl b/gosa-core/plugins/personal/generic/generic_picture.tpl
index f0407e78f..8af82f4c3 100644
--- a/gosa-core/plugins/personal/generic/generic_picture.tpl
+++ b/gosa-core/plugins/personal/generic/generic_picture.tpl
@@ -1,36 +1,18 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
- <!-- Headline container -->
+<h3>{t}Personal picture{/t}</h3>
+<table summary="{t}The users picture{/t}">
  <tr>
-   <td colspan=2>
-     <h3>{t}Personal picture{/t}</h3>
-   </td>
- </tr>
- <!-- Base container -->
- <tr>
- <!-- Image container -->
-  <td>
-   <table>
-    <tr>
-     <td width="147" height="200" bgcolor="gray">
-      <img  src="getbin.php?rand={$rand}" alt='' style='width:147px;' >
-     </td>
-    </tr>
-   </table>
+  <td style="vertical-align: middle; width:147px; height:200px; background-color:gray;">
+   <img src="getbin.php?rand={$rand}" alt='' style='width:147px;' >
   </td>
-	</tr>
-	<tr>
-   <!-- Name, ... -->
-   <td style="vertical-align:bottom; width:100%;">
-     <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
-     <input id="picture_file" name="picture_file" type="file" size="20" maxlength="255" accept="image/*.jpg">
-     &nbsp;
-     <button type='submit' name='picture_remove'>{t}Remove picture{/t}</button>
-
-   </td>
  </tr>
 </table>
-<br>
-
+<p>
+ <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
+  <input id="picture_file" name="picture_file" type="file" size="20" maxlength="255" accept="image/*.jpg">
+   &nbsp;
+  <button type='submit' name='picture_remove'>{t}Remove picture{/t}</button>
+ </p>
+<hr>
 <div class='plugin-actions'>
   <button type='submit' name='picture_edit_finish'>{msgPool type=saveButton}</button>
   <button type='submit' name='picture_edit_cancel'>{msgPool type=cancelButton}</button>
diff --git a/gosa-core/plugins/personal/generic/password.tpl b/gosa-core/plugins/personal/generic/password.tpl
index 6bba5a9b7..31fa5e046 100644
--- a/gosa-core/plugins/personal/generic/password.tpl
+++ b/gosa-core/plugins/personal/generic/password.tpl
@@ -2,7 +2,7 @@
  {t}You have changed the method your password is stored in the ldap database. For that reason you've to enter your password at this point again. GOsa will then encode it with the selected method.{/t}
 </p>
 
-<table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table summary="{t}Password change dialog{/t}" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
   <tr>
     <td><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
     <td><input id="new_password" type="password" name="new_password" size="30" maxlength="40" onFocus="nextfield= 'repeated_password';"></td>
diff --git a/gosa-core/plugins/personal/generic/paste_generic.tpl b/gosa-core/plugins/personal/generic/paste_generic.tpl
index 67805f295..6248fa5ae 100644
--- a/gosa-core/plugins/personal/generic/paste_generic.tpl
+++ b/gosa-core/plugins/personal/generic/paste_generic.tpl
@@ -1,61 +1,47 @@
 <h3>{t}User settings{/t}</h3>
-<table width="100%">
-  <tr>
-	<td style="vertical-align:top; border-right:1px solid #AAA; width:50%">
-	  <table>
-		<tr>
-		  <td><label for="sn">{t}Last name{/t}</label></td>
-		  <td><input type='text' id="sn" name="sn" size=25 maxlength=60  value="{$sn}"></td>
-		</tr>
-		<tr>
-		  <td><label for="givenName">{t}First name{/t}</label></td>
-		  <td><input type='text' id="givenName" name="givenName" size=25 maxlength=60 value="{$givenName}"></td>
-		</tr>
-		<tr>
-		  <td><label for="uid">{t}Login{/t}</label></td>
-		  <td><input type='text' id="uid" name="uid" size=25 maxlength=60 value="{$uid}"></td>
-		</tr>
-		<tr>
-			<td style='vertical-align:top;'>
-				{t}Password{/t}
-			</td>
-			<td>
-				<input type="radio" {if $passwordTodo=="clear"} checked{/if} name="passwordTodo" value="clear">{t}Clear password{/t}<br>
-				<input type="radio" {if $passwordTodo=="new"}   checked{/if} name="passwordTodo" value="new">{t}Set new password{/t}
-			</td>
-		</tr>
-	  </table>
-	</td>
-	<td style="vertical-align:top ">
-	  <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
-		<tr>
-		<!-- Image container -->
-		  <td colspan="2">
-			<table>
-			  <tr>
-				<td width="147" height="200" bgcolor="gray">
-				  {image path="getbin.php?rand={$rand}"}
 
-				</td>
-			  </tr>
-			</table>
-		  </td>
-		</tr>
-		<tr>
-		  <!-- Name, ... -->
-		  <td style="vertical-align:top;">
-			<input type="hidden" name="MAX_FILE_SIZE" value="2000000">
-			 {t}User picture{/t}
-		  </td>
-		  <td>
-			<input id="picture_file" name="picture_file" type="file" size="20" maxlength="255" accept="image/*.jpg">
-			&nbsp;
-			<button type='submit' name='picture_remove'>{t}Remove picture{/t}</button>
-
-		  </td>
-		</tr>
-	  </table>
-	</td>
-  </tr>
+<table width="100%" summary="{t}Paste user{/t}">
+ <tr>
+ <td style="vertical-align:top; border-right:1px solid #AAA; width:50%">
+   <table width="100%" summary="{t}Personal information{/t}">
+ 	<tr>
+ 	  <td><label for="sn">{t}Last name{/t}</label></td>
+ 	  <td><input type='text' id="sn" name="sn" size=25 maxlength=60  value="{$sn}"></td>
+ 	</tr>
+ 	<tr>
+ 	  <td><label for="givenName">{t}First name{/t}</label></td>
+ 	  <td><input type='text' id="givenName" name="givenName" size=25 maxlength=60 value="{$givenName}"></td>
+ 	</tr>
+ 	<tr>
+ 	  <td><label for="uid">{t}Login{/t}</label></td>
+ 	  <td><input type='text' id="uid" name="uid" size=25 maxlength=60 value="{$uid}"></td>
+ 	</tr>
+ 	<tr>
+ 		<td style='vertical-align:top;'>
+ 			{t}Password{/t}
+ 		</td>
+ 		<td>
+ 			<input type="radio" {if $passwordTodo=="clear"} checked{/if} name="passwordTodo" value="clear">{t}Clear password{/t}<br>
+ 			<input type="radio" {if $passwordTodo=="new"}   checked{/if} name="passwordTodo" value="new">{t}Set new password{/t}
+ 		</td>
+ 	</tr>
+   </table>
+ </td>
+ <td style="vertical-align:top ">
+  <table summary="{t}The users picture{/t}">
+   <tr>
+    <td style="vertical-align: middle; width:147px; height:200px; background-color:gray;">
+     <img src="getbin.php?rand={$rand}" alt='' style='width:147px;' >
+    </td>
+   </tr>
+  </table>
+  <p>
+   <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
+    <input id="picture_file" name="picture_file" type="file" size="20" maxlength="255" accept="image/*.jpg">
+     &nbsp;
+    <button type='submit' name='picture_remove'>{t}Remove picture{/t}</button>
+   </p>
+  </td>
+ </tr>
 </table>
 <br>
-- 
2.30.2