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_wizard.htm | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 51e53f1..907dedc 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -4,31 +4,31 @@
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="error">
- <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+ <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>
<legend><tmpl_var name="dns_zone_txt"></legend>
<div class="form-group">
<label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
- <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="submitForm('pageForm','dns/dns_wizard.php')">
+ <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="ISPConfig.submitForm('pageForm','dns/dns_wizard.php')">
{tmpl_var name='template_id_option'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<tmpl_if name="is_admin">
<div class="form-group">
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<tmpl_unless name="domain_option">
<div class="form-group">
<label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
<div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_unless>
<tmpl_else>
<tmpl_if name="only_one_server">
@@ -38,8 +38,8 @@
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_if>
</tmpl_if>
<tmpl_if name="is_reseller">
@@ -48,8 +48,8 @@
<label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
<div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_unless>
</tmpl_if>
<tmpl_if name="DOMAIN_VISIBLE">
@@ -58,54 +58,54 @@
<tmpl_if name="domain_option">
<div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
- </select>
- </div><tmpl_else>
- <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
- </div></tmpl_if>
+ </select></div>
+ <tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
</div>
</tmpl_if>
<tmpl_if name="IP_VISIBLE">
<div class="form-group">
<label for="ip" class="col-sm-3 control-label">{tmpl_var name='ip_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" /></div></div>
</tmpl_if>
<tmpl_if name="IPV6_VISIBLE">
<div class="form-group">
<label for="ipv6" class="col-sm-3 control-label">{tmpl_var name='ipv6_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" /></div></div>
</tmpl_if>
<tmpl_if name="NS1_VISIBLE">
<div class="form-group">
<label for="ns1" class="col-sm-3 control-label">{tmpl_var name='ns1_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ns1" id="ns1" value="{tmpl_var name='ns1'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="ns1" id="ns1" value="{tmpl_var name='ns1'}" class="form-control" /></div></div>
</tmpl_if>
<tmpl_if name="NS2_VISIBLE">
<div class="form-group">
<label for="ns2" class="col-sm-3 control-label">{tmpl_var name='ns2_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ns2" id="ns2" value="{tmpl_var name='ns2'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="ns2" id="ns2" value="{tmpl_var name='ns2'}" class="form-control" /></div></div>
</tmpl_if>
<tmpl_if name="EMAIL_VISIBLE">
<div class="form-group">
<label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
- <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
</tmpl_if>
<tmpl_if name="DKIM_VISIBLE">
- <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
- <input name="dkim" type="hidden" maxlength="255" type="text"/>
+ <div class="form-group">
+ <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
+ <div class="col-sm-9"><input type="checkbox" disabled readonly checked><input name="dkim" type="hidden" maxlength="255" type="text"/></div></div>
</tmpl_if>
-
+ <tmpl_if name="DNSSEC_VISIBLE">
+ <div class="form-group">
+ <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dnssec_txt'}</label>
+ <div class="col-sm-9"><input type="checkbox" name="dnssec" value="Y"></div></div>
+ </tmpl_if>
+
<input type="hidden" name="create" value="0" />
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');">{tmpl_var name='btn_save_txt'}</button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; ISPConfig.submitForm('pageForm','dns/dns_wizard.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_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
<script language="JavaScript" type="text/javascript">
jQuery('#ip').ispconfigSearch({
@@ -119,7 +119,7 @@
fillSearchField: true,
fillSearchFieldWith: 'fill_text',
searchFieldWatermark: '',
- resultBoxPosition: 'e'
+ resultBoxPosition: ''
});
</script>
<script language="JavaScript" type="text/javascript">
@@ -134,6 +134,6 @@
fillSearchField: true,
fillSearchFieldWith: 'fill_text',
searchFieldWatermark: '',
- resultBoxPosition: 'e'
+ resultBoxPosition: ''
});
</script>
--
Gitblit v1.9.1