Skip to content

Commit 37ac049

Browse files
author
Florian Schaal
committed
update templates for dkim, dmarc, and spf
1 parent 355cd5b commit 37ac049

File tree

4 files changed

+148
-83
lines changed

4 files changed

+148
-83
lines changed

‎interface/web/dns/lib/lang/de_dns_dmarc.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $wb['data_txt'] = 'DMARC Record';
33
$wb['domain_txt'] = 'Domain';
44
$wb['dmarc_policy_txt'] = 'Mail Empfänger Policy';
55
$wb['dmarc_policy_note_txt'] = 'Wie der empfangen Server Mails behandeln soll, bei denen SPF oder DKIM (DMARC) fehlschlägt.';
6-
$wb['dmarc_policy_none_txt'] = 'gar nicht';
6+
$wb['dmarc_policy_none_txt'] = 'nur Reports';
77
$wb['dmarc_policy_quarantine_txt'] = 'Quarantäne';
88
$wb['dmarc_policy_reject_txt'] = 'abweisen';
99
$wb['dmarc_rua_txt'] = "'Aggregate Data Reporting' Adresse";

‎interface/web/dns/templates/dns_dmarc_edit.htm‎

Lines changed: 140 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,163 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
1+
<div class='page-header'>
2+
<h1><tmpl_var name="list_head_txt"></h1>
3+
</div>
24
<p><tmpl_var name="list_desc_txt"></p>
35

4-
<div class="panel panel_dns_txt">
5-
<div class="pnl_formsarea">
6-
<fieldset class="inlineLabels">
7-
<div class="ctrlHolder">
8-
<label for="domain">{tmpl_var name='domain_txt'}</label>
9-
<input name="domain" id="domain" value="{tmpl_var name='domain'}" readonly size="30" maxlength="255" type="text" class="textInput" />
10-
</div>
11-
<div class="ctrlHolder">
12-
<label for="dmarc_policy">{tmpl_var name='dmarc_policy_txt'}</label>
13-
<select name="dmarc_policy" id="dmarc_policy" class="selectInput">
14-
{tmpl_var name='dmarc_policy'}
15-
</select>
16-
{tmpl_var name='dmarc_policy_note_txt'}
6+
7+
8+
<div class="form-group">
9+
<label for="domain" class="col-sm-2 control-label">{tmpl_var name='domain_txt'}</label>
10+
<div class="col-sm-3">
11+
<input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" readonly class="form-control" />
12+
</div>
13+
</div>
14+
<div class="form-group">
15+
<label for="dmarc_policy" class="col-sm-2 control-label">{tmpl_var name='dmarc_policy_txt'}</label>
16+
<div class="col-sm-3">
17+
<select name="dmarc_policy" id="dmarc_policy" class="form-control">{tmpl_var name='dmarc_policy'}</select>
18+
</div>
19+
<div class="col-sm-7 input-sm">
20+
{tmpl_var name='dmarc_policy_note_txt'}
21+
</div>
1722
</div>
18-
<div class="ctrlHolder">
19-
<label for="dmarc_rua">{tmpl_var name='dmarc_rua_txt'}</label>
20-
<input name="dmarc_rua" id="dmarc_rua" value="{tmpl_var name='dmarc_rua'}" size="20" maxlength="63" type="text" class="textInput" />
21-
{tmpl_var name='dmarc_rua_note_txt'}
23+
<div class="form-group">
24+
<label for="dmarc_rua" class="col-sm-2 control-label">{tmpl_var name='dmarc_rua_txt'}</label>
25+
<div class="col-sm-3">
26+
<input type="text" name="dmarc_rua" id="dmarc_rua" value="{tmpl_var name='dmarc_rua'}" class="form-control" />
27+
</div>
28+
<div class="col-sm-7 input-sm">
29+
{tmpl_var name='dmarc_rua_note_txt'}
30+
</div>
2231
</div>
23-
<div class="ctrlHolder">
24-
<label for="dmarc_ruf">{tmpl_var name='dmarc_ruf_txt'}</label>
25-
<input name="dmarc_ruf" id="dmarc_ruf" value="{tmpl_var name='dmarc_ruf'}" size="20" maxlength="63" type="text" class="textInput" />
26-
{tmpl_var name='dmarc_ruf_note_txt'}
32+
<div class="form-group">
33+
<label for="dmarc_ruf" class="col-sm-2 control-label">{tmpl_var name='dmarc_ruf_txt'}</label>
34+
<div class="col-sm-3">
35+
<input type="text" name="dmarc_ruf" id="dmarc_ruf" value="{tmpl_var name='dmarc_ruf'}" class="form-control" />
36+
</div>
37+
<div class="col-sm-7 input-sm">
38+
{tmpl_var name='dmarc_ruf_note_txt'}
39+
</div>
2740
</div>
28-
<div class="ctrlHolder">
29-
<p class="label">{tmpl_var name='dmarc_fo_txt'}</p>
30-
<div class="multiField">
31-
<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>{tmpl_var name='dmarc_fo0_txt'}<br>
32-
<input type="checkbox" value="1" id="dmarc_fo1" name="dmarc_fo1" {tmpl_var name='dmarc_fo1'}/>{tmpl_var name='dmarc_fo1_txt'}<br>
33-
<input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>{tmpl_var name='dmarc_fod_txt'}<br>
34-
<input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>{tmpl_var name='dmarc_fos_txt'}
35-
</div>
41+
42+
<div class="form-group">
43+
<label class="col-sm-2 control-label">{tmpl_var name='dmarc_fo_txt'}</label>
44+
<div class="col-sm-3">
45+
<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>
46+
</div>
47+
<div class="col-sm-3 input-sm">
48+
{tmpl_var name='dmarc_fo0_txt'}
49+
</div>
50+
</div>
51+
<div class="form-group">
52+
<label class="col-sm-2 control-label"></label>
53+
<div class="col-sm-3">
54+
<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
55+
</div>
56+
<div class="col-sm-3 input-sm">
57+
{tmpl_var name='dmarc_fo1_txt'}
58+
</div>
59+
</div>
60+
<div class="form-group">
61+
<label class="col-sm-2 control-label"></label>
62+
<div class="col-sm-3">
63+
<input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>
64+
</div>
65+
<div class="col-sm-3 input-sm">
66+
{tmpl_var name='dmarc_fod_txt'}
67+
</div>
3668
</div>
37-
<div class="ctrlHolder">
38-
<label for="dmarc_adkim">{tmpl_var name='dmarc_adkim_txt'}</label>
39-
<select name="dmarc_adkim" id="dmarc_adkim" class="selectInput">
40-
{tmpl_var name='dmarc_adkim'}
41-
</select>
42-
{tmpl_var name='dmarc_adkim_note_txt'}
69+
<div class="form-group">
70+
<label class="col-sm-2 control-label"></label>
71+
<div class="col-sm-3">
72+
<input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>
73+
</div>
74+
<div class="col-sm-3 input-sm">
75+
{tmpl_var name='dmarc_fos_txt'}
76+
</div>
77+
</div>
78+
79+
<div class="form-group">
80+
<label for="dmarc_adkim" class="col-sm-2 control-label">{tmpl_var name='dmarc_adkim_txt'}</label>
81+
<div class="col-sm-3">
82+
<select name="dmarc_adkim" id="dmarc_adkim" class="form-control">{tmpl_var name='dmarc_adkim'}</select>
83+
</div>
84+
<div class="col-sm-7 input-sm">
85+
{tmpl_var name='dmarc_adkim_note_txt'}
86+
</div>
4387
</div>
44-
<div class="ctrlHolder">
45-
<label for="dmarc_aspf">{tmpl_var name='dmarc_aspf_txt'}</label>
46-
<select name="dmarc_aspf" id="dmarc_aspf" class="selectInput">
47-
{tmpl_var name='dmarc_aspf'}
48-
</select>
49-
{tmpl_var name='dmarc_aspf_note_txt'}
88+
<div class="form-group">
89+
<label for="dmarc_aspf" class="col-sm-2 control-label">{tmpl_var name='dmarc_aspf_txt'}</label>
90+
<div class="col-sm-3">
91+
<select name="dmarc_aspf" id="dmarc_aspf" class="form-control">{tmpl_var name='dmarc_aspf'}</select>
92+
</div>
93+
<div class="col-sm-7 input-sm">
94+
{tmpl_var name='dmarc_aspf_note_txt'}
95+
</div>
5096
</div>
51-
<div class="ctrlHolder">
52-
<p class="label">{tmpl_var name='dmarc_rf_txt'}</p>
53-
<div class="multiField">
54-
<input type="checkbox" value="1" id=dmarc_rf_afrf" name="dmarc_rf_afrf" {tmpl_var name='dmarc_rf_afrf'}/>{tmpl_var name='dmarc_rf_afrf_txt'}<br>
55-
<input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>{tmpl_var name='dmarc_rf_iodef_txt'}
97+
<div class="form-group">
98+
<label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_txt'}</label>
99+
<div class="col-sm-3">
100+
<input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_fo0" {tmpl_var name='dmarc_rf_afrf'}/>
101+
</div>
102+
<div class="col-sm-3 input-sm">
103+
{tmpl_var name='dmarc_rf_afrf_txt'}
56104
</div>
57105
</div>
58-
<div class="ctrlHolder">
59-
<label for="dmarc_pct">{tmpl_var name='dmarc_pct_txt'}</label>
60-
<input name="dmarc_pct" id="dmarc_pct" value="{tmpl_var name='dmarc_pct'}" size="20" maxlength="63" type="text" class="textInput" />
61-
{tmpl_var name='dmarc_pct_note_txt'}
106+
<div class="form-group">
107+
<label class="col-sm-2 control-label"></label>
108+
<div class="col-sm-3">
109+
<input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>
110+
</div>
111+
<div class="col-sm-3 input-sm">
112+
{tmpl_var name='dmarc_rf_iodef_txt'}
113+
</div>
114+
</div>
115+
<div class="form-group">
116+
<label for="dmarc_pct" class="col-sm-2 control-label">{tmpl_var name='dmarc_pct_txt'}</label>
117+
<div class="col-sm-3">
118+
<input type="text" name="dmarc_pct" id="dmarc_pct" value="{tmpl_var name='dmarc_pct'}" class="form-control" />
119+
</div>
120+
<div class="col-sm-7 input-sm">
121+
{tmpl_var name='dmarc_pct_note_txt'}
122+
</div>
62123
</div>
63-
<div class="ctrlHolder">
64-
<label for="dmarc_ri">{tmpl_var name='dmarc_ri_txt'}</label>
65-
<input name="dmarc_ri" id="dmarc_ri" value="{tmpl_var name='dmarc_ri'}" size="20" maxlength="63" type="text" class="textInput" />
66-
{tmpl_var name='dmarc_ri_note_txt'}
124+
<div class="form-group">
125+
<label for="dmarc_ri" class="col-sm-2 control-label">{tmpl_var name='dmarc_ri_txt'}</label>
126+
<div class="col-sm-3">
127+
<input type="text" name="dmarc_ri" id="dmarc_ri" value="{tmpl_var name='dmarc_ri'}" class="form-control" />
128+
</div>
129+
<div class="col-sm-7 input-sm">
130+
{tmpl_var name='dmarc_ri_note_txt'}
131+
</div>
67132
</div>
68-
<div class="ctrlHolder">
69-
<label for="dmarc_sp">{tmpl_var name='dmarc_sp_txt'}</label>
70-
<select name="dmarc_sp" id="dmarc_sp" class="selectInput">
71-
{tmpl_var name='dmarc_sp'}
72-
</select>
73-
</div>
74-
<div class="ctrlHolder">
75-
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
76-
<input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
133+
<div class="form-group">
134+
<label for="dmarc_sp" class="col-sm-2 control-label">{tmpl_var name='dmarc_sp_txt'}</label>
135+
<div class="col-sm-3">
136+
<select name="dmarc_sp" id="dmarc_sp" class="form-control">{tmpl_var name='dmarc_sp'}</select>
137+
</div>
77138
</div>
139+
<div class="form-group">
140+
<label for="ttl" class="col-sm-2 control-label">{tmpl_var name='ttl_txt'}</label>
141+
<div class="col-sm-3">
142+
<input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
143+
</div>
144+
</div>
78145

79-
<div class="ctrlHolder">
80-
<p class="label">{tmpl_var name='active_txt'}</p>
81-
<div class="multiField">
82-
<input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} / >
146+
<div class="form-group">
147+
<label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
148+
<div class="col-sm-3">
149+
<input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/>
83150
</div>
84151
</div>
85-
</fieldset>
86-
152+
87153
<input type="hidden" name="id" value="{tmpl_var name='id'}">
88154
<input type="hidden" name="zone" value="{tmpl_var name='zone'}" id="zone">
89155
<input type="hidden" name="type" value="{tmpl_var name='type'}">
90156
<input type="hidden" name="name" value="{tmpl_var name='name'}">
91157
</div>
92158

93-
<div class="buttonHolder buttons">
94-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php"><span>{tmpl_var name='btn_save_txt'}</span></button>
95-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
96-
</div>
97-
</div>
98-
99-
</div>
159+
<div class="clear"><div class="right">
160+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php">{tmpl_var name='btn_save_txt'}</button>
161+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
162+
</div></div>
100163

‎interface/web/dns/templates/dns_spf_edit.htm‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ <h1><tmpl_var name="list_head_txt"></h1>
1616
</div>
1717
<div class="form-group">
1818
<label class="col-sm-3 control-label">{tmpl_var name='spf_mx_txt'}</label>
19-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="spf_mx" name="spf_mx" {tmpl_var name = 'spf_mx_active'} /></div>
19+
<div class="col-sm-9"><input type="checkbox" value="1" id="spf_mx" name="spf_mx" {tmpl_var name = 'spf_mx_active'} /></div>
2020
</div>
2121
<div class="form-group">
2222
<label class="col-sm-3 control-label">{tmpl_var name='spf_a_txt'}</label>
23-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="spf_a" name="spf_a" {tmpl_var name = 'spf_a_active'} /></div>
23+
<div class="col-sm-9"><input type="checkbox" value="1" id="spf_a" name="spf_a" {tmpl_var name = 'spf_a_active'} /></div>
2424
</div>
2525
<div class="form-group">
2626
<label for="spf_ip" class="col-sm-3 control-label">{tmpl_var name='spf_ip_txt'}</label>
@@ -40,11 +40,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
4040
<div class="form-group">
4141
<label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
4242
<div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" /></div></div>
43-
4443
<div class="form-group">
4544
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
46-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} /></div>
45+
<div class="col-sm-9">
46+
<input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/>
47+
</div>
4748
</div>
49+
4850

4951

5052
<input type="hidden" name="id" value="{tmpl_var name='id'}">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
100100
<div class="form-group">
101101
<label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
102102
<div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
103-
<a href="javascript:setRequest('create')">{tmpl_var name='dkim_generate_txt'}</a>
104103
</div>
104+
<a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
105105
<div class="form-group">
106106
<div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
107107
</div>

0 commit comments

Comments
 (0)