![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 3d3aca47c5644a980049433c99bcaea7782c5ae8..56f2dbef4e5512f417502c1cda9ba3f86ea27a53 100644 (file)
-<div class="horizontal-container">
- <div class="container" style='width:160px'>
- <div class="padder">
- <h3>{t}Personal information{/t}</h3>
- <table>
+<h3>{t}Personal information{/t}</h3>
+
+
+<table summary="{t}Personal information{/t}">
+ <tr>
+ <td>
+
+ <!-- The users picture settings container -->
+ <table summary="{t}The users picture{/t}">
<tr>
- <td style='width:147px; height: 200px;' bgcolor="gray">
+ <td style='width:147px; height:200px; background-color:gray; vertical-align: middle;' >
{if !$userPicture_is_readable}
<img src="plugins/users/images/default.jpg" alt=''>
{else}
- <img src="getbin.php?rand={$rand}" alt='' style='width:147px;' >
+ <img src="getbin.php?rand={$rand}" alt='' style='width:147px; vertical-align: middle;' >
{/if}
</td>
</tr>
<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>
</table>
+ <!-- /The users picture settings container -->
+
+ </td>
+ <td style='width:45%'>
- </div>
- </div>
- <div class="container" >
- <div class="padder">
+ {if $is_template ne "true"}
- <table summary="">
- {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" 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" 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" 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" 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" 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" 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" 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" 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" 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>
</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>
</td>
<td>
{render acl=$genderACL}
- <select 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>
+ <label for="preferredLanguage">{t}Preferred language{/t}</label>
</td>
<td>
{render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage}
- <select id="preferredLanguage" name="preferredLanguage">
+ <select size="1" id="preferredLanguage" name="preferredLanguage">
{html_options options=$preferredLanguage_list selected=$preferredLanguage}
</select>
{/render}
</tr>
</table>
- </div>
- </div>
- <div class="last-container" style='width:40%'>
- <div class="padder">
+ </td>
+ <td class='left-border'>
+ </td>
- <table summary="" style="width:100%">
+ <td>
+ <table 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='25' id="homePostalAddress" name="homePostalAddress" rows="3" "width:100%">{$homePostalAddress}</textarea>
+ <textarea cols='200' id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%">{$homePostalAddress}</textarea>
{/render}
</td>
</tr>
{/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 id="pw_storage" name="pw_storage" onchange='document.mainform.submit()'>
+ <select size="1" id="pw_storage" name="pw_storage" onchange='document.mainform.submit()'>
{foreach from=$pwmode key=value item=desc}
<option value="{$value}" {if $pwmode_select == $value}selected{/if} >{$desc}</option>
{/foreach}
</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}
</td>
</tr>
</table>
-
- </div>
- </div>
-</div>
-
-<div class='clear'></div>
+ </td>
+ </tr>
+</table>
<hr>
-<div class="horizontal-container">
- <div class="container" style='width:33%'>
- <div class="padder">
-
+<table summary="{t}Organizational information{/t}">
+ <tr>
+ <td colspan="3">
<h3>{t}Organizational information{/t}</h3>
-
- {if $governmentmode eq "true"}
+ </td>
+ </tr>
+ <tr>
- <table summary="">
+ {if $governmentmode ne "true"}
+ <!-- Company, ... -->
+ <td>
+ <table summary="{t}Organizational information{/t} - {t}part{/t} 1">
<tr>
<td><label for="o">{t}Organization{/t}</label></td>
<td>
<td>
{render acl=$managerACL}
<input type='text' name='manager_name' id='manager_name' value='{$manager_name}' disabled title='{$manager}'
- style='width:130px;'>
+ style='width:120px;'>
{/render}
{image path="images/lists/edit.png" action="editManager" acl=$managerACL}
{/if}
</td>
</tr>
- </table>
-
+
{/if}
-
- </div>
- </div>
- <div class="container" style='width:33%'>
- <div class="padder">
-
- <table summary="">
+ </table>
+ </td>
+
+ <td class='left-border'>
+ </td>
+
+ <!-- Phone, ... -->
+ <td>
+ <table summary="{t}Organizational information{/t} - {t}part{/t} 2">
<tr>
<td><label for="roomNumber">{t}Room No.{/t}</label></td>
<td>
</td>
</tr>
</table>
-
- </div>
- </div>
- <div class="last-container" style='width:33%'>
- <div class="padder">
-
- <table summary="" style="width:100%">
+ </td>
+
+ <td class='left-border'>
+ </td>
+
+ <!-- Location, ... -->
+ <td style='width:33%'>
+ <table summary="{t}Organizational information{/t} - {t}part{/t} 3">
<tr>
<td><label for="l">{t}Location{/t}</label></td>
<td>
</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>
</td>
</tr>
</table>
+ </td>
{else}
- <table summary="">
+ <!-- Beschreibung, ... -->
+ <td class="right-border">
+ <table summary="{t}Organizational information{/t} - {t}part{/t} 1">
<tr>
<td><label for="vocation">{t}Vocation{/t}</label></td>
<td>
</td>
</tr>
</table>
-
- </div>
- </div>
- <div class="container" style='width:33%'>
- <div class="padder">
-
- <table summary="">
+ </td>
+
+ <!-- Phone, ... -->
+ <td class='right-border'>
+ <table summary="{t}Organizational information{/t} - {t}part{/t} 2">
<tr>
<td><label for="gouvernmentOrganizationalPersonLocality">{t}Person locality{/t}</label></td>
<td>
</td>
</tr>
</table>
-
- </div>
- </div>
- <div class="last-container" style='width:33%'>
- <div class="padder">
-
- <table summary="">
+ </td>
+
+ <!-- Location, ... -->
+ <td>
+ <table summary="{t}Organizational information{/t} - {t}part{/t} 3">
<tr>
<td><label for="roomNumber">{t}Room No.{/t}</label></td>
<td>
<td><label for="publicVisible">{t}Public visible{/t}</label></td>
<td>
{render acl=$publicVisibleACL checkbox=$multiple_support checked=$use_publicVisible}
- <select id="publicVisible" name="publicVisible">
+ <select size="1" id="publicVisible" name="publicVisible">
{html_options values=$ivbbmodes output=$ivbbmodes selected=$publicVisible}
</select>
{/render}
</td>
</tr>
</table>
+ </td>
{/if}
-
- </div>
- </div>
-</div>
-<div class='clear'></div>
+ </tr>
+</table>
{if $multiple_support}
<input type="hidden" name="user_mulitple_edit" value="1">