From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/dns/templates/dns_slave_edit.htm | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm
index b60aa54..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>
@@ -68,7 +74,7 @@
<input name="serial" type="hidden" value="{tmpl_var name='serial'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_slave_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <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_slave_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_slave_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
<script language="JavaScript" type="text/javascript">
--
Gitblit v1.9.1