X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fmail%2Fpersonal%2Fmail%2Fgeneric.tpl;h=05b21fac541bf81b9938bf2d223c1eda81a033b3;hb=a769f810bd73adce3536b81d0ed3dcb9dfafda3e;hp=248babf0c949e8d231dbd36ad350ba2b66a3d01a;hpb=71571b221b6a6b536009a12d8e8a8bea8bebe677;p=gosa.git

diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl
index 248babf0c..05b21fac5 100644
--- a/gosa-plugins/mail/personal/mail/generic.tpl
+++ b/gosa-plugins/mail/personal/mail/generic.tpl
@@ -1,305 +1,340 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
+<table summary="{t}Mail settings{/t}" style='width:100%;'>
  <tr>
-  <td style="width:50%; vertical-align:top;">
+  <td style='width:50%; '>  
 
-   <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</h2>
-   <table summary="">
+   <h3>{t}Generic{/t}</h3>
+   
+   <table summary="{t}Mail address configuration{/t}">
+    {if !$multiple_support}
     <tr>
      <td><label for="mail">{t}Primary address{/t}</label>{$must}</td>
      <td>
-{if $multiple_support}
-	<input id="mail" name="dummy1" size=35 maxlength=65 value="{t}Multiple edit{/t}" disabled>
-{else}
-{render acl=$mailACL}
-	<input id="mail" name="mail" size=35 maxlength=65 value="{$mail}">
-{/render}
-{/if}
+      {if !$isModifyableMail && $initially_was_account}
+      <input type='text' disabled size=30 value="{$mail}">
+      {else}
+      {if $domainSelectionEnabled}
+      {render acl=$mailACL}
+      <input type='text' id="mail" name="mail" size=20 maxlength=65 value="{$mail}">
+      {/render}
+      @<select name='MailDomain' size=1>
+       {html_options values=$MailDomains output=$MailDomains selected=$MailDomain}
+      </select>
+      {else}
+      {render acl=$mailACL}
+      <input type='text' id="mail" name="mail" size=35 maxlength=65 value="{$mail}">
+      {/render}
+      {/if}
+      {/if}
      </td>
     </tr>
     <tr>
      <td><label for="gosaMailServer">{t}Server{/t}</label></td>
      <td>
-{render acl=$gosaMailServerACL checkbox=$multiple_support checked=$use_gosaMailServer}
+      {if !$isModifyableServer && $initially_was_account}
+      <input type='text' disabled size=30 value="{$gosaMailServer}">
+      {else}
+      
+      {render acl=$gosaMailServerACL}
       <select size="1" id="gosaMailServer" name="gosaMailServer" title="{t}Specify the mail server where the user will be hosted on{/t}">
-	{html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
-	<option disabled>&nbsp;</option>
+       {html_options values=$MailServers output=$MailServers selected=$gosaMailServer}
+       <option disabled>&nbsp;</option>
       </select>
-{/render}
+      {/render}
+      {/if}
      </td>
     </tr>
-{if !$multiple_support}
+    {/if}
+    
     <tr>
-     <td>
-      <br>
-      {t}Quota usage{/t}
-     </td>
-     <td>
-      <br>
-      {if $quotadefined eq "true"}
-      	{$quotausage}
-      {else}
-      {t}not defined{/t}
-      {/if}
+     <td>&nbsp;
      </td>
     </tr>
-{/if}
+    {if $quotaEnabled}
+    <tr>
+     <td>{t}Quota usage{/t}</td>
+     <td>{$quotaUsage}</td>
+    </tr>
     <tr>
      <td><label for="gosaMailQuota">{t}Quota size{/t}</label></td>
      <td>
-{render acl=$gosaMailQuotaACL checkbox=$multiple_support checked=$use_gosaMailQuota}
-      <input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60" 
-		value="{$gosaMailQuota}"> MB
-{/render}
+      {render acl=$gosaMailQuotaACL checkbox=$multiple_support checked=$use_gosaMailQuota}
+      <input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60"
+      value="{$gosaMailQuota}"> MB
+      {/render}
      </td>
     </tr>
-	</table>
+    {/if}
+   </table>
   </td>
+  <td class='left-border'>
 
-{if !$multiple_support}
-
-  <td style="border-left:1px solid #A0A0A0;vertical-align:top;">
-	&nbsp;
+   &nbsp;
   </td>
-	<td>	
-   <h2><img class="center" alt="" align="middle" src="images/alternatemail.png" /><label for="alternates_list"> {t}Alternative addresses{/t}</label></h2>
-{render acl=$gosaMailAlternateAddressACL}
-   <select id="alternates_list" style="width:100%;height:100px;" name="alternates_list[]" size="15" multiple 
-	title="{t}List of alternative mail addresses{/t}">
-	{html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
-	<option disabled>&nbsp;</option>
-{/render}
-   </select>
-   <br />
+  <td>
+   {if !$multiple_support}
+   <h3>
+   <label for="alternates_list"> {t}Alternative addresses{/t}</label></h3>
+   {render acl=$gosaMailAlternateAddressACL}
+   <select id="alternates_list" style="width:100%;height:100px;" name="alternates_list[]" size="15" multiple
+   title="{t}List of alternative mail addresses{/t}">
+   {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
+   <option disabled>&nbsp;</option>
+   {/render}
+</select>
+<br />
 {render acl=$gosaMailAlternateAddressACL}
-   <input name="alternate_address" size="30" align="middle" maxlength="65" value="">
+<input type='text' name="alternate_address" size="30" align="middle" maxlength="65" value="">
 {/render}
 {render acl=$gosaMailAlternateAddressACL}
-   <input type=submit value="{msgPool type=addButton}" name="add_alternate">
+<button type='submit' name='add_alternate'>{msgPool type=addButton}</button>
+
 {/render}
 {render acl=$gosaMailAlternateAddressACL}
-   <input type=submit value="{t}Delete{/t}" name="delete_alternate">
-{/render}
-  </td>
+<button type='submit' name='delete_alternate'>{msgPool type=delButton}</button>
 
+{/render}
 {/if}
-
- </tr>
+</td>
+</tr>
+<tr>
+ <td colspan="3">
+  <hr>
+  <table summary="{t}Mail account configration flags{/t}">
+   <tr>
+    <td>
+     {render acl=$gosaMailDeliveryModeCACL}
+     <input class="center" type=checkbox id="own_script" name="own_script" value="1" {$own_script}
+     onClick="
+     changeState('sieveManagement');
+     changeState('drop_own_mails');
+     changeState('use_vacation');
+     changeState('use_spam_filter');
+     changeState('use_mailsize_limit');
+     changeState('import_vacation');
+     changeState('vacation_template');
+     changeState('only_local');
+     changeState('gosaVacationMessage');
+     changeState('gosaSpamSortLevel');
+     changeState('gosaSpamMailbox');
+     changeState('gosaMailMaxSize');
+     changeStates();"> {t}Use custom sieve script{/t} <b>({t}disables all Mail options!{/t})</b>
+     {/render}
+    </td>
+   </tr>
+   {if $allowSieveManagement}
+   <tr>
+    <td>
+     {render acl=$sieveManagementACL}
+     <button type='submit' name='sieveManagement' id="sieveManagement" {if $own_script == ""} disabled {/if}
+     >{t}Sieve Management{/t}</button>
+     
+     {/render}
+    </td>
+   </tr>
+   {/if}
+  </table>
+ </td>
+</tr>
+<tr>
+ <td colspan="3">
+  <hr>
+ </td>
+</tr>
 </table>
 
-{if $multiple_support}
-
-<p class="seperator">&nbsp;</p>
-<h2><img class="center" alt="" align="middle" src="images/envelope.png" />&nbsp;{t}Mail options{/t}</h2>
-
-{else}
-
-<!-- SIEVE -->
-<p class="seperator">&nbsp;</p>
-<table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
- <tr>
-  <td>
-{render acl=$gosaMailDeliveryModeCACL}
-   <input class="center" type=checkbox name="own_script" value="1" {$own_script} 
-		onClick="	
-			changeState('sieveManagement');
-			changeState('drop_own_mails');
-			changeState('use_vacation');
-			changeState('use_spam_filter');
-			changeState('use_mailsize_limit');
-			changeState('import_vacation');
-			changeState('vacation_template');
-//			changeState('forward_address');
-//			changeState('add_forwarder');
-//			changeState('add_local_forwarder');
-//			changeState('delete_forwarder');
-			changeState('only_local');
-			changeState('gosaVacationMessage');
-			changeState('gosaSpamSortLevel');
-			changeState('gosaSpamMailbox');
-			changeState('gosaMailMaxSize');
-			changeStates();
+<table summary="{t}Spam filter configuration{/t}">
+ <tr style="padding-bottom:0px;">
+  <td style='width:50%; '>
 
-		"
+   
+   <div>
+    <div style='float:left'>
+     {render acl=$gosaMailDeliveryModeIACL checkbox=$multiple_support checked=$use_drop_own_mails}
+     <input {if $own_script != ""} disabled {/if} class="center" id='drop_own_mails' 
+     type=checkbox name="drop_own_mails" value="1" {$drop_own_mails} 
+     title="{t}Select if you want to forward mails without getting own copies of them{/t}">
+     {/render}
+    </div>
+    <div style='padding-left: 25px;'>
+     {t}No delivery to own mailbox{/t}
+    </div>
+   </div>
+   
+   <div class='clear'></div>  
+   
+   <div>
+    <div style='float:left'>
+     {render acl=$gosaMailDeliveryModeVACL checkbox=$multiple_support checked=$use_use_vacation}
+     <input type=checkbox name="use_vacation" value="1" {$use_vacation} 
+     id="use_vacation" {if $own_script != ""} disabled {/if}
+     title="{t}Select to automatically response with the vacation message defined below{/t}" class="center" 
+     onclick="changeStates()">
+     {/render}
+    </div>
+    <div style='padding-left: 25px;'>
+     {t}Activate vacation message{/t}
+    </div>
+   </div>
+   
+   <div class='clear'></div>  
+   
+   {if $rangeEnabled}
+   <table summary="{t}Spam filter configuration{/t}">
+    <tr>
+     <td>{t}from{/t}</td>
+     <td style='width:140px'>
+      {render acl=$gosaVacationMessageACL}
+      <input type="text" id="gosaVacationStart" name="gosaVacationStart" class="date" style='width:100px' value="{$gosaVacationStart}">
+      {if $gosaVacationMessageACL|regex_replace:"/[cdmr]/":"" == "w"}
+      <script type="text/javascript">
+      {literal}
+      var datepicker  = new DatePicker({ relative : 'gosaVacationStart', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false });
+      {/literal}
+      </script>
+      {/if}
+      {/render}
+     </td>
+     <td>{t}till{/t}</td>
+     <td style='width:140px'>
+      {render acl=$gosaVacationMessageACL}
+      <div id="vacstart"><input type="text" id="gosaVacationStop" name="gosaVacationStop" class="date" style='width:100px' value="{$gosaVacationStop}"></div>
+      {if $gosaVacationMessageACL|regex_replace:"/[cdmr]/":"" == "w"}
+      <script type="text/javascript">
+      {literal}
+      var datepicker2  = new DatePicker({ relative : 'gosaVacationStop', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false });
+      {/literal}
+      </script>
+      {/if}
+      {/render}
+     </td>
+    </tr>
+   </table>
+   {/if}
+   <td class='left-border' rowspan="2">&nbsp;
+</td>
+   <td>
 
-> {t}Use custom sieve script{/t} <b>({t}disables all Mail options!{/t})</b>
+    
+    <div>
+     <div style='float:left'>
+      {render acl=$gosaMailDeliveryModeSACL checkbox=$multiple_support checked=$use_use_spam_filter}
+      <input {if $own_script != ""} disabled {/if} id='use_spam_filter' type=checkbox name="use_spam_filter" 
+      value="1" {$use_spam_filter} title="{t}Select if you want to filter this mails through spamassassin{/t}" class="center">
+      {/render}
+     </div>
+     <div style='padding-left: 25px;'>
+      <label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>
+      {render acl=$gosaSpamSortLevelACL checkbox=$multiple_support checked=$use_gosaSpamSortLevel}
+      <select {if $own_script != ""} disabled {/if} id="gosaSpamSortLevel" size="1" name="gosaSpamSortLevel" 
+      title="{t}Choose spam level - smaller values are more sensitive{/t}">
+      {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
+</select>
 {/render}
-  </td>
- </tr>
- <tr>
-  <td>
-{render acl=$sieveManagementACL}	
-   <input {if $own_script == ""} disabled {/if} id='sieveManagement' type='submit' name='sieveManagement' value='{t}Sieve Management{/t}'>
-{/render}
-  </td>
- </tr>
-</table>
-
-<p class="seperator">&nbsp;</p>
-{/if}
-
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
- <tr style="padding-bottom:0px;">
-  <td style="width:50%">
-{render acl=$gosaMailDeliveryModeIACL checkbox=$multiple_support checked=$use_drop_own_mails}
-   <input {if $own_script != ""} disabled {/if} class="center" id='drop_own_mails' type=checkbox name="drop_own_mails" value="1" {$drop_own_mails} title="{t}Select if you want to forward mails without getting own copies of them{/t}"> {t}No delivery to own mailbox{/t}
+<label for="gosaSpamMailbox">{t}to folder{/t}</label>
+{render acl=$gosaSpamMailboxACL checkbox=$multiple_support checked=$use_gosaSpamMailbox}
+<select {if $own_script != ""} disabled {/if} size="1" id="gosaSpamMailbox" name="gosaSpamMailbox">
+ {html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
+ <option disabled>&nbsp;</option>
+</select>
 {/render}
+</div>
+</div>
 
-<br>
-{render acl=$gosaMailDeliveryModeVACL checkbox=$multiple_support checked=$use_use_vacation}
- <input type=checkbox name="use_vacation" value="1" {$use_vacation} id="use_vacation" {if $own_script != ""} disabled {/if}
-    title="{t}Select to automatically response with the vacation message defined below{/t}" class="center"
-onclick="changeState('day'); changeState('month'); changeState('year'); changeState('sday'); changeState('smonth'); changeState('syear');
-"> {t}Activate vacation message{/t}
-{/render}
+<div class='clear'></div>  
 
-   <br>
+<div>
+ <div style='float:left;'>
+  {render acl=$gosaMailDeliveryModeRACL checkbox=$multiple_support checked=$use_use_mailsize_limit}
+  <input {if $own_script != ""} disabled {/if} id='use_mailsize_limit' type=checkbox 
+  name="use_mailsize_limit" value="1" {$use_mailsize_limit} class="center">
+  {/render}
+ </div>
+ <div style='padding-left: 25px;'>
+  <label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label>
+  {render acl=$gosaMailMaxSizeACL checkbox=$multiple_support checked=$use_gosaMailMaxSize}
+  <input {if $own_script != ""} disabled {/if} id="gosaMailMaxSize" name="gosaMailMaxSize" 
+  size="6" align="middle" maxlength="30" value="{$gosaMailMaxSize}"  class="center"> {t}MB{/t}
+  {/render}
+ </div>
+</div>
 
-    <table>
-         <tr>
-          <td>
-    {t}from{/t}
-          </td>
-          <td>
-{render acl=$gosaVacationMessageACL}
-    <select {if $own_script != ""} disabled {/if} name=day id="day" onChange="createResult(this.form,this.form.gosaVacationStart);" {$rangeEnabled}>
-        {html_options values=$days output=$days selected=$start_day}
-    </select>
-{/render}
-{render acl=$gosaVacationMessageACL}
-    <select  {if $own_script != ""} disabled {/if} name=month id="month" onChange="populate(this.form,this.form.gosaVacationStart);" {$rangeEnabled}>
-        {html_options options=$months selected=$start_month}
-    </select>
-{/render}
-{render acl=$gosaVacationMessageACL}
-    <select  {if $own_script != ""} disabled {/if} name=year id="year" onChange="populate(this.form,this.form.gosaVacationStart);" {$rangeEnabled}>
-        {html_options values=$years output=$years selected=$start_year}
-    </select>
-{/render}
-    <input type="hidden" name="gosaVacationStart" value="{$gosaVacationStart}">
-          </td>
-         </tr>
-         <tr>
-          <td>
-    {t}till{/t}
-          </td>
-          <td>
-{render acl=$gosaVacationMessageACL}
-    <select  {if $own_script != ""} disabled {/if} name=sday id="sday" onChange="createResult2(this.form,this.form.gosaVacationStop);" {$rangeEnabled}>
-        {html_options values=$days output=$days selected=$end_day}
-    </select>
-{/render}
-{render acl=$gosaVacationMessageACL}
-    <select  {if $own_script != ""} disabled {/if} name=smonth id="smonth" onChange="populate2(this.form,this.form.gosaVacationStop);" {$rangeEnabled}>
-        {html_options options=$months selected=$end_month}
-    </select>
-{/render}
-{render acl=$gosaVacationMessageACL}
-    <select {if $own_script != ""} disabled {/if}  name=syear id="syear" onChange="populate2(this.form,this.form.gosaVacationStop);" {$rangeEnabled}>
-        {html_options values=$years output=$years selected=$end_year}
-    </select>
-{/render}
-    <input type="hidden" name="gosaVacationStop" value="{$gosaVacationStop}">
-          </td>
-         </tr>
-        </table>
+<div class='clear'></div>  
 
+</td>
+</tr>
+<tr>
+ <td style='width:45%'>
 
-   <td rowspan=2 style="border-left:1px solid #A0A0A0">
-   &nbsp;
-  </td>
-  <td style="vertical-align:top;">
-{render acl=$gosaMailDeliveryModeSACL checkbox=$multiple_support checked=$use_use_spam_filter}
-   <input {if $own_script != ""} disabled {/if} id='use_spam_filter' type=checkbox name="use_spam_filter" value="1" {$use_spam_filter} title="{t}Select if you want to filter this mails through spamassassin{/t}" class="center">
-{/render}
- <label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>
-	
-{render acl=$gosaSpamSortLevelACL checkbox=$multiple_support checked=$use_gosaSpamSortLevel}
-   <select {if $own_script != ""} disabled {/if} id="gosaSpamSortLevel" size="1" name="gosaSpamSortLevel" title="{t}Choose spam level - smaller values are more sensitive{/t}">
-        {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
-   </select>
+  <p style="margin-bottom:0px;">
+  <b><label for="gosaVacationMessage">{t}Vacation message{/t}</label></b>
+  </p>
+  {render acl=$gosaVacationMessageACL checkbox=$multiple_support checked=$use_gosaVacationMessage}
+  <textarea {if $own_script != ""} disabled {/if} id="gosaVacationMessage" style="width:99%; height:100px;" 
+name="gosaVacationMessage" rows="4" cols="512">{$gosaVacationMessage}</textarea>
 {/render}
-   <label for="gosaSpamMailbox">{t}to folder{/t}</label>
-{render acl=$gosaSpamMailboxACL checkbox=$multiple_support checked=$use_gosaSpamMailbox}
-   <select {if $own_script != ""} disabled {/if} size="1" id="gosaSpamMailbox" name="gosaSpamMailbox">
-        	{html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
-			<option disabled>&nbsp;</option>
-   </select>
-{/render}
-   <br>
-{render acl=$gosaMailDeliveryModeRACL checkbox=$multiple_support checked=$use_use_mailsize_limit}
-   <input {if $own_script != ""} disabled {/if} id='use_mailsize_limit' type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit} class="center">
-{/render}
-	<label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label> 
-{render acl=$gosaMailMaxSizeACL checkbox=$multiple_support checked=$use_gosaMailMaxSize}
-   <input {if $own_script != ""} disabled {/if} id="gosaMailMaxSize" name="gosaMailMaxSize" size="6" align="middle" maxlength="30" value="{$gosaMailMaxSize}" class="center"> {t}MB{/t}
-{/render}
-  </td>
- </tr>
- <tr>
-  <td style="vertical-align:top; width:45%">
-   <p style="margin-bottom:0px;">
-    <b><label for="gosaVacationMessage">{t}Vacation message{/t}</label></b>
-   </p>
-{render acl=$gosaVacationMessageACL checkbox=$multiple_support checked=$use_gosaVacationMessage}
-   <textarea {if $own_script != ""} disabled {/if} id="gosaVacationMessage" style="width:99%; height:100px;" name="gosaVacationMessage" rows="4" cols="512">{$gosaVacationMessage}</textarea>
-{/render}
-   <br>
+<br>
 
-   {if $show_templates eq "true"}
+{if $show_templates eq "true"}
 {render acl=$gosaVacationMessageACL}
-   <select id='vacation_template' name="vacation_template" {if $own_script != ""} disabled {/if}>
-        	{html_options options=$vacationtemplates selected=$template}
-		<option disabled>&nbsp;</option>
-   </select>
+<select id='vacation_template' name="vacation_template" {if $own_script != ""} disabled {/if} size=1>
+ {html_options options=$vacationtemplates selected=$template}
+ <option disabled>&nbsp;</option>
+</select>
 {/render}
 {render acl=$gosaVacationMessageACL}
-   <input {if $own_script != ""} disabled {/if} id='import_vacation' type="submit" value="{t}Import{/t}" name="import_vacation">
-{/render}
-   {/if}
-  </td>
-  <td>
-   <p style="margin-bottom:0px;">
-    <b><label for="forwarder_list">{t}Forward messages to{/t}</label></b>
-   </p>
+<button type='submit' name='import_vacation' id="import_vacation" {if $own_script != ""} disabled {/if}
+>{t}Import{/t}</button>
 
-{if $multiple_support}
-<input type="checkbox" name="use_gosaMailForwardingAddress" onclick="changeState('gosaMailForwardingAddress');" 
-	class="center" {if $use_gosaMailForwardingAddress} checked {/if}>   
+{/render}
 {/if}
-
-{render acl=$gosaMailForwardingAddressACL}
-   <select {if $use_gosaMailForwardingAddress} checked {/if}
-		id="gosaMailForwardingAddress" style="width:100%; height:100px;" name="forwarder_list[]" size=15 multiple>
-			{html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}        
-			<option disabled>&nbsp;</option>
-   </select>
+</td>
+<td>
+ <p style="margin-bottom:0px;">
+ <b><label for="forwarder_list">{t}Forward messages to{/t}</label></b>
+ </p>
+ 
+ {if $multiple_support}
+ <input type="checkbox" name="use_gosaMailForwardingAddress" onclick="changeState('gosaMailForwardingAddress');" 
+ class="center" {if $use_gosaMailForwardingAddress} checked {/if}>   
+ {/if}
+ 
+ {render acl=$gosaMailForwardingAddressACL}
+ <select {if $use_gosaMailForwardingAddress} checked {/if}
+ id="gosaMailForwardingAddress" style="width:100%; height:100px;" name="forwarder_list[]" size=15 multiple>
+ {html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}        
+ <option disabled>&nbsp;</option>
+</select>
 {/render}
-   <br>
+<br>
 {render acl=$gosaMailForwardingAddressACL}
-   <input id='forward_address' name="forward_address" size=20 align="middle" maxlength=65 value="">
+<input type='text' id='forward_address' name="forward_address" size=20 align="middle" maxlength=65 value="">
 {/render}
 {render acl=$gosaMailForwardingAddressACL}
-   <input id='add_forwarder' type="submit" value="{msgPool type=addButton}" name="add_forwarder" >&nbsp;
+<button type='submit' name='add_forwarder' id="add_forwarder">{msgPool type=addButton}</button>&nbsp;
+
 {/render}
 {render acl=$gosaMailForwardingAddressACL}
-   <input id='add_local_forwarder' type="submit" value="{t}Add local{/t}" name="add_local_forwarder" >&nbsp;
+<button type='submit' name='add_local_forwarder' id="add_local_forwarder">{t}Add local{/t}</button>&nbsp;
+
 {/render}
 {render acl=$gosaMailForwardingAddressACL}
-   <input id='delete_forwarder' type="submit" value="{t}Delete{/t}" name="delete_forwarder">
+<button type='submit' name='delete_forwarder' id="delete_forwarder">{msgPool type=delButton}</button>
+
 {/render}
-  </td>
- </tr>
+</td>
+</tr>
 </table>
-<p class="seperator">&nbsp;</p>
+<hr>
 
-<h2><img class="center" alt="" align="middle" src="images/false.png" />&nbsp;{t}Advanced mail options{/t}</h2>
-
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
+<h3>{t}Advanced mail options{/t}
+</h3>
+<table summary="{t}Delivery settings{/t}">
  <tr>
   <td>
-{render acl=$gosaMailDeliveryModeLACL checkbox=$multiple_support checked=$use_only_local}
-   <input {if $own_script != ""} disabled {/if} id='only_local' type=checkbox name="only_local" value="1" {$only_local} title="{t}Select if user can only send and receive inside his own domain{/t}" class="center">
-{/render}
+   {render acl=$gosaMailDeliveryModeLACL checkbox=$multiple_support checked=$use_only_local}
+   <input {if $own_script != ""} disabled {/if} id='only_local' type=checkbox name="only_local" 
+   value="1" {$only_local} title="{t}Select if user can only send and receive inside his own domain{/t}" class="center">
+   {/render}
    {t}User is only allowed to send and receive local mails{/t}
   </td>
  </tr>
@@ -310,30 +345,32 @@ onclick="changeState('day'); changeState('month'); changeState('year'); changeSt
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
 
-	{literal}
-	function changeStates()
-	{
-
-		if(document.getElementById('use_vacation').checked){
-			changeState('day');
-			changeState('month');
-			changeState('year');
-			changeState('sday');
-			changeState('smonth');
-			changeState('syear');
-		}else{
-			changeSubselectState('use_vacation','day');
-			changeSubselectState('use_vacation','month');
-			changeSubselectState('use_vacation','year');
-			changeSubselectState('use_vacation','sday');
-			changeSubselectState('use_vacation','smonth');
-			changeSubselectState('use_vacation','syear');
-		}
-	}
+{literal}
+function validateClick()
+{
+alert("yes");
+if(!document.getElementById('use_vacation').checked){
+return;
+}
+}
 
-	{/literal}
+function changeStates()
+{
+if($('own_script').checked) {
+$("gosaVacationStart", "gosaVacationStop","gosaVacationMessage").invoke("disable");
+$("datepicker-gosaVacationStop_image", "datepicker-gosaVacationStart_image").invoke("hide");
+} else {
+if($('use_vacation').checked) {
+$("gosaVacationStart", "gosaVacationStop","gosaVacationMessage").invoke("enable");
+$("datepicker-gosaVacationStop_image", "datepicker-gosaVacationStart_image").invoke("show");
+}else{
+$("gosaVacationStart", "gosaVacationStop","gosaVacationMessage").invoke("disable");
+$("datepicker-gosaVacationStop_image", "datepicker-gosaVacationStart_image").invoke("hide");
+}
+}
+}
 
-<!-- // First input field on page
-	focus_field('mail');
-  -->
+changeStates();
+focus_field('mail');
+{/literal}
 </script>