From f88717e731faf5e220e8efdb45e2ee06f7811294 Mon Sep 17 00:00:00 2001 From: Shreyas Zare Date: Sat, 20 Jun 2020 14:02:35 +0530 Subject: [PATCH] webapp: ui enhancements done. added OISD block list. --- DnsServerCore/www/index.html | 5 +++- DnsServerCore/www/js/dhcp.js | 4 +-- DnsServerCore/www/js/zone.js | 54 ++++++++++++++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html index d4983e29..48c7a0bd 100644 --- a/DnsServerCore/www/index.html +++ b/DnsServerCore/www/index.html @@ -582,6 +582,7 @@ + @@ -823,6 +824,8 @@ + +
Enter block list URL one below another in the above text field or use the Quick Add list to add known block list URLs.
@@ -1726,6 +1729,7 @@ + -
diff --git a/DnsServerCore/www/js/dhcp.js b/DnsServerCore/www/js/dhcp.js index 37ffb1da..8aaacd11 100644 --- a/DnsServerCore/www/js/dhcp.js +++ b/DnsServerCore/www/js/dhcp.js @@ -1,6 +1,6 @@ /* Technitium DNS Server -Copyright (C) 2019 Shreyas Zare (shreyas@technitium.com) +Copyright (C) 2020 Shreyas Zare (shreyas@technitium.com) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ function refreshDhcpLeases() { var tableHtmlRows = ""; for (var i = 0; i < dhcpLeases.length; i++) - tableHtmlRows += "" + htmlEncode(dhcpLeases[i].scope) + "" + dhcpLeases[i].hardwareAddress + "" + dhcpLeases[i].address + "" + dhcpLeases[i].type + "" + htmlEncode(dhcpLeases[i].hostName) + "" + dhcpLeases[i].leaseObtained + "" + dhcpLeases[i].leaseExpires + ""; + tableHtmlRows += "" + htmlEncode(dhcpLeases[i].scope) + "" + dhcpLeases[i].hardwareAddress + "" + dhcpLeases[i].address + "" + dhcpLeases[i].type + "" + htmlEncode(dhcpLeases[i].hostName) + "" + dhcpLeases[i].leaseObtained + "" + dhcpLeases[i].leaseExpires + ""; $("#tableDhcpLeasesBody").html(tableHtmlRows); diff --git a/DnsServerCore/www/js/zone.js b/DnsServerCore/www/js/zone.js index 0793fe70..715fc4c3 100644 --- a/DnsServerCore/www/js/zone.js +++ b/DnsServerCore/www/js/zone.js @@ -46,6 +46,27 @@ $(function () { } }); + $("input[type=radio][name=rdAddZoneForwarderProtocol]").change(function () { + var protocol = $('input[name=rdAddZoneForwarderProtocol]:checked').val(); + switch (protocol) { + case "Udp": + case "Tcp": + $("#txtAddZoneForwarder").attr("placeholder", "8.8.8.8 or [2620:fe::10]") + break; + + case "Tls": + $("#txtAddZoneForwarder").attr("placeholder", "dns.quad9.net (9.9.9.9:853)") + break; + + case "Https": + case "HttpsJson": + $("#txtAddZoneForwarder").attr("placeholder", "https://cloudflare-dns.com/dns-query (1.1.1.1)") + break; + } + }); + + $("input[type=radio][name=rdAddEditRecordDataForwarderProtocol]").change(updateAddEditFormForwarderPlaceholder); + }); function refreshZones(checkDisplay) { @@ -79,9 +100,9 @@ function refreshZones(checkDisplay) { var type; if (zones[i].internal) - type = "Internal"; + type = "Internal"; else - type = zones[i].type; + type = "" + zones[i].type + ""; var status; if (zones[i].disabled) @@ -98,7 +119,7 @@ function refreshZones(checkDisplay) { var isReadOnlyZone = zones[i].internal || (zones[i].type === "Secondary"); tableHtmlRows += "" + htmlEncode(name) + ""; - tableHtmlRows += "" + type + ""; + tableHtmlRows += "" + type + ""; tableHtmlRows += "" + status + ""; tableHtmlRows += "" + expiry + ""; tableHtmlRows += ""; @@ -234,6 +255,7 @@ function showAddZoneModal() { $("#txtAddZonePrimaryNameServer").val(""); $("#txtAddZoneGlueAddresses").val(""); $("#rdAddZoneForwarderProtocolUdp").prop("checked", true); + $("#txtAddZoneForwarder").attr("placeholder", "8.8.8.8 or [2620:fe::10]") $("#txtAddZoneForwarder").val(""); $("#divAddZonePrimaryNameServer").hide(); @@ -339,6 +361,11 @@ function showEditZone(domain) { $("#tdStatusEditZone").html(status); $("#titleEditZoneExpiry").html(expiry); + if (responseJSON.response.zone.internal) + $("#titleEditZoneType").attr("class", "label label-default"); + else + $("#titleEditZoneType").attr("class", "label label-primary"); + switch (status) { case "Disabled": $("#tdStatusEditZone").attr("class", "label label-warning"); @@ -634,6 +661,7 @@ function clearAddEditForm() { $("#divAddEditRecordDataForwarder").hide(); $("#rdAddEditRecordDataForwarderProtocolUdp").prop("checked", true); $("input[name=rdAddEditRecordDataForwarderProtocol]:radio").attr('disabled', false); + $("#txtAddEditRecordDataForwarder").attr("placeholder", "8.8.8.8 or [2620:fe::10]") $("#txtAddEditRecordDataForwarder").val(""); $("#btnAddEditRecord").button("reset"); @@ -934,6 +962,25 @@ function addRecord() { }); } +function updateAddEditFormForwarderPlaceholder() { + var protocol = $('input[name=rdAddEditRecordDataForwarderProtocol]:checked').val(); + switch (protocol) { + case "Udp": + case "Tcp": + $("#txtAddEditRecordDataForwarder").attr("placeholder", "8.8.8.8 or [2620:fe::10]") + break; + + case "Tls": + $("#txtAddEditRecordDataForwarder").attr("placeholder", "dns.quad9.net (9.9.9.9:853)") + break; + + case "Https": + case "HttpsJson": + $("#txtAddEditRecordDataForwarder").attr("placeholder", "https://cloudflare-dns.com/dns-query (1.1.1.1)") + break; + } +} + function showEditRecordModal(objBtn) { var btn = $(objBtn); var id = btn.attr("data-id"); @@ -1034,6 +1081,7 @@ function showEditRecordModal(objBtn) { $("input[name=rdAddEditRecordDataForwarderProtocol]:radio").attr('disabled', true); $("#rdAddEditRecordDataForwarderProtocol" + divData.attr("data-record-protocol")).prop("checked", true); $("#txtAddEditRecordDataForwarder").val(divData.attr("data-record-value")); + updateAddEditFormForwarderPlaceholder(); break; default: