Merge remote-tracking branch 'origin/master' into issue-68

This commit is contained in:
Richard Underwood 2017-01-04 09:31:50 +00:00
commit 119e1376ee
4 changed files with 83 additions and 27 deletions

View file

@ -619,6 +619,8 @@ $(document).ready(function () {
'SRV': 'SRV',
'SSHFP': 'SSHFP',
'TLSA': 'TLSA',
'DNAME': 'DNAME',
'DS': 'DS'
};
}
return {
@ -626,6 +628,8 @@ $(document).ready(function () {
'AAAA': 'AAAA',
'CERT': 'CERT',
'CNAME': 'CNAME',
'DNAME': 'DNAME',
'DS': 'DS',
'LOC': 'LOC',
'MX': 'MX',
'NAPTR': 'NAPTR',
@ -1330,6 +1334,18 @@ $(document).ready(function () {
entry: $('#searchlogs-entry').val()
});
});
<?php } else { ?>
$('#AboutMe').hide();
$('#aboutme').click(function () {
$('#MasterZones').hide();
$('#SlaveZones').hide();
$('#AboutMe').show();
});
$('#zoneadmin').click(function () {
$('#AboutMe').hide();
$('#MasterZones').show();
$('#SlaveZones').show();
});
<?php } ?>
$('#MasterZones').jtable('load');