Skip to content

Commit fbd7c27

Browse files
author
thom
committed
Make records tab default for existing zones (#3727)
1 parent 5312a8a commit fbd7c27

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
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_soa_admin_list.htm‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
2121
</div>
2222
</tmpl_if>
2323
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
24-
24+
2525
<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_wizard.php">{tmpl_var name="add_new_record_wizard_txt"}</button>
2626
<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_soa_edit.php">{tmpl_var name="add_new_record_txt"}</button>
2727
<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_import.php">{tmpl_var name="import_zone_file_txt"}</button>
28-
29-
3028

31-
29+
30+
31+
3232
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
3333
<div class="table-wrapper marginTop15">
3434
<table class="table">
@@ -57,13 +57,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
5757
<tbody>
5858
<tmpl_loop name="records">
5959
<tr>
60-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</td>
61-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
62-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
63-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>
64-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='ns'}">{tmpl_var name="ns"}</a></td>
65-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='mbox'}">{tmpl_var name="mbox"}</a></td>
66-
<td class="text-right">
60+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}</td>
61+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="sys_groupid"}</a></td>
62+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
63+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>
64+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='ns'}">{tmpl_var name="ns"}</a></td>
65+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='mbox'}">{tmpl_var name="mbox"}</a></td>
66+
<td class="text-right">
6767
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('dns/dns_soa_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
6868
</td>
6969
</tr>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
2121
</div>
2222
</tmpl_if>
2323
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
24-
24+
2525
<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_wizard.php">{tmpl_var name="add_new_record_wizard_txt"}</button>
2626
<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_soa_edit.php">{tmpl_var name="add_new_record_txt"}</button>
2727
<button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_import.php">{tmpl_var name="import_zone_file_txt"}</button>
28-
29-
3028

31-
29+
30+
31+
3232
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
3333
<div class="table-wrapper marginTop15">
3434
<table class="table">
@@ -55,12 +55,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
5555
<tbody>
5656
<tmpl_loop name="records">
5757
<tr>
58-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</td>
59-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
60-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>
61-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='ns'}">{tmpl_var name="ns"}</a></td>
62-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='mbox'}">{tmpl_var name="mbox"}</a></td>
63-
<td class="text-right">
58+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}</td>
59+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
60+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>
61+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='ns'}">{tmpl_var name="ns"}</a></td>
62+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='mbox'}">{tmpl_var name="mbox"}</a></td>
63+
<td class="text-right">
6464
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('dns/dns_soa_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
6565
</td>
6666
</tr>

0 commit comments

Comments
 (0)