Skip to content

Commit 7e29967

Browse files
author
Till Brehm
committed
Merge branch 'dns-page' into 'develop'
DNS tabs Closes #3727 See merge request ispconfig/ispconfig3!1154
2 parents 6078090 + fbd7c27 commit 7e29967

24 files changed

+72
-72
lines changed

‎interface/web/dns/form/dns_soa.tform.php‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,33 @@
5656
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
5757
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
5858

59+
$form["tabs"]['dns_records'] = array (
60+
'title' => "Records",
61+
'width' => 100,
62+
'template' => "templates/dns_records_edit.htm",
63+
'fields' => array (
64+
//#################################
65+
// Begin Datatable fields
66+
//#################################
67+
68+
//#################################
69+
// END Datatable fields
70+
//#################################
71+
),
72+
'plugins' => array (
73+
'dns_records' => array (
74+
'class' => 'plugin_listview',
75+
'options' => array(
76+
'listdef' => 'list/dns_a.list.php',
77+
'sqlextwhere' => "zone = ".@$app->functions->intval(@$_REQUEST['id']),
78+
'sql_order_by' => "ORDER BY type, name"
79+
)
80+
)
81+
)
82+
);
83+
5984
$form["tabs"]['dns_soa'] = array (
60-
'title' => "DNS Zone",
85+
'title' => "Zone settings",
6186
'width' => 100,
6287
'template' => "templates/dns_soa_edit.htm",
6388
'fields' => array (
@@ -303,31 +328,6 @@
303328
)
304329
);
305330

306-
$form["tabs"]['dns_records'] = array (
307-
'title' => "Records",
308-
'width' => 100,
309-
'template' => "templates/dns_records_edit.htm",
310-
'fields' => array (
311-
//#################################
312-
// Begin Datatable fields
313-
//#################################
314-
315-
//#################################
316-
// END Datatable fields
317-
//#################################
318-
),
319-
'plugins' => array (
320-
'dns_records' => array (
321-
'class' => 'plugin_listview',
322-
'options' => array(
323-
'listdef' => 'list/dns_a.list.php',
324-
'sqlextwhere' => "zone = ".@$app->functions->intval(@$_REQUEST['id']),
325-
'sql_order_by' => "ORDER BY type, name"
326-
)
327-
)
328-
)
329-
);
330-
331331
// show update acl to admins only.
332332
if(!$app->auth->is_admin()) unset($form["tabs"]['dns_soa']['fields']['update_acl']);
333333

‎interface/web/dns/templates/dns_a_edit.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
{tmpl_var name='active'}
1515
</div>
1616
</div>
17-
18-
17+
18+
1919
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2020
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
2121
<input type="hidden" name="type" value="{tmpl_var name='type'}">
22-
22+
2323
<div class="clear"><div class="right">
2424
<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_a_edit.php">{tmpl_var name='btn_save_txt'}</button>
25-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
25+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2626
</div></div>
2727
<script language="JavaScript" type="text/javascript">
2828
jQuery('#data').ispconfigSearch({
@@ -37,5 +37,5 @@
3737
fillSearchFieldWith: 'fill_text',
3838
searchFieldWatermark: '',
3939
resultBoxPosition: ''
40-
});
40+
});
4141
</script>

‎interface/web/dns/templates/dns_aaaa_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<div class="clear"><div class="right">
2424
<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_aaaa_edit.php">{tmpl_var name='btn_save_txt'}</button>
25-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
25+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2626
</div></div>
2727
<script language="JavaScript" type="text/javascript">
2828
jQuery('#data').ispconfigSearch({

‎interface/web/dns/templates/dns_alias_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
<div class="clear"><div class="right">
2323
<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_alias_edit.php">{tmpl_var name='btn_save_txt'}</button>
24-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
24+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2525
</div></div>

‎interface/web/dns/templates/dns_caa_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<div class="clear"><div class="right">
5353
<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_caa_edit.php">{tmpl_var name='btn_save_txt'}</button>
54-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
54+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
5555
</div></div>
5656

5757
<script language="JavaScript" type="text/javascript">

‎interface/web/dns/templates/dns_cname_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
<div class="clear"><div class="right">
2323
<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_cname_edit.php">{tmpl_var name='btn_save_txt'}</button>
24-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
24+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2525
</div></div>

‎interface/web/dns/templates/dns_dkim_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030

3131
<div class="clear"><div class="right">
3232
<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_dkim_edit.php">{tmpl_var name='btn_save_txt'}</button>
33-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
33+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
3434
</div></div>

‎interface/web/dns/templates/dns_dmarc_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,5 @@
152152

153153
<div class="clear"><div class="right">
154154
<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_dmarc_edit.php">{tmpl_var name='btn_save_txt'}</button>
155-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
155+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
156156
</div></div>

‎interface/web/dns/templates/dns_dname_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
<div class="clear"><div class="right">
2323
<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_dname_edit.php">{tmpl_var name='btn_save_txt'}</button>
24-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
24+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2525
</div></div>

‎interface/web/dns/templates/dns_ds_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
<div class="clear"><div class="right">
2323
<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_ds_edit.php">{tmpl_var name='btn_save_txt'}</button>
24-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
24+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2525
</div></div>

0 commit comments

Comments
 (0)