From 37ac049f6f35d3b319b4f31d1df2860cca18ebfc Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Wed, 18 Feb 2015 12:12:28 +0100 Subject: [PATCH] update templates for dkim, dmarc, and spf --- interface/web/dns/lib/lang/de_dns_dmarc.lng | 2 +- .../web/dns/templates/dns_dmarc_edit.htm | 217 +++++++++++------- interface/web/dns/templates/dns_spf_edit.htm | 10 +- .../web/mail/templates/mail_domain_edit.htm | 2 +- 4 files changed, 148 insertions(+), 83 deletions(-) diff --git a/interface/web/dns/lib/lang/de_dns_dmarc.lng b/interface/web/dns/lib/lang/de_dns_dmarc.lng index ba29e040f..4da1b0366 100644 --- a/interface/web/dns/lib/lang/de_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/de_dns_dmarc.lng @@ -3,7 +3,7 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Empfänger Policy'; $wb['dmarc_policy_note_txt'] = 'Wie der empfangen Server Mails behandeln soll, bei denen SPF oder DKIM (DMARC) fehlschlägt.'; -$wb['dmarc_policy_none_txt'] = 'gar nicht'; +$wb['dmarc_policy_none_txt'] = 'nur Reports'; $wb['dmarc_policy_quarantine_txt'] = 'Quarantäne'; $wb['dmarc_policy_reject_txt'] = 'abweisen'; $wb['dmarc_rua_txt'] = "'Aggregate Data Reporting' Adresse"; diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm index 422d2594d..51116bd50 100644 --- a/interface/web/dns/templates/dns_dmarc_edit.htm +++ b/interface/web/dns/templates/dns_dmarc_edit.htm @@ -1,100 +1,163 @@ -

+
+

+

-
-
-
-
- - -
-
- - - {tmpl_var name='dmarc_policy_note_txt'} + + +
+ +
+ +
+
+
+ +
+ +
+
+ {tmpl_var name='dmarc_policy_note_txt'} +
-
- - - {tmpl_var name='dmarc_rua_note_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_rua_note_txt'} +
-
- - - {tmpl_var name='dmarc_ruf_note_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_ruf_note_txt'} +
-
-

{tmpl_var name='dmarc_fo_txt'}

-
- {tmpl_var name='dmarc_fo0_txt'}
- {tmpl_var name='dmarc_fo1_txt'}
- {tmpl_var name='dmarc_fod_txt'}
- {tmpl_var name='dmarc_fos_txt'} -
+ +
+ +
+ +
+
+ {tmpl_var name='dmarc_fo0_txt'} +
+
+
+ +
+ +
+
+ {tmpl_var name='dmarc_fo1_txt'} +
+
+
+ +
+ +
+
+ {tmpl_var name='dmarc_fod_txt'} +
-
- - - {tmpl_var name='dmarc_adkim_note_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_fos_txt'} +
+
+ +
+ +
+ +
+
+ {tmpl_var name='dmarc_adkim_note_txt'} +
-
- - - {tmpl_var name='dmarc_aspf_note_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_aspf_note_txt'} +
-
-

{tmpl_var name='dmarc_rf_txt'}

-
- {tmpl_var name='dmarc_rf_afrf_txt'}
- {tmpl_var name='dmarc_rf_iodef_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_rf_afrf_txt'}
-
- - - {tmpl_var name='dmarc_pct_note_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_rf_iodef_txt'} +
+
+
+ +
+ +
+
+ {tmpl_var name='dmarc_pct_note_txt'} +
-
- - - {tmpl_var name='dmarc_ri_note_txt'} +
+ +
+ +
+
+ {tmpl_var name='dmarc_ri_note_txt'} +
-
- - -
-
- - +
+ +
+ +
+
+ +
+ +
+
-
-

{tmpl_var name='active_txt'}

-
- +
+ +
+
-
- +
-
- - -
-
- - +
+ + +
diff --git a/interface/web/dns/templates/dns_spf_edit.htm b/interface/web/dns/templates/dns_spf_edit.htm index f7b278386..bc8c1a20e 100644 --- a/interface/web/dns/templates/dns_spf_edit.htm +++ b/interface/web/dns/templates/dns_spf_edit.htm @@ -16,11 +16,11 @@
-
+
-
+
@@ -40,11 +40,13 @@
-
-
+
+ +
+ diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index 35ba0e90e..f56c27d87 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -100,8 +100,8 @@
-{tmpl_var name='dkim_generate_txt'}
+ {tmpl_var name='dkim_generate_txt'}
-- GitLab