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_slave_edit.htm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm
index 598fe95..832fec1 100644
--- a/interface/web/dns/templates/dns_slave_edit.htm
+++ b/interface/web/dns/templates/dns_slave_edit.htm
@@ -46,12 +46,18 @@
                         {tmpl_var name='domain_option'}
                     </select></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='ipv4_form_txt'}</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='ipv4_form_txt'}</p>
+				</div>
             </div>
             <div class="form-group">
                 <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>

--
Gitblit v1.9.1