Updated a couple of templates

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

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 1eb1cc7a8a36555f5437d8668608363ac60f26a3..4c99d76df23b1184c97af99ea64bd31bef4c3f48 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -568,7 +568,7 @@ class user extends plugin
 
           $str = "<table \"\" border=0>
                     <tr>
-                      <td style='vertical-align:top'>CN</td>
+                      <td>CN</td>
                       <td>".preg_replace("/ /", "&nbsp;", $certificate->getname())."</td>
                     </tr>
                   </table><br>".

diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 7d8ec7f7b08a7210f3bfeaff64b1e348388faa55..35c6682f85f2a6d778aad0e97b13c4e7cd717074 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -5,7 +5,7 @@
 
 <table summary="{t}Personal information{/t}">
  <tr>
-  <td style="vertical-align:top">
+  <td>
 
    <!-- The users picture settings container -->
    <table summary="{t}The users picture{/t}">
@@ -21,7 +21,7 @@
     <tr>
      <td>
       {render acl=$userPictureACL checkbox=$multiple_support checked=$use_edit_picture}
-      <button style='vertical-align:top;' type="submit" name="edit_picture">{t}Change picture{/t}...</button>
+      <button type="submit" name="edit_picture">{t}Change picture{/t}...</button>
       {/render}
      </td>
     </tr>
@@ -29,7 +29,7 @@
   <!-- /The users picture settings container -->
 
   </td> 
-  <td style="vertical-align:top;">
+  <td>
 
    {if $is_template ne "true"}
 
@@ -183,10 +183,10 @@
    &nbsp;
   </td>
 
-  <td style="vertical-align:top;">
+  <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 cols='200' id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
@@ -242,7 +242,7 @@
      </td>
     </tr>
     <tr>
-     <td colspan="2" style='vertical-align:top'><label for="res">{t}Restrict login to{/t}</label>
+     <td colspan="2"><label for="res">{t}Restrict login to{/t}</label>
       
       {if !$multiple_support}
       {render acl=$gosaLoginRestrictionACL}
@@ -296,7 +296,7 @@
 
   {if $governmentmode ne "true"}
   <!-- Company, ... -->
-  <td style="vertical-align:top;">
+  <td>
    <table summary="{t}Organizational information{/t} - {t}part{/t} 1">
     <tr>
      <td><label for="o">{t}Organization{/t}</label></td>
@@ -384,7 +384,7 @@
   </td>
   
   <!-- Phone, ... -->
-  <td style="vertical-align:top;">
+  <td>
    <table summary="{t}Organizational information{/t} - {t}part{/t} 2">
     <tr>
      <td><label for="roomNumber">{t}Room No.{/t}</label></td>
@@ -436,7 +436,7 @@
   </td>
   
   <!-- Location, ... -->
-  <td style="vertical-align:top;">
+  <td>
    <table summary="{t}Organizational information{/t} - {t}part{/t} 3">
     <tr>
      <td><label for="l">{t}Location{/t}</label></td>
@@ -455,7 +455,7 @@
      </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 cols="200" id="postalAddress" name="postalAddress" rows=3 style="width:100%">{$postalAddress}</textarea>
@@ -468,7 +468,7 @@
   {else} 
   
   <!-- Beschreibung, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
+  <td class="right-border">
    <table summary="{t}Organizational information{/t} - {t}part{/t} 1">
     <tr>
      <td><label for="vocation">{t}Vocation{/t}</label></td>
@@ -517,7 +517,7 @@
   </td>
   
   <!-- Phone, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
+  <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>
@@ -566,7 +566,7 @@
   </td>
   
   <!-- Location, ... -->
-  <td style="vertical-align:top;">
+  <td>
    <table summary="{t}Organizational information{/t} - {t}part{/t} 3">
     <tr>
      <td><label for="roomNumber">{t}Room No.{/t}</label></td>

diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl
index 0a6c443637b63fcd949a5ac7b58b1010e009cf11..366a6ef733186fa1429d27ae3f8220cd2ea9b373 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic_certs.tpl
+++ b/gosa-core/plugins/personal/generic/generic_certs.tpl
@@ -4,14 +4,14 @@
 
 <table summary="{t}The users standard certificate{/t}" style="width:100%">
  <tr>
-  <td width="25%" style="vertical-align:top">
+  <td style="width:25%">
    {t}Standard certificate{/t}
   </td>
-  <td style="vertical-align:top">
+  <td>
    <label for="userCertificate_file">
    {if $Certificate_readable}{$userCertificateinfo}{/if}</label>
   </td>
-  <td style="vertical-align:top;text-align:right">
+  <td style="text-align:right">
    {if $userCertificate_state ne "true"}
    {render acl=$CertificateACL}
    <input id="userCertificate_file" name="userCertificate_file" type="file" size="20" maxlength="255" accept="text/*.*">
@@ -30,14 +30,14 @@
 
 <table summary="{t}The users S/MIME certificate{/t}" style="width:100%">
  <tr>
-  <td width="25%" style="vertical-align:top">
+  <td style="width:25%">
    {t}S/MIME certificate{/t} 
   </td>
-  <td style="vertical-align:top">
+  <td>
    <label for="userSMIMECertificate_file">
    {if $Certificate_readable}{$userSMIMECertificateinfo}{/if}</label>
   </td>
-  <td style="vertical-align:top;text-align:right">
+  <td style="text-align:right">
    {if $userSMIMECertificate_state ne "true"}
    {render acl=$CertificateACL}
    <input id="userSMIMECertificate_file" name="userSMIMECertificate_file" type="file" size="20" maxlength="255" accept="text/*.*">
@@ -56,14 +56,14 @@
 
 <table summary="{t}The users PKCS12 certificate{/t}" style="width:100%">
  <tr>
-  <td width="25%" style="vertical-align:top">
+  <td style="width:25%">
    {t}PKCS12 certificate{/t} 
   </td>
-  <td style="vertical-align:top">
+  <td>
    <label for="userPKCS12_file">
    {if $Certificate_readable}{$userPKCS12info}{/if}</label>
   </td>
-  <td style="vertical-align:top;text-align:right">
+  <td style="text-align:right">
    {if $userPKCS12_state ne "true"}
    {render acl=$CertificateACL}
    <input id="userPKCS12_file" name="userPKCS12_file" type="file" size="20" maxlength="255" accept="text/*.*">

diff --git a/gosa-core/plugins/personal/generic/password.tpl b/gosa-core/plugins/personal/generic/password.tpl
index ed5faa6e70140da5e35e3cf9947e7f8543579353..7ec439601b144a28b63a1dc4e9263fc18dcea458 100644 (file)
--- 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="{t}Password change dialog{/t}" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table summary="{t}Password change dialog{/t}" 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 6248fa5aef255036307aad27cefe509e3bce0ac6..31d730959835c42b5038a97b3d8f771dc6a1ec28 100644 (file)
--- a/gosa-core/plugins/personal/generic/paste_generic.tpl
+++ b/gosa-core/plugins/personal/generic/paste_generic.tpl
@@ -2,7 +2,7 @@
 
 <table width="100%" summary="{t}Paste user{/t}">
  <tr>
- <td style="vertical-align:top; border-right:1px solid #AAA; width:50%">
+ <td class="right-border" style="width:50%">
    <table width="100%" summary="{t}Personal information{/t}">
        <tr>
          <td><label for="sn">{t}Last name{/t}</label></td>
@@ -17,7 +17,7 @@
          <td><input type='text' id="uid" name="uid" size=25 maxlength=60 value="{$uid}"></td>
        </tr>
        <tr>
-               <td style='vertical-align:top;'>
+               <td>
                        {t}Password{/t}
                </td>
                <td>
@@ -27,7 +27,7 @@
        </tr>
    </table>
  </td>
- <td style="vertical-align:top ">
+ <td>
   <table summary="{t}The users picture{/t}">
    <tr>
     <td style="vertical-align: middle; width:147px; height:200px; background-color:gray;">

diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl
index 895a4b23ad12f488c4119e9340c45d8a34f8d3ef..0e853089cfb2747d2647fea7b9309d8747beabde 100644 (file)
--- a/gosa-core/plugins/personal/posix/generic.tpl
+++ b/gosa-core/plugins/personal/posix/generic.tpl
@@ -1,6 +1,6 @@
 <table style="width:100%;" summary="{t}POSIX settings{/t}">
  <tr>
-  <td style="width:50%; vertical-align:top;">
+  <td style="width:50%">
 
    <h3>{t}Generic{/t}</h3>
    <table summary="{t}Generic settings{/t}">
@@ -86,7 +86,7 @@
   <td style="border-left:1px solid #A0A0A0">
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td>
    <h3>{t}Group membership{/t}
    </h3>
    {if $groups eq "too_many_for_nfs"}
@@ -125,7 +125,7 @@
 
 <table style="width:100%" summary="{t}Account permissions{/t}" >
  <tr>
-  <td style='width:50%;vertical-align:top'>
+  <td style='width:50%'>
    {if $sshPublicKey == 1}
      {render acl=$sshPublicKeyACL}
      <h3>{t}SSH keys{/t}</h3>
@@ -139,7 +139,7 @@
   <td style="border-left:1px solid #A0A0A0">
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td>
    <h3>{t}System trust{/t}
    </h3>
    {if !$multiple_support}

diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
index a714130239952bd3652483199437532d5af2a37d..2b15a4e2b91b2a2e1c6bb6f81bce09f3cc2ae367 100644 (file)
--- a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
+++ b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
@@ -1,9 +1,9 @@
 {image path="images/empty.png" action="no_action_posted" value="do_nothing"}
 
 <table summary="{t}Group selection{/t}"
-  style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2>
+  style="width:100%;height:100%" cellpadding=2>
  <tr>
-  <td style="vertical-align:top; width:100%;">
+  <td style="width:100%;">
    <div class="contentboxh">
     <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
    </div>
@@ -21,7 +21,7 @@
    </div>
    {$LIST}
   </td>
-  <td style='vertical-align:top;min-width:250px'>
+  <td style='min-width:250px'>
    {$FILTER}
   </td>
  </tr>

diff --git a/gosa-core/plugins/personal/posix/paste_generic.tpl b/gosa-core/plugins/personal/posix/paste_generic.tpl
index e355855ca4780857c5fbbf65e2bff8202adf3f2b..b270f45b413500a0c7e92ddc0140dd055b8d0d5e 100644 (file)
--- a/gosa-core/plugins/personal/posix/paste_generic.tpl
+++ b/gosa-core/plugins/personal/posix/paste_generic.tpl
@@ -1,6 +1,6 @@
 <table width='100%' summary="{t}Posix settings{/t}">
  <tr>
-  <td style='vertical-align:top;'>
+  <td>
    <h3>{t}Posix settings{/t}</h3>
    <table summary="{t}Home directory{/t}">
     <tr>
@@ -53,13 +53,13 @@
   <td>
    <table summary="{t}Group membership{/t}">
     <tr>
-     <td style="vertical-align:top;" colspan="4">
+     <td colspan="4">
       <h3>{t}Group membership{/t}
       </h3>
      </td>
     </tr>
     <tr>
-     <td style="vertical-align:top;" colspan="4">
+     <td colspan="4">
       
       {if $groups eq "too_many_for_nfs"}
       <b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>

diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl
index be18393734e706882732c1173df9322d3ce6b5ed..95f62923d6cfd7766fa9f1ab9610218f26299ee0 100644 (file)
--- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl
+++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl
@@ -1,9 +1,9 @@
 {image path="images/empty.png" action="no_action_posted" value="do_nothing"}
 
-<table style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2
+<table style="width:100%;height:100%" cellpadding=2
   summary="{t}List of systems{/t}">
  <tr>
-  <td style="vertical-align:top; width:100%;">
+  <td style="width:100%;">
    <div class="contentboxh">
     <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
    </div>
@@ -23,7 +23,7 @@
    </div>
    {$LIST}
   </td>
-  <td style='vertical-align:top;min-width:250px'>
+  <td style='min-width:250px'>
    {$FILTER}
   </td>
  </tr>