Skip to content

Commit 9576a7c

Browse files
tbrehmtbrehm
committed
- Fixed a wrong label in mail domain form.
- Fixed a login issue with safari.
1 parent 9f46f6c commit 9576a7c

File tree

2 files changed

+61
-61
lines changed

2 files changed

+61
-61
lines changed

‎interface/web/login/templates/index.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ <h2>Login</h2>
1414
<fieldset class="inlineLabels"><legend>Login</legend>
1515
<div class="ctrlHolder">
1616
<label for="username">Username</label>
17-
<input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};" />
17+
<input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
1818
</div>
1919
<div class="ctrlHolder">
2020
<label for="passwort">Password</label>
21-
<input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="textInput" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};" />
21+
<input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="textInput" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
2222
</div>
2323
</fieldset>
2424

‎interface/web/mail/templates/mail_domain_edit.htm‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_mail_domain">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<tmpl_if name="is_admin">
9-
<div class="ctrlHolder">
10-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
11-
<select name="server_id" id="server_id" class="selectInput">
12-
{tmpl_var name='server_id'}
13-
</select>
14-
</div>
15-
<div class="ctrlHolder">
16-
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
17-
<select name="client_group_id" id="client_group_id" class="selectInput">
18-
{tmpl_var name='client_group_id'}
19-
</select>
20-
</div>
21-
</tmpl_if>
22-
23-
<tmpl_if name="is_reseller">
24-
<div class="ctrlHolder">
25-
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
26-
<select name="client_group_id" id="client_group_id" class="selectInput">
27-
{tmpl_var name='client_group_id'}
28-
</select>
29-
</div>
30-
</tmpl_if>
31-
32-
<div class="ctrlHolder">
33-
<label for="domain">{tmpl_var name='domain_txt'}</label>
34-
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
35-
</div>
36-
<div class="ctrlHolder">
37-
<label for="policy">{tmpl_var name='policy_txt'}</label>
38-
<select name="policy" id="policy" class="selectInput">
39-
{tmpl_var name='server_id'}
40-
</select>
41-
</div>
42-
<div class="ctrlHolder">
43-
<p class="label">{tmpl_var name='active_txt'}</p>
44-
<div class="multiField">
45-
{tmpl_var name='active'}
46-
</div>
47-
</div>
48-
</fieldset>
49-
50-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
51-
<input type="hidden" name="type" value="local">
52-
53-
<div class="buttonHolder buttons">
54-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
55-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
56-
</div>
57-
</div>
58-
59-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_mail_domain">
5+
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels">
8+
<tmpl_if name="is_admin">
9+
<div class="ctrlHolder">
10+
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
11+
<select name="server_id" id="server_id" class="selectInput">
12+
{tmpl_var name='server_id'}
13+
</select>
14+
</div>
15+
<div class="ctrlHolder">
16+
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
17+
<select name="client_group_id" id="client_group_id" class="selectInput">
18+
{tmpl_var name='client_group_id'}
19+
</select>
20+
</div>
21+
</tmpl_if>
22+
23+
<tmpl_if name="is_reseller">
24+
<div class="ctrlHolder">
25+
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
26+
<select name="client_group_id" id="client_group_id" class="selectInput">
27+
{tmpl_var name='client_group_id'}
28+
</select>
29+
</div>
30+
</tmpl_if>
31+
32+
<div class="ctrlHolder">
33+
<label for="domain">{tmpl_var name='domain_txt'}</label>
34+
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
35+
</div>
36+
<div class="ctrlHolder">
37+
<label for="policy">{tmpl_var name='policy_txt'}</label>
38+
<select name="policy" id="policy" class="selectInput">
39+
{tmpl_var name='server_id'}
40+
</select>
41+
</div>
42+
<div class="ctrlHolder">
43+
<p class="label">{tmpl_var name='active_txt'}</p>
44+
<div class="multiField">
45+
{tmpl_var name='active'}
46+
</div>
47+
</div>
48+
</fieldset>
49+
50+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
51+
<input type="hidden" name="type" value="local">
52+
53+
<div class="buttonHolder buttons">
54+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
55+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
56+
</div>
57+
</div>
58+
59+
</div>

0 commit comments

Comments
 (0)