From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/dns/templates/dns_soa_edit.htm | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index 54d84fa..be2e7fa 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -61,20 +61,32 @@
<div class="form-group">
<label for="origin" class="col-sm-3 control-label">{tmpl_var name='origin_txt'}</label>
<tmpl_if name="domain_option">
- <div class="col-sm-9"><select name="origin" id="origin" class="form-control">
+ <div class="col-sm-9">
+ <select name="origin" id="origin" class="form-control">
{tmpl_var name='domain_option'}
- </select></div>
+ </select>
+ <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+ </div>
<tmpl_else>
- <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" /></div></tmpl_if>
- <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+ <div class="col-sm-9">
+ <input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" />
+ <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+ </div>
+ </tmpl_if>
</div>
<div class="form-group">
<label for="ns" class="col-sm-3 control-label">{tmpl_var name='ns_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" /></div><p class="formHint">{tmpl_var name='eg_ns1_domain_tld'}</p>
+ <div class="col-sm-9">
+ <input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" />
+ <p class="formHint">{tmpl_var name='eg_ns1_domain_tld'}</p>
+ </div>
</div>
<div class="form-group">
<label for="mbox" class="col-sm-3 control-label">{tmpl_var name='mbox_txt'}</label>
- <div class="col-sm-9"><input type="text" name="mbox" id="mbox" value="{tmpl_var name='mbox'}" class="form-control" /></div><p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
+ <div class="col-sm-9">
+ <input type="text" name="mbox" id="mbox" value="{tmpl_var name='mbox'}" class="form-control" />
+ <p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
+ </div>
</div>
<div class="form-group">
<label for="refresh" class="col-sm-3 control-label">{tmpl_var name='refresh_txt'}</label>
@@ -113,6 +125,16 @@
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='dnssec_wanted_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='dnssec_wanted'}<br /><small>({tmpl_var name='dnssec_wanted_info'})</small>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="update_acl" class="col-sm-3 control-label">{tmpl_var name='dnssec_info_txt'}</label>
+ <div class="col-sm-9"><textarea readonly="true" rows="5" id="dnssec_info" name="dnssec_info" class="form-control">{tmpl_var name='dnssec_info'}</textarea></div>
+ </div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="serial" type="hidden" value="{tmpl_var name='serial'}">
--
Gitblit v1.9.1