Skip to content

Commit 23d5e9d

Browse files
author
Marius Burkard
committed
Merge branch '5860-dns-config-error-records-tab' into 'develop'
Show DNS config errors on records tab (#5860) Closes #5860 See merge request ispconfig/ispconfig3!1297
2 parents d489c02 + 3d5186f commit 23d5e9d

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

interface/web/dns/templates/dns_a_list.htm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
<tmpl_if name="config_error_msg">
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
11+
</tmpl_if>
112
<div class="pnl_toolsarea">
213
<tmpl_if name='datalog_changes_count' op='>' value='0'>
314
<div class="systemmonitor-state state-info">

interface/web/dns/templates/dns_soa_edit.htm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
<tmpl_if name="config_error_msg">
2-
<!--<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
6-
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
7-
</div>
8-
</div>-->
92
<div class="alert alert-danger">
103
<p>
114
<tmpl_var name="configuration_error_txt">

0 commit comments

Comments
 (0)