diff --git a/plugins/personal/connectivity/oxchange.tpl b/plugins/personal/connectivity/oxchange.tpl
index 6891e815e54ff371241a38d68a096f2b93c814c4..2bd204907c69f1a2cd7ba8e0af576921a5ce4c99 100644 (file)
-{ if !$pg }
-<h2>{t}Open-Xchange Account{/t} - {t}disabled, no Postgresql support detected{/t}</h2>
+{if !$pg}
+<h2>{t}Open-Xchange Account{/t} - {t}disabled, no Postgresql support detected. Or the specified database can't be reached{/t}</h2>
{else}
-<h2>{if $tabbed eq 1}<input type="checkbox" name="oxchange" value="B" {$oxchangeState} {$oxchangeAccount} onCLick="changeState('OXAppointmentDays');changeState('OXTaskDays');changeState('OXTimeZone');" >{/if}{t}Open-Xchange account{/t}</h2>
-<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
+<h2>
+<input type="checkbox" name="oxchange" value="B"
+ {$oxchangeState} {$oxchangeAccountACL}
+ onCLick="
+ {if $OXAppointmentDays_W}
+ changeState('OXAppointmentDays');
+ {/if}
+ {if $OXTaskDays_W}
+ changeState('OXTaskDays');
+ {/if}
+ {if $OXTimeZone_W}
+ changeState('OXTimeZone');
+ {/if}
+ ">
+{t}Open-Xchange account{/t}</h2>
+
+
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
<!-- Headline container -->
<tr>
<td style="width:50%; vertical-align:top;">
- <table style="margin-left:4px;">
+ <table summary="" style="margin-left:4px;">
<tr>
<td colspan=2 style="vertical-align:top;">
<b>{t}Remember{/t}</b>
</td>
</tr>
<tr>
- <td>{t}Appointment Days{/t}</td>
- <td><input name="OXAppointmentDays" id="OXAppointmentDays" size=7 maxlength=7 {$OXAppointmentDaysACL} value="{$OXAppointmentDays}" {$fstate}> {t}days{/t}</td>
+ <td><LABEL for="OXAppointmentDays">{t}Appointment Days{/t}</LABEL></td>
+ <td>
+
+{render acl=$OXAppointmentDaysACL}
+<input name="OXAppointmentDays" id="OXAppointmentDays" size=7 maxlength=7 value="{$OXAppointmentDays}" {$oxState} >
+{/render}
+ {t}days{/t}</td>
</tr>
<tr>
- <td>{t}Task Days{/t}</td>
- <td><input name="OXTaskDays" id="OXTaskDays" size=7 maxlength=7 {$OXTaskDaysACL} value="{$OXTaskDays}" {$fstate}> {t}days{/t}</td>
+ <td><LABEL for="OXTaskDays">{t}Task Days{/t}</LABEL></td>
+ <td>
+
+{render acl=$OXTaskDaysACL}
+<input name="OXTaskDays" id="OXTaskDays" size=7 maxlength=7 value="{$OXTaskDays}" {$oxState} >
+{/render}
+
+ {t}days{/t}
+ </td>
</tr>
</table>
</td>
</td>
<td style="vertical-align:top;">
- <table>
+ <table summary="">
<tr>
<td colspan=2 style="vertical-align:top;">
<b>{t}User Information{/t}</b>
</td>
</tr>
<tr>
- <td>{t}User Timezone{/t}</td>
- <td><select size="1" name="OXTimeZone" id="OXTimeZone" {$OXTimeZoneAcl} {$fstate}>
- {html_options values=$timezones output=$timezones selected=$OXTimeZone}
- </select>
+ <td><LABEL for="OXTimeZone">{t}User Timezone{/t}</LABEL></td>
+ <td>
+
+{render acl=$OXTimeZoneACL}
+<select size="1" name="OXTimeZone" id="OXTimeZone" {$oxState} >
+ {html_options values=$timezones output=$timezones selected=$OXTimeZone}
+ </select>
+{/render}
+
</td>
</tr>
<tr>