Updated genric.tpl

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

diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 06bcfca5c9152800e2d8e4d8d857082a0dcf046d..3d3aca47c5644a980049433c99bcaea7782c5ae8 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -1,18 +1,9 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
- 
- <!-- Headline container -->
- <tr>
-  <td colspan="4">
+<div class="horizontal-container">
+ <div class="container" style='width:160px'>
+  <div class="padder">
+
    <h3>{t}Personal information{/t}</h3>
-  </td>
- </tr>
- 
- <!-- Base 1 container -->
- <tr>
-  
-  <!-- Image container -->
-  <!-- Image container -->
-  <td style="vertical-align:top">
+
    <table>
     <tr>
      <td style='width:147px; height: 200px;' bgcolor="gray">
@@ -31,20 +22,22 @@
      </td>
     </tr>
    </table>
-  </td>
-  
-  <!-- Name, ... -->
-  <td style="vertical-align:top;">
+
+  </div>
+ </div>
+ <div class="container" >
+  <div class="padder">
+
    <table summary=""> 
     {if $is_template ne "true"}
     <tr>
      <td><label for="sn">{t}Last name{/t}{$must}</label></td>
      <td>
       {if $multiple_support}
-      <input type="text" id="sn" name="dummy2" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
+      <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}">
+      <input type="text" id="sn" name="sn" maxlength=60 value="{$sn}">
       {/render}
       {/if}
      </td>
@@ -52,7 +45,7 @@
     {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>
+     <td>{render acl=$snACL}<input type="text" id="sn" name="sn" maxlength=60 value="{$sn}">{/render}</td>
     </tr>
     {/if}
     
@@ -62,10 +55,10 @@
      <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}">
+      <input type="text" id="givenName" name="givenName" maxlength=60 value="{$givenName}">
       {/render}
       {/if}
      </td>
@@ -75,10 +68,10 @@
      <td>
       {if !$multiple_support}
       {render acl=$uidACL}
-      <input type="text" id="uid" name="uid" size=25 maxlength=60  value="{$uid}">
+      <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>
@@ -92,7 +85,7 @@
      <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>
@@ -100,7 +93,7 @@
      <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>
@@ -131,7 +124,7 @@
      </td>
      <td>
       {render acl=$genderACL}
-      <select size="1" id="gender" name="gender">
+      <select id="gender" name="gender">
        {html_options options=$gender_list selected=$gender}
       </select>
       {/render}
@@ -144,7 +137,7 @@
      </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,19 +156,18 @@
      </td>
     </tr>
    </table>
-  </td>
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
-  </td>
-  <td style="vertical-align:top;">
-   
-   <!-- Address, ... -->
+
+  </div>
+ </div>
+ <div class="last-container" style='width:40%'>
+  <div class="padder">
+
    <table summary="" style="width:100%"> 
     <tr>
      <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
      <td>
       {render acl=$homePostalAddressACL checkbox=$multiple_support checked=$use_homePostalAddress}
-        <textarea cols='200' id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
+        <textarea cols='25' id="homePostalAddress" name="homePostalAddress" rows="3" "width:100%">{$homePostalAddress}</textarea>
       {/render}
      </td>
     </tr>
@@ -183,7 +175,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,7 +183,7 @@
      <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>
@@ -204,7 +196,7 @@
      <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 +232,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 +252,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}
@@ -271,32 +263,29 @@
      </td>
     </tr>
    </table>
-  </td>
- </tr>
-</table>
+ 
+  </div>
+ </div>
+</div>
 
+<div class='clear'></div>
+
+<hr>
+
+<div class="horizontal-container">
+ <div class="container" style='width:33%'>
+  <div class="padder">
 
-<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
- 
- <!-- Headline container -->
- <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;">
+   {if $governmentmode eq "true"}
+
    <table summary=""> 
     <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 +293,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 +301,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 +309,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 +317,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>
@@ -368,23 +357,21 @@
       {/if}
      </td>
     </tr>
-    
-    {/if}
    </table>
-  </td>
-  
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
-  </td>
-  
-  <!-- Phone, ... -->
-  <td style="vertical-align:top;">
+ 
+    {/if}
+
+  </div>   
+ </div>   
+ <div class="container" style='width:33%'>
+  <div class="padder">
+
    <table summary=""> 
     <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 +380,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 +389,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 +397,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,25 +405,23 @@
      <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>
-  
-  <!-- Location, ... -->
-  <td style="vertical-align:top;">
+
+  </div>   
+ </div>   
+ <div class="last-container" style='width:33%'>
+  <div class="padder">
+
    <table summary="" style="width:100%"> 
     <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 +429,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>
@@ -457,18 +442,15 @@
      </td>
     </tr>
    </table>
-  </td>
   
   {else} 
   
-  <!-- Beschreibung, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
    <table summary=""> 
     <tr>
      <td><label for="vocation">{t}Vocation{/t}</label></td>
      <td>
       {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 +458,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 +467,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 +476,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,21 +485,23 @@
      <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>
    </table>
-  </td>
-  
-  <!-- Phone, ... -->
-  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
+
+  </div>   
+ </div>   
+ <div class="container" style='width:33%'>
+  <div class="padder">
+
    <table summary=""> 
     <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 +510,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 +519,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 +527,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,22 +535,24 @@
      <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>
     </tr>
    </table>
-  </td>
-  
-  <!-- Location, ... -->
-  <td style="vertical-align:top;">
+
+  </div>   
+ </div>   
+ <div class="last-container" style='width:33%'>
+  <div class="padder">
+
    <table summary=""> 
     <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 +561,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 +572,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 +581,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,17 +590,19 @@
      <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}
      </td>
     </tr>
    </table>
-  </td>
   {/if} 
- </tr>
-</table>
+
+  </div>   
+ </div>   
+</div>   
+<div class='clear'></div>
 
 {if $multiple_support}
 <input type="hidden" name="user_mulitple_edit" value="1">